Changeset 27108

Timestamp:

Feb 26, 2010, 3:17:54 PM (16 years ago)

Author:

Paul Price

Message:

Bit more elegant solution.

Location:

trunk/ppStack/src

Files:

• ppStack.c (modified) (4 diffs)
• ppStack.h (modified) (1 diff)
• ppStackFinish.c (modified) (1 diff)

trunk/ppStack/src/ppStack.c

@@ -58 +58 @@
     // Common code for the death.
     {
-        psExit exitValue = ppStackExitCode(); // Exit code
+        psExit exitValue = ppStackExitCode(PS_EXIT_SUCCESS); // Exit code
 
         // Ensure everything closes
@@ -67 +67 @@
             ppStackFileActivation(config, PPSTACK_FILES_PHOT, true);
             if (!ppStackFilesIterateUp(config)) {
-                psErrorStackPrint(stderr, "Unable to close files.");
-                if (exitValue == PS_EXIT_SUCCESS) {
-                    exitValue = ppStackExitCode();
-                }
+                psError(psErrorCodeLast(), false, "Unable to close files.");
+                exitValue = ppStackExitCode(exitValue);
             }
         }
@@ -78 +76 @@
         psString dump = psMetadataLookupStr(&mdok, config->arguments, "DUMP_CONFIG"); // File for config
         if (dump && !pmConfigDump(config, dump)) {
-            psErrorStackPrint(stderr, "Unable to dump configuration.");
-            if (exitValue == PS_EXIT_SUCCESS) {
-                exitValue = ppStackExitCode();
-            }
+            psError(psErrorCodeLast(), false, "Unable to dump configuration.");
+            exitValue = ppStackExitCode(exitValue);
         }
 
@@ -93 +89 @@
         pmVisualClose();
 
+        exitValue = ppStackExitCode(exitValue);
         exit(exitValue);
     }

trunk/ppStack/src/ppStack.h

@@ -170 +170 @@
 
 /// Return an appropriate exit code based on the error code
-psExit ppStackExitCode(void);
+psExit ppStackExitCode(psExit exitValue);
 
 #endif

trunk/ppStack/src/ppStackFinish.c

@@ -94 +94 @@
 
 
-psExit ppStackExitCode(void)
+psExit ppStackExitCode(psExit exitValue)
 {
-    psExit exitValue = PS_EXIT_SUCCESS;        // Exit code to return
+    if (exitValue != PS_EXIT_SUCCESS) {
+        return exitValue;
+    }
+
     psErrorCode errorCode = psErrorCodeLast(); // Error code
     if (errorCode != PS_ERR_NONE) {