Changeset 14357

Timestamp:

Jul 20, 2007, 3:33:53 PM (19 years ago)

Author:

Paul Price

Message:

uri and path_base only required if code == 0.

File:

• trunk/ippTools/src/difftool.c (modified) (4 diffs)

trunk/ippTools/src/difftool.c

@@ -557 +557 @@
     }
 
+    psS16 code = psMetadataLookupS16(&status, config->args, "-code");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code");
+        return false;
+    }
+
     psString uri = psMetadataLookupStr(&status, config->args, "-uri");
     if (!status) {
@@ -562 +568 @@
         return false;
     }
-    if (!uri) {
+    if (code == 0 && !uri) {
         psError(PS_ERR_UNKNOWN, true, "-uri is required");
         return false;
@@ -572 +578 @@
         return false;
     }
-    if (!path_base) {
+    if (code == 0 && !path_base) {
         psError(PS_ERR_UNKNOWN, true, "-path_base is required");
         return false;
@@ -587 +593 @@
     if (!status) {
         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bg_stdev");
-        return false;
-    }
-
-    // default values
-    psS16 code = psMetadataLookupS16(&status, config->args, "-code");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code");
         return false;
     }