Changeset 6724

Timestamp:

Mar 28, 2006, 4:20:25 PM (20 years ago)

Author:

Paul Price

Message:

nFail for psMetadataConfigParse may be NULL.

Location:

branches

Files:

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

branches/eam_rel9_b1/psLib/src/types/psMetadataConfig.c

@@ -10 +10 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.48.16.2 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-01-17 09:25:15 $
+*  @version $Revision: 1.48.16.3 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-03-29 02:18:24 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1175 +1175 @@
     PS_ASSERT_PTR_NON_NULL(filename,NULL);
 
-    // Check for NULL nFail
-    PS_ASSERT_PTR_NON_NULL(nFail,NULL);
-
     // Attempt to open specified file
     if((fp=fopen(filename, "r")) == NULL) {
@@ -1209 +1206 @@
         lineCount++;
 
-        if(!parseLine(&nestingLevel,parseLevelInfoArray,linePtr,lineCount,(char*)filename,overwrite)) {
+        if(!parseLine(&nestingLevel,parseLevelInfoArray,linePtr,lineCount,(char*)filename,overwrite) &&
+                nFail) {
             (*nFail)++;
         }

branches/rel10_ifa/psLib/src/types/psMetadataConfig.c

@@ -10 +10 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.52.4.1 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-03-09 02:00:36 $
+*  @version $Revision: 1.52.4.2 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-03-29 02:20:25 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1175 +1175 @@
     PS_ASSERT_PTR_NON_NULL(filename,NULL);
 
-    // Check for NULL nFail
-    PS_ASSERT_PTR_NON_NULL(nFail,NULL);
-
     // Attempt to open specified file
     if((fp=fopen(filename, "r")) == NULL) {
@@ -1209 +1206 @@
         lineCount++;
 
-        if(!parseLine(&nestingLevel,parseLevelInfoArray,linePtr,lineCount,(char*)filename,overwrite)) {
+        if(!parseLine(&nestingLevel,parseLevelInfoArray,linePtr,lineCount,(char*)filename,overwrite) &&
+                nFail) {
             (*nFail)++;
         }