Changeset 9919

Timestamp:

Nov 8, 2006, 5:50:08 PM (20 years ago)

Author:

jhoblitt

Message:

delay parseLevelInfoArray alloc in parseLine() until it's really needed

File:

• trunk/psLib/src/types/psMetadataConfig.c (modified) (3 diffs)

trunk/psLib/src/types/psMetadataConfig.c

@@ -10 +10 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.115 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-11-09 03:22:38 $
+*  @version $Revision: 1.116 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-11-09 03:50:08 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1407 +1407 @@
     }
 
+    // split the input string into an array of lines
+    psList *doc = psStringSplit(str, "\n", true);
+    if (!doc) {
+        psError(PS_ERR_UNKNOWN, false, "failed to split string: %s", str);
+        if (allocedMD) {
+            psFree(md);
+        }
+        return NULL;
+    }
+    if (psListLength(doc) == 0) {
+        psError(PS_ERR_UNKNOWN, false, "string contained no lines");
+        psFree(doc);
+        if (allocedMD) {
+            psFree(md);
+        }
+        return NULL;
+    }
+
     // Allocate array to store parse level information
     psArray *parseLevelInfoArray = psArrayAllocEmpty(INITIAL_LENGTH);
@@ -1415 +1433 @@
     psArrayAdd(parseLevelInfoArray, 0, topLevelInfo);
     psFree(topLevelInfo);
-
-    psList *doc = psStringSplit(str, "\n", true);
-    if (!doc) {
-        psError(PS_ERR_UNKNOWN, false, "failed to split string: %s", str);
-        psFree(parseLevelInfoArray);
-        if (allocedMD) {
-            psFree(md);
-        }
-        return NULL;
-    }
-    if (psListLength(doc) == 0) {
-        psError(PS_ERR_UNKNOWN, false, "string contained no lines");
-        psFree(doc);
-        psFree(parseLevelInfoArray);
-        if (allocedMD) {
-            psFree(md);
-        }
-        return NULL;
-    }
 
     // clear the error stack so we can call psError(..., false, ...) and let