Changeset 13175

Timestamp:

May 2, 2007, 3:47:11 PM (19 years ago)

Author:

Paul Price

Message:

psMetadataConfigRead should not generate an error for an empty file.

File:

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

trunk/psLib/src/types/psMetadataConfig.c

@@ -11 +11 @@
 *  @author Joshua Hoblitt, University of Hawaii 2006-2007
 *
-*  @version $Revision: 1.134 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-04-18 19:38:36 $
+*  @version $Revision: 1.135 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-05-03 01:47:11 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -777 +777 @@
             return false;
         }
-        
+
         // covert the template, and the rest of the line, into a metadata
         tempMeta = parseTypeValues(template, linePtr);
@@ -889 +889 @@
         } else {
             psError(PS_ERR_IO, true,
-                    _("Failed to parse the value '%s' of metadata item %s, type %s."), 
+                    _("Failed to parse the value '%s' of metadata item %s, type %s."),
                     strValue, keyName, strType);
             returnValue = false;
@@ -1044 +1044 @@
                 break;
             }
-            
+
             // create the nested metadata
             psMetadata *newScope = psMetadataAlloc();
@@ -1109 +1109 @@
     }
 
-    // even if it's a "bad line" we know it can't be "blank" after this point 
+    // even if it's a "bad line" we know it can't be "blank" after this point
     *notBlank = true;
 
@@ -1298 +1298 @@
     // bus errors if the file is empty.  This seems like a strange result...
     if (buf.st_size == 0) {
-        psError(PS_ERR_IO, true, _("Empty file '%s'.\n"), filename);
+        // We successfully read everything we could.  Return a MD containing what we read.
         close(fd);
-        return NULL;
+        return psMetadataAlloc();
     }
 
@@ -1453 +1453 @@
             psError(PS_ERR_BAD_PARAMETER_VALUE, true,
                     _("Specified psDataType, %d, is not supported."), PS_DATA_UNKNOWN);
-            psTrace("psLib.types", 5, "failed to find key %s\n", (char *) keys->data[i]);
+            psTrace("psLib.types", 5, "failed to find key %s\n", (char *) keys->data[i]);
             psFree(keys);
             psFree(format);
@@ -1461 +1461 @@
         if (!str) {
             psError(PS_ERR_UNKNOWN, false, "failed to format psMetadataItem");
-            psTrace("psLib.types", 5, "failed to format %s\n", (char *) keys->data[i]);
+            psTrace("psLib.types", 5, "failed to format %s\n", (char *) keys->data[i]);
             psFree(keys);
             psFree(format);