Remove commented out code.

[geeqie.git] / src / secure_save.c

diff --git a/src/secure_save.c b/src/secure_save.c
index a52651e..314f319 100644 (file)
--- a/src/secure_save.c
+++ b/src/secure_save.c
@@ -1,6 +1,6 @@
 /*
  * Geeqie
- * Copyright (C) 2008 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * based on the code developped for ELinks by Laurent Monin
  *
@@ -9,6 +9,7 @@
  * This software comes with no warranty of any kind, use at your own risk!
  */
 
+#include <glib/gprintf.h>
 #include <glib/gstdio.h>
 #include <errno.h>
 #include <utime.h>
@@ -232,7 +233,7 @@ secure_close(SecureSaveInfo *ssi)
         * while closing file releases file descriptor we need to call fsync(). */
 #if defined(HAVE_FFLUSH) || defined(HAVE_FSYNC)
        if (ssi->secure_save) {
-               int fail = 0;
+               gboolean fail = FALSE;
 
 #ifdef HAVE_FFLUSH
                fail = (fflush(ssi->fp) == EOF);
@@ -275,8 +276,8 @@ secure_close(SecureSaveInfo *ssi)
                        /* set the dest file attributes to that of source (ignoring errors) */
                        if (ssi->preserve_perms)
                                {
-                               chown(ssi->tmp_file_name, st.st_uid, st.st_gid);
-                               chmod(ssi->tmp_file_name, st.st_mode);
+                               if (chown(ssi->tmp_file_name, st.st_uid, st.st_gid) != 0) log_printf("chown('%s', %d, %d) failed", ssi->tmp_file_name, st.st_uid, st.st_gid);
+                               if (chmod(ssi->tmp_file_name, st.st_mode) != 0) log_printf("chmod('%s', %o) failed", ssi->tmp_file_name, st.st_mode);
                                }
 
                        if (ssi->preserve_mtime)
@@ -362,8 +363,7 @@ secure_fprintf(SecureSaveInfo *ssi, const gchar *format, ...)
        if (!ssi || !ssi->fp || ssi->err) return -1;
 
        va_start(ap, format);
-       ret = vfprintf(ssi->fp, format, ap);
-       if (ret < 0) ssi->err = errno;
+       ret = g_vfprintf(ssi->fp, format, ap);
        va_end(ap);
 
        return ret;
@@ -373,7 +373,7 @@ secure_fprintf(SecureSaveInfo *ssi, const gchar *format, ...)
  * the number of elements to write. If ssi->err is set when called, it immediatly returns 0.
  */
 size_t
-secure_fwrite(const void *ptr, size_t size, size_t nmemb, SecureSaveInfo *ssi)
+secure_fwrite(gconstpointer ptr, size_t size, size_t nmemb, SecureSaveInfo *ssi)
 {
        size_t ret;
 
@@ -415,3 +415,4 @@ secsave_strerror(SecureSaveErrno secsave_error)
                return _("Secure file saving error");
        }
 }
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */