Changeset 12091 for trunk/ippTools/src

Timestamp:

Feb 27, 2007, 12:23:01 PM (19 years ago)

Author:

jhoblitt

Message:

fix pxDataGet()

File:

• trunk/ippTools/src/pxdata.c.template (modified) (2 diffs)

trunk/ippTools/src/pxdata.c.template

@@ -52 +52 @@
         psString text = psSlurpFilename(filepath);
         psFree(filepath);
+        if (!text) {
+            psError(PS_ERR_IO, false, "failed to slurp %s", filepath);
+            return NULL;
+        }
 
         return text;
@@ -61 +65 @@
     // see if we have a valid filename
     if (test_f(filepath)) {
-        // if we don't, then we're hosed
-        psError(PS_ERR_IO, true, "can't find a file in search path(s) to match : %s", filename);
+        // if we do, slurp the file
+        psString text = psSlurpFilename(filepath);
         psFree(filepath);
+        if (!text) {
+            psError(PS_ERR_IO, false, "failed to slurp %s", filepath);
+            return NULL;
+        }
 
-        return NULL;
+        return text;
     }
 
-    // slurp the file
-    psString text = psSlurpFilename(filepath);
-    psFree(filepath);
-    if (!text) {
-        psError(PS_ERR_IO, false, "failed to slurp %s", filepath);
-        return NULL;
-    }
+    // couldn't find a matching filename
+    psError(PS_ERR_IO, true, "can't find a file in search path(s) to match : %s", filename);
 
-    return text;
+    return NULL;
 }