Changeset 9750 for trunk/psLib/src/types

Timestamp:

Oct 25, 2006, 6:44:09 PM (20 years ago)

Author:

drobbin

Message:

Update MetadataConfig tests. Removed unreachable spots from psMetadataConfigParse.

File:

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

trunk/psLib/src/types/psMetadataConfig.c

@@ -10 +10 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.97 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-10-25 00:16:33 $
+*  @version $Revision: 1.98 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-10-26 04:44:09 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1166 +1166 @@
     // Attempt to open specified file
     int fd = 0;
-    if (!(fd = open(filename, O_RDONLY))) {
+    fd = open(filename, O_RDONLY);
+    struct stat buf;                    // Results of stat() for file
+    if (fd < 0 || fstat(fd, &buf) != 0) {
         // XXX really should return strerror() here
         psError(PS_ERR_IO, true,
                 _("Failed to open file '%s'. Check if it exists and it has the proper "
                   "permissions."), filename);
+        close(fd);
         return NULL;
     }
-
-    struct stat buf;                    // Results of stat() for file
+    /*  This appears to be unreachable, but moving to check above just to be sure.
     if (fstat(fd, &buf) != 0) {
         psError(PS_ERR_IO, true, _("Unable to stat file '%s'.\n"), filename);
@@ -1180 +1182 @@
         return NULL;
     }
-
+    */
     // psMetadataConfigParse() is going to read the entire file into memory so
     // we're trying to be nice by allowing the VM to flush the file out of
@@ -1188 +1190 @@
     if (file == MAP_FAILED) {
         psError(PS_ERR_IO, true, _("failed to mmap() file %s"), filename);
-        if (close(fd) != 0) {
-            // XXX really should return strerror() here
-            psError(PS_ERR_IO, true, _("Failed to close file '%s'."), filename);
-            return NULL;
-        }
+        /*        if (close(fd) != 0) {
+                    // XXX really should return strerror() here
+                    psError(PS_ERR_IO, true, _("Failed to close file '%s'."), filename);
+                    return NULL;
+                }
+        */
+        close(fd);
         return NULL;
     }
@@ -1199 +1203 @@
 
     munmap(file, (size_t)buf.st_size);
-
+    /*
     if (close(fd) != 0) {
         // XXX really should return strerror() here
@@ -1205 +1209 @@
         return NULL;
     }
-
+    */
+    close(fd);
     return md;
 }
@@ -1241 +1246 @@
 
     psList *doc = psStringSplit(str, "\n", false);
-    if (!doc) {
+    if (!doc || doc->n == 0) {
+        if (doc != NULL)
+            psFree(doc);
         psFree(parseLevelInfoArray);
         psFree(md);