Changeset 7937 for trunk/psLib/src/types

Timestamp:

Jul 18, 2006, 5:43:14 PM (20 years ago)

Author:

drobbin

Message:

Edited psMetadataItemTransfer. Returns false for NULL out input.

Location:

trunk/psLib/src/types

Files:

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

trunk/psLib/src/types/psMetadata.c

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.119 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-07-18 21:53:25 $
+ *  @version $Revision: 1.120 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-07-19 03:43:14 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -465 +465 @@
 
 // may need to extend this to change the keyname in the copy
-psMetadata *psMetadataItemTransfer(psMetadata *out, const psMetadata *in, const char *key)
-{
-    PS_ASSERT_PTR_NON_NULL(in, NULL);
+bool psMetadataItemTransfer(psMetadata *out,
+                            const psMetadata *in,
+                            const char *key)
+{
+    if (in == NULL) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                "psMetadataItemTransfer:  'in' cannot be NULL.\n");
+        return false;
+    }
+    if (out == NULL) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                "psMetadataItemTransfer:  'out' cannot be NULL.\n");
+        return false;
+    }
     if (key == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
                 "psMetadataItemTransfer:  'key' cannot be NULL.\n");
-        return NULL;
+        return false;
     }
 
     psMetadataItem *item = psMetadataLookup(in, key);
     if (!item) {
-        return NULL;
-    }
-    if (out == NULL) {
-        out = psMetadataAlloc();
-    }
-    if (!psMetadataAddItem(out, item, PS_LIST_HEAD, PS_META_DEFAULT) ) {
-        psFree(out);
-        return NULL;
-    }
-
-    return out;
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                "psMetadataItemTransfer:  Could not find 'key' in psMetadata 'in'.\n");
+        return false;
+    }
+    if (!psMetadataAddItem(out, item, PS_LIST_TAIL, PS_META_REPLACE) ) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                "psMetadataItemTransfer:  Could not add item to psMetadata 'out'.\n");
+        return false;
+    }
+
+    return true;
 }
 

trunk/psLib/src/types/psMetadata.h

@@ -11 +11 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.82 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-07-18 21:53:25 $
+*  @version $Revision: 1.83 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-07-19 03:43:14 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -400 +400 @@
  *  @return bool:       True if successful, otherwise false.
  */
-psMetadata *psMetadataItemTransfer(
+bool psMetadataItemTransfer(
     psMetadata *out,                   ///< output Metadata container for copying.
     const psMetadata *in,              ///< Metadata collection from which to copy.