Changeset 29875

Timestamp:

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

Author:

eugene

Message:

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

File:

• branches/eam_branches/ipp-20101103/psLib/src/types/psMetadataConfig.c (modified) (1 diff)

branches/eam_branches/ipp-20101103/psLib/src/types/psMetadataConfig.c

@@ -1630 +1630 @@
 }
 
-# if (PS_SLURP_GZIP)
-bool psMetadataConfigWrite(psMetadata *md,
-                           const char *filename, const char *compress)
-{
-    PS_ASSERT_METADATA_NON_NULL(md, NULL);
-    PS_ASSERT_STRING_NON_EMPTY(filename, NULL);
-
+bool psMetadataConfigWrite(psMetadata *md, const char *filename, const char *compress)
+{
+  PS_ASSERT_METADATA_NON_NULL(md, NULL);
+  PS_ASSERT_STRING_NON_EMPTY(filename, NULL);
+
+  psString fileString = NULL;
+  fileString = psMetadataConfigFormat(md);
+  if (fileString == NULL) {
+    psError(PS_ERR_BAD_PARAMETER_NULL, false, "psMetadataConfigFormat returned NULL.\n");
+    return false;
+  }
+
+  if (compress) {
+    if (strlen(compress) > 2) {
+      psError(PS_ERR_BAD_PARAMETER_VALUE, true, "invalid compression options %s", compress);
+      psFree(fileString);
+      return false;
+    }
     char modeString[4];
-
-    if (compress) {
-        if (strlen(compress) > 2) {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, true, "invalid compression options %s", compress);
-            return false;
-        }
-        snprintf (modeString, 4, "w%s", compress);
-    } else {
-        strcpy (modeString, "w0");
-    }   
+    snprintf (modeString, 4, "w%s", compress);
 
     gzFile file = gzopen(filename, modeString);
     if (file == Z_NULL) {
-        psError(PS_ERR_IO, true, "Failed to open specified file, %s\n", filename);
-        return false;
-    }
-
-    psString fileString = NULL;
-    fileString = psMetadataConfigFormat(md);
-    if (fileString == NULL) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, false, "psMetadataConfigFormat returned NULL.\n");
-        return false;
+      psError(PS_ERR_IO, true, "Failed to open specified file, %s\n", filename);
+      psFree(fileString);
+      return false;
     }
 
     int nbytes = gzwrite (file, fileString, strlen(fileString));
     if (nbytes != strlen(fileString)) {
-        psError(PS_ERR_IO, true, "Failed to write contents of configuration file %s", filename);
-        psFree(fileString);
-        gzclose(file);
-        return false;
+      psError(PS_ERR_IO, true, "Failed to write contents of configuration file %s", filename);
+      psFree(fileString);
+      gzclose(file);
+      return false;
     }
     psFree(fileString);
     if (gzclose(file) != Z_OK) {
-        psError(PS_ERR_IO, true, "Failed to close file, %s\n", filename);
-        return false;
-    }
-    return true;
-}
-
-# else
-
-bool psMetadataConfigWrite(psMetadata *md,
-                           const char *filename, const char *compress)
-{
-    PS_ASSERT_METADATA_NON_NULL(md, NULL);
-    PS_ASSERT_STRING_NON_EMPTY(filename, NULL);
-
+      psError(PS_ERR_IO, true, "Failed to close file, %s\n", filename);
+      return false;
+    }
+  } else {
     FILE *file = fopen(filename, "w");
     if (file == NULL) {
-        psError(PS_ERR_IO, true,
-                "Failed to open specified file, %s\n", filename);
-        return false;
-    }
-
-    psString fileString = NULL;
-    fileString = psMetadataConfigFormat(md);
-    if (fileString == NULL) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, false, "psMetadataConfigFormat returned NULL.\n");
-        return false;
+      psError(PS_ERR_IO, true, "Failed to open specified file, %s\n", filename);
+      psFree(fileString);
+      return false;
     }
 
     int nbytes = fwrite(fileString, 1, strlen(fileString), file);
     if (nbytes != strlen(fileString)) {
-        psError(PS_ERR_IO, true, "Failed to write contents of configuration file %s", filename);
-        psFree(fileString);
-        fclose(file);
-        return false;
+      psError(PS_ERR_IO, true, "Failed to write contents of configuration file %s", filename);
+      psFree(fileString);
+      fclose(file);
+      return false;
     }
     psFree(fileString);
     if (fclose(file) == EOF) {
-        psError(PS_ERR_IO, true, "Failed to close file, %s\n", filename);
-        return false;
-    }
-    return true;
-}
-# endif /* PS_SLURP_GZIP */
+      psError(PS_ERR_IO, true, "Failed to close file, %s\n", filename);
+      return false;
+    }
+  }
+  return true;
+}
 
 bool psMetadataConfigPrint(FILE *stream,