Changeset 26413

Timestamp:

Dec 15, 2009, 6:07:32 PM (16 years ago)

Author:

eugene

Message:

add status to psMetadataItemSupplement so errors may be optional

Location:

branches/eam_branches/20091201/psLib/src/types

Files:

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

branches/eam_branches/20091201/psLib/src/types/psMetadata.c

@@ -622 +622 @@
 
 // may need to extend this to change the keyname in the copy
-bool psMetadataItemSupplement(psMetadata *out,
+bool psMetadataItemSupplement(bool *status, 
+                              psMetadata *out,
                               const psMetadata *in,
                               const char *key)
@@ -632 +633 @@
     psMetadataItem *item = psMetadataLookup(in, key);
     if (!item) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Could not find '%s' in metadata.\n", key);
+        if (status) {
+            *status = false;
+        } else {
+            psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Could not find '%s' in metadata.\n", key);
+        }
         return false;
     }

branches/eam_branches/20091201/psLib/src/types/psMetadata.h

@@ -545 +545 @@
  */
 bool psMetadataItemSupplement(
+    bool *status,                       ///< if supplied, returns true/false if key is found (suppresses the error)
     psMetadata *out,                   ///< output Metadata container for copying.
     const psMetadata *in,              ///< Metadata collection from which to copy.