Changeset 7148

Timestamp:

May 18, 2006, 5:25:26 PM (20 years ago)

Author:

Paul Price

Message:

Making nFail optional in psMetadataConfigParse.

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.55 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-04-30 22:10:38 $
+*  @version $Revision: 1.56 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-05-19 03:25:26 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1190 +1190 @@
     PS_ASSERT_PTR_NON_NULL(filename,NULL);
 
-    // Check for NULL nFail
-    PS_ASSERT_PTR_NON_NULL(nFail,NULL);
+    // Initialise nFail, if provided
+    if (nFail) {
+        *nFail = 0;
+    }
 
     // Attempt to open specified file
@@ -1224 +1226 @@
         lineCount++;
 
-        if(!parseLine(&nestingLevel,parseLevelInfoArray,linePtr,lineCount,(char*)filename,overwrite)) {
+        if(!parseLine(&nestingLevel,parseLevelInfoArray,linePtr,lineCount,(char*)filename,overwrite) &&
+                nFail) {
             (*nFail)++;
         }