Changeset 27840 for branches/simtest_nebulous_branches/psModules/src/config/pmConfigDump.c

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/config/pmConfigDump.c (modified) (6 diffs)

branches/simtest_nebulous_branches/psModules/src/config/pmConfigDump.c

@@ -14 +14 @@
 #include "pmFPAfile.h"
 #include "pmConfigCamera.h"
+#include "pmErrorCodes.h"
 
 #include "pmConfigDump.h"
@@ -55 +56 @@
 
     if (!configCull(config->recipes, keep)) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to cull system recipes.");
+        psError(psErrorCodeLast(), false, "Unable to cull system recipes.");
         psFree(keep);
         return false;
@@ -64 +65 @@
     psMetadata *cameras = psMetadataLookupMetadata(NULL, config->system, "CAMERAS"); // Known cameras
     if (!cameras) {
-        psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find CAMERAS in the system configuration.\n");
+        psError(PM_ERR_CONFIG, false, "Unable to find CAMERAS in the system configuration.\n");
         return false;
     }
@@ -80 +81 @@
         }
         if (!configCull(recipes, keep)) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to cull recipes for camera %s", item->name);
+            psError(psErrorCodeLast(), false, "Unable to cull recipes for camera %s", item->name);
             psFree(iter);
             psFree(keep);
@@ -98 +99 @@
       psMetadata *cameras = psMetadataLookupMetadata(NULL, config->system, "CAMERAS"); // Known cameras
       if (!cameras) {
-          psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find CAMERAS in the system configuration.\n");
+          psError(PM_ERR_CONFIG, false, "Unable to find CAMERAS in the system configuration.\n");
           return NULL;
       }
@@ -144 +145 @@
 
     psString resolved = pmConfigConvertFilename(filename, config, true, false); // Resolved filename
+    if (!resolved) {
+        psError(psErrorCodeLast(), false, "Unable to create file for configuration dump: %s", filename);
+        return false;
+    }
 
     if (!psMetadataConfigWrite(config->user, resolved)) {
-        psError(PS_ERR_IO, false, "Unable to dump configuration to %s", filename);
+        psError(psErrorCodeLast(), false, "Unable to dump configuration to %s", filename);
         psFree(resolved);
         return false;