Changeset 4401 for trunk/psLib/src/collections/psMetadata.c

Timestamp:

Jun 27, 2005, 10:38:12 AM (21 years ago)

Author:

drobbin

Message:

made required changes based on apidelta-report-cycle6

File:

• trunk/psLib/src/collections/psMetadata.c (modified) (10 diffs)

trunk/psLib/src/collections/psMetadata.c

@@ -12 +12 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.68 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-25 02:02:05 $
+*  @version $Revision: 1.69 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-27 20:38:12 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -268 +268 @@
 }
 
-bool psMetadataAddItem(psMetadata *md, psMetadataItem *metadataItem, psS32 location, psS32 flags)
+bool psMetadataAddItem(psMetadata *md, const psMetadataItem *item, psS32 location, psS32 flags)
 {
     char * key = NULL;
@@ -278 +278 @@
     PS_ASSERT_PTR_NON_NULL(md->table,NULL);
     PS_ASSERT_PTR_NON_NULL(md->list,NULL);
-    PS_ASSERT_PTR_NON_NULL(metadataItem,NULL);
-    PS_ASSERT_PTR_NON_NULL(metadataItem->name,NULL);
+    PS_ASSERT_PTR_NON_NULL(item,NULL);
+    PS_ASSERT_PTR_NON_NULL(item->name,NULL);
 
     mdTable = md->table;
     mdList = md->list;
-    key = metadataItem->name;
+    key = item->name;
 
     // See if key is already in table
     existingEntry = (psMetadataItem*)psHashLookup(mdTable, key);
 
-    if (metadataItem->type == PS_META_MULTI) {
+    if (item->type == PS_META_MULTI) {
         // the incoming entry is PS_META_MULTI
 
@@ -295 +295 @@
 
         // add all the items in the incoming entry to metadata
-        psList* list = metadataItem->data.list;
+        psList* list = item->data.list;
         if (list != NULL) {
             psListIterator* iter = psListIteratorAlloc(list,PS_LIST_HEAD,true);
@@ -317 +317 @@
 
             // add to the hash's list of duplicate entries
-            if (! psListAdd(existingEntry->data.list, PS_LIST_TAIL, metadataItem) ) {
+            if (! psListAdd(existingEntry->data.list, PS_LIST_TAIL, (psPtr)item) ) {
                 psError(PS_ERR_UNKNOWN,false,PS_ERRORTEXT_psMetadata_ADD_COLLECTION_FAILED,key);
                 return false;
@@ -328 +328 @@
 
             // treat as if new (added to list below)
-            if(!psHashAdd(mdTable, key, metadataItem)) {
+            if(!psHashAdd(mdTable, key, (psPtr)item)) {
                 psError(PS_ERR_UNKNOWN,false,PS_ERRORTEXT_psMetadata_ADD_TABLE_FAILED,key);
                 return false;
@@ -346 +346 @@
 
         // Node doesn't exist - Add new metadata item to metadata collection's hash
-        if(!psHashAdd(mdTable, key, metadataItem)) {
+        if(!psHashAdd(mdTable, key, (psPtr)item)) {
             psError(PS_ERR_UNKNOWN,false,PS_ERRORTEXT_psMetadata_ADD_TABLE_FAILED,key);
             return false;
@@ -352 +352 @@
     }
 
-    if(!psListAdd(mdList, location, metadataItem)) {
+    if(!psListAdd(mdList, location, (psPtr)item)) {
         psError(PS_ERR_UNKNOWN,false,PS_ERRORTEXT_psMetadata_ADD_COLLECTION_FAILED,key);
         return false;
@@ -580 +580 @@
 psMetadataLookupNumTYPE(Bool)
 
-psMetadataItem* psMetadataGet(psMetadata *md, psS32 where)
+psMetadataItem* psMetadataGet(const psMetadata *md, int location)
 {
     psMetadataItem* entry = NULL;
@@ -587 +587 @@
     PS_ASSERT_PTR_NON_NULL(md->list,NULL);
 
-    entry = (psMetadataItem*) psListGet(md->list, where);
+    entry = (psMetadataItem*) psListGet(md->list, location);
     if (entry == NULL) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psMetadata_FIND_INDEX_FAILED, where);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psMetadata_FIND_INDEX_FAILED, location);
         return NULL;
     }