Changeset 3780

Timestamp:

Apr 28, 2005, 9:52:48 AM (21 years ago)

Author:

desonia

Message:

modified code to not allow non-empty PS_META_MULTI nodes to be added.

Location:

trunk/psLib/src

Files:

• collections/psMetadata.c (modified) (2 diffs)
• types/psMetadata.c (modified) (2 diffs)

trunk/psLib/src/collections/psMetadata.c

@@ -12 +12 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.60 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-04-28 02:45:12 $
+*  @version $Revision: 1.61 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-28 19:52:48 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -266 +266 @@
     }
 
-    // if the metadataItem is MULTI, just add the encapsulated entries
+    // if the metadataItem is MULTI, just create a MULTI node.
     if (metadataItem->type == PS_META_MULTI) {
+        if (metadataItem->data.list == NULL || metadataItem->data.list->size > 0) {
+            psError(PS_ERR_BAD_PARAMETER_VALUE,true,
+                    "Specified PS_META_MULTI item is not defined properly "
+                    "(list allocated with zero size).");
+            return false;
+        }
 
         // make sure the existing entry is PS_META_MULTI
         existingEntry = makeMetaMulti(mdTable,key,existingEntry);
 
-        psBool status = true;
-        // add all the items in the incoming entry to metadata
-        psList* list = metadataItem->data.list;
-        if (list != NULL) {
-            psListIterator* iter = psListIteratorAlloc(list,PS_LIST_HEAD,true);
-            psMetadataItem* listItem;
-            while (status && (listItem=(psMetadataItem*)psListGetAndIncrement(iter)) != NULL) {
-                status |= psMetadataAddItem(md,listItem,location,flags);
-            }
-            psFree(iter);
-        }
-
-        return status; // all done.
+        return true; // all done.
     }
 

trunk/psLib/src/types/psMetadata.c

@@ -12 +12 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.60 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-04-28 02:45:12 $
+*  @version $Revision: 1.61 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-28 19:52:48 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -266 +266 @@
     }
 
-    // if the metadataItem is MULTI, just add the encapsulated entries
+    // if the metadataItem is MULTI, just create a MULTI node.
     if (metadataItem->type == PS_META_MULTI) {
+        if (metadataItem->data.list == NULL || metadataItem->data.list->size > 0) {
+            psError(PS_ERR_BAD_PARAMETER_VALUE,true,
+                    "Specified PS_META_MULTI item is not defined properly "
+                    "(list allocated with zero size).");
+            return false;
+        }
 
         // make sure the existing entry is PS_META_MULTI
         existingEntry = makeMetaMulti(mdTable,key,existingEntry);
 
-        psBool status = true;
-        // add all the items in the incoming entry to metadata
-        psList* list = metadataItem->data.list;
-        if (list != NULL) {
-            psListIterator* iter = psListIteratorAlloc(list,PS_LIST_HEAD,true);
-            psMetadataItem* listItem;
-            while (status && (listItem=(psMetadataItem*)psListGetAndIncrement(iter)) != NULL) {
-                status |= psMetadataAddItem(md,listItem,location,flags);
-            }
-            psFree(iter);
-        }
-
-        return status; // all done.
+        return true; // all done.
     }