Changeset 19870 for trunk/psModules/src/config/pmConfigMask.c

Timestamp:

Oct 2, 2008, 12:49:16 PM (18 years ago)

Author:

Paul Price

Message:

Generate mask value if possible.

File:

• trunk/psModules/src/config/pmConfigMask.c (modified) (3 diffs)

trunk/psModules/src/config/pmConfigMask.c

@@ -12 +12 @@
 // Private functions
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-static psMaskType maskGet(const psMetadata *source, // Source of masks
-                          const char *masks // Mask values to get
-                          )
-{
-    psMaskType mask = 0;                // Mask value, to return
-
-    psArray *names = psStringSplitArray(masks, " ,;", false); // Array of symbolic names
-    for (int i = 0; i < names->n; i++) {
-        const char *name = names->data[i]; // Symbolic name of interest
-        bool mdok;                      // Status of MD lookup
-        psMaskType value = psMetadataLookupU8(&mdok, source, name);
-        if (!mdok) {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Unable to find mask value for %s", name);
-            psFree(names);
-            return 0;
-        }
-        mask |= value;
-    }
-    psFree(names);
-
-    return mask;
-}
 
 // maskSetValues examine named mask values and set the bits for maskValue and markValue.
@@ -152 +129 @@
 }
 
+// Get a mask value by name(s)
+static psMaskType maskGet(psMetadata *source, // Source of masks
+                          const char *masks // Mask values to get
+                          )
+{
+    psMaskType mask = 0;                // Mask value, to return
+
+    psArray *names = psStringSplitArray(masks, " ,;", false); // Array of symbolic names
+    for (int i = 0; i < names->n; i++) {
+        const char *name = names->data[i]; // Symbolic name of interest
+        bool mdok;                      // Status of MD lookup
+        psMaskType value = psMetadataLookupU8(&mdok, source, name);
+        if (!mdok) {
+            // Try and generate the value if we can
+            if (strcmp(name, "MASK.VALUE") == 0 || strcmp(name, "MARK.VALUE") == 0) {
+                if (!maskSetValues(NULL, NULL, source)) {
+                    psError(PS_ERR_UNKNOWN, false, "Unable to set mask bits.");
+                    return 0;
+                }
+                value = psMetadataLookupU8(&mdok, source, name);
+                psAssert(mdok, "Should have generated mask value");
+            } else {
+                psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Unable to find mask value for %s", name);
+                psFree(names);
+                return 0;
+            }
+        }
+        mask |= value;
+    }
+    psFree(names);
+
+    return mask;
+}
+
 // Remove from the header keywords starting with the provided string
 static int maskRemoveHeader(psMetadata *header, // Header from which to remove keywords
@@ -327 +338 @@
     PS_ASSERT_STRING_NON_EMPTY(masks, 0);
 
-    psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, "MASKS"); // The recipe
+    bool mdok;                          // Status of MD lookup
+    psMetadata *recipe = psMetadataLookupMetadata(&mdok, config->recipes, "MASKS"); // The recipe
     if (!recipe) {
         psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find MASKS recipe.");