Changeset 29876

Timestamp:

Nov 29, 2010, 11:39:13 AM (15 years ago)

Author:

eugene

Message:

if no compression is requested, use standard fopen / fwrite functions

File:

• branches/eam_branches/ipp-20101103/ppConfigDump/src/ppConfigDump.c (modified) (3 diffs)

branches/eam_branches/ipp-20101103/ppConfigDump/src/ppConfigDump.c

@@ -28 +28 @@
           psMetadata *md,           // Metadata to dump
           const char *compressMode
-          )
+    )
 {
     if (!filename || strlen(filename) == 0) {
@@ -40 +40 @@
         }
 
-# if (PS_SLURP_GZIP) 
-
-        char modeString[4];
-
         if (compressMode) {
             if (strlen(compressMode) > 2) {
@@ -49 +45 @@
                 die(PS_EXIT_CONFIG_ERROR);
             }
+            char modeString[4];
             snprintf (modeString, 4, "w%s", compressMode);
+
+            gzFile file = gzdopen (STDOUT_FILENO, modeString);
+            if (file == Z_NULL) {
+                psErrorStackPrint(stderr, "Failed to open file\n");
+                die(PS_EXIT_SYS_ERROR);
+            }
+            int nbytes = gzwrite (file, string, strlen(string));
+            if (nbytes != strlen(string)) {
+                psErrorStackPrint(stderr, "Failed to write contents of configuration file %s", filename);
+                psFree(string);
+                gzclose(file);
+                die(PS_EXIT_SYS_ERROR);
+            }
+            psFree(string);
+            if (gzclose(file) != Z_OK) {
+                psErrorStackPrint(stderr, "Failed to close file, %s\n", filename);
+                die(PS_EXIT_SYS_ERROR);
+            }
         } else {
-            strcpy (modeString, "w0");
-        }       
-
-        gzFile file = gzdopen (STDOUT_FILENO, modeString);
-        if (file == Z_NULL) {
-            psErrorStackPrint(stderr, "Failed to open file\n");
+            fprintf(stdout, "%s", string);
+        }
+        psFree(string);
+    } else {
+        if (!psMetadataConfigWrite(md, filename, compressMode)) {
+            psErrorStackPrint(stderr, "Can't write %s to %s\n", description, filename);
             die(PS_EXIT_SYS_ERROR);
         }
-        int nbytes = gzwrite (file, string, strlen(string));
-        if (nbytes != strlen(string)) {
-            psErrorStackPrint(stderr, "Failed to write contents of configuration file %s", filename);
-            psFree(string);
-            gzclose(file);
-            die(PS_EXIT_SYS_ERROR);
-        }
-        psFree(string);
-        if (gzclose(file) != Z_OK) {
-            psErrorStackPrint(stderr, "Failed to close file, %s\n", filename);
-            die(PS_EXIT_SYS_ERROR);
-        }
-# else
-        fprintf(stdout, "%s", string);
-# endif
-        psFree(string);
-    } else if (!psMetadataConfigWrite(md, filename, compressMode)) {
-        psErrorStackPrint(stderr, "Can't write %s to %s\n", description, filename);
-        die(PS_EXIT_SYS_ERROR);
     }
 }