Changeset 7300 for trunk/psLib/src/types

Timestamp:

Jun 2, 2006, 11:33:34 AM (20 years ago)

Author:

Paul Price

Message:

Applying patches from RHL.

• Correctly detect cfitsio 3 (ffdkopn)
• Add PS_ERR_FITS_BAD
• Free memory leaks caused by extra columns with FITS tables
• Report error for singular matrices in LMM
• Add psErrorCodeLast
• Write psAbort errors, even if logging is off; flush the file descriptor
• Useful macro: PS_FILE_LINE
• Print a newline if the last character of a trace lacks one
• When moving arguments down, set the vacated slot to NULL (so that original is valid)
• If nFail is omitted, push an error if appropriate

Location:

trunk/psLib/src/types

Files:

• psArguments.c (modified) (2 diffs)
• psMetadataConfig.c (modified) (3 diffs)

trunk/psLib/src/types/psArguments.c

@@ -7 +7 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-05-25 03:51:33 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-02 21:33:34 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -96 +96 @@
             argv[i] = argv[i+1];
         }
+        argv[*argc] = NULL;
     } else {
         return false;

trunk/psLib/src/types/psMetadataConfig.c

@@ -10 +10 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.57 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-05-30 22:18:39 $
+*  @version $Revision: 1.58 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-06-02 21:33:34 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1110 +1110 @@
 
     // While loop to parse the file
+    psErrorClear();   // so we can call psError(..., false, ...)
     while(fgets(line, MAX_STRING_LENGTH, fp) != NULL) {
 
@@ -1116 +1117 @@
         lineCount++;
 
-        if(!parseLine(&nestingLevel,parseLevelInfoArray,linePtr,lineCount,(char*)filename,overwrite) &&
-                nFail) {
-            (*nFail)++;
+        if(!parseLine(&nestingLevel,parseLevelInfoArray,linePtr,lineCount,(char*)filename,overwrite)) {
+            if (nFail != NULL) {
+                (*nFail)++;
+            } else {
+                psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Error parsing line: %s", linePtr);
+            }
         }
     }