Changeset 4590 for trunk/psLib/src/types

Timestamp:

Jul 20, 2005, 4:39:58 PM (21 years ago)

Author:

drobbin

Message:

made minor changes according to most recent api-delta report from IFA

Location:

trunk/psLib/src/types

Files:

• psList.h (modified) (2 diffs)
• psMetadata.c (modified) (7 diffs)
• psMetadata.h (modified) (2 diffs)

trunk/psLib/src/types/psList.h

@@ -7 +7 @@
  *  @ingroup LinkedList
  *
- *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-15 02:33:54 $
+ *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-21 02:39:57 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -77 +77 @@
 psList* list;                      ///< List iterator to works on
 psListElem* cursor;                ///< current cursor position
-int index;                         ///< the index number in the list
 bool offEnd;                       ///< Iterator off the end?
+long index;                         ///< the index number in the list
 bool mutable;                      ///< Is it permissible to modify the list?
 }

trunk/psLib/src/types/psMetadata.c

@@ -12 +12 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.72 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-07-21 01:40:10 $
+*  @version $Revision: 1.73 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-07-21 02:39:57 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -135 +135 @@
     }
     psFree(metadata->list);
-    psFree(metadata->table);
+    psFree(metadata->hash);
 
 }
@@ -256 +256 @@
 {
     psList* list = NULL;
-    psHash* table = NULL;
+    psHash* hash = NULL;
     psMetadata* metadata = NULL;
 
@@ -266 +266 @@
     // Allocate metadata's internal containers
     list = (psList*) psListAlloc(NULL);
-    table = (psHash*) psHashAlloc(10);
+    hash = (psHash*) psHashAlloc(10);
 
     metadata->list = list;
-    metadata->table = table;
+    metadata->hash = hash;
 
     return metadata;
@@ -285 +285 @@
 
     PS_ASSERT_PTR_NON_NULL(md,NULL);
-    PS_ASSERT_PTR_NON_NULL(md->table,NULL);
+    PS_ASSERT_PTR_NON_NULL(md->hash,NULL);
     PS_ASSERT_PTR_NON_NULL(md->list,NULL);
     PS_ASSERT_PTR_NON_NULL(item,NULL);
     PS_ASSERT_PTR_NON_NULL(item->name,NULL);
 
-    mdTable = md->table;
+    mdTable = md->hash;
     mdList = md->list;
     key = item->name;
@@ -435 +435 @@
     psList* mdList = md->list;
 
-    PS_ASSERT_PTR_NON_NULL(md->table,NULL);
-    psHash* mdTable = md->table;
+    PS_ASSERT_PTR_NON_NULL(md->hash,NULL);
+    psHash* mdTable = md->hash;
 
     // Select removal by key or index
@@ -504 +504 @@
 
     PS_ASSERT_PTR_NON_NULL(md,NULL);
-    PS_ASSERT_PTR_NON_NULL(md->table,NULL);
+    PS_ASSERT_PTR_NON_NULL(md->hash,NULL);
     PS_ASSERT_PTR_NON_NULL(key,NULL);
 
-    mdTable = md->table;
+    mdTable = md->hash;
     entry = (psMetadataItem*)psHashLookup(mdTable, key);
 

trunk/psLib/src/types/psMetadata.h

@@ -11 +11 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.54 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-07-21 01:40:10 $
+*  @version $Revision: 1.55 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-07-21 02:39:57 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -93 +93 @@
 {
     psList*  list;                     ///< Metadata in linked-list
-    psHash*  table;                    ///< Metadata in a hash table
+    psHash*  hash;                     ///< Metadata in a hash table
     void *lock;                        ///< Optional lock for thread safety
 }