Changeset 14744

Timestamp:

Sep 4, 2007, 4:30:30 PM (19 years ago)

Author:

Paul Price

Message:

Allow use of NULL 'file' or 'list' argument name in making a filelist.
For example, I may not wish to offer a list option.

File:

• trunk/psModules/src/config/pmConfig.c (modified) (5 diffs)

trunk/psModules/src/config/pmConfig.c

@@ -4 +4 @@
  *  @author EAM (IfA)
  *
- *  @version $Revision: 1.103 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-08-27 21:56:17 $
+ *  @version $Revision: 1.104 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-05 02:30:30 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1120 +1120 @@
     PS_ASSERT_INT_NONNEGATIVE(*argc, NULL);
     PS_ASSERT_PTR_NON_NULL(argv, NULL);
-    PS_ASSERT_STRING_NON_EMPTY(file, NULL);
-    PS_ASSERT_STRING_NON_EMPTY(list, NULL);
 
     int Narg;
@@ -1131 +1129 @@
     // maybe a comma-separated list of words
     // each word may be a glob: "file*.fits"
-    if ((Narg = psArgumentGet (*argc, argv, file))) {
+    if (file && strlen(file) > 0 && (Narg = psArgumentGet (*argc, argv, file))) {
 
         // select the word after 'file' and split by comma
@@ -1160 +1158 @@
 
     // load the list from the supplied text file
-    if ((Narg = psArgumentGet (*argc, argv, list))) {
+    if (list && strlen(list) > 0 && (Narg = psArgumentGet (*argc, argv, list))) {
         int nItems;
         char line[1024]; // XXX limits the list lines to 1024 chars
@@ -1198 +1196 @@
     PS_ASSERT_PTR_NON_NULL(metadata, false);
     PS_ASSERT_STRING_NON_EMPTY(name, NULL);
-    PS_ASSERT_STRING_NON_EMPTY(file, NULL);
-    PS_ASSERT_STRING_NON_EMPTY(list, NULL);
 
     psErrorClear();   // pmConfigFileSets may or may not call psError, so