Imported Upstream version 0.9.3upstream/0.9.3

1 files changed, 9 insertions, 8 deletions

diff --git a/src/util/common_logging.c b/src/util/common_logging.c
index e19aa8c..2c0fd57 100644
--- a/src/util/common_logging.c
+++ b/src/util/common_logging.c
@@ -530,6 +530,8 @@ parse_all_definitions ()
   gnunet_force_log_parsed = GNUNET_YES;
 }
 #endif
+
+
 /**
  * Setup logging.
  *
@@ -569,30 +571,29 @@ GNUNET_log_setup (const char *comp, const char *loglevel, const char *logfile)
   if (NULL == fn)
     return GNUNET_SYSERR;
   dirwarn = (GNUNET_OK != GNUNET_DISK_directory_create_for_file (fn));
-  altlog_fd = OPEN (fn, O_APPEND |
 #if WINDOWS
+  altlog_fd = OPEN (fn, O_APPEND |
                         O_BINARY |
-#endif
                         O_WRONLY | O_CREAT,
-#if WINDOWS
-                        _S_IREAD | _S_IWRITE
+                        _S_IREAD | _S_IWRITE);
 #else
-                        S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH
+  altlog_fd = OPEN (fn, O_APPEND |
+                        O_WRONLY | O_CREAT,
+                        S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
 #endif
-                   );
   if (altlog_fd != -1)
   {
     int dup_return;
     if (GNUNET_stderr != NULL)
       fclose (GNUNET_stderr);
     dup_return = dup2 (altlog_fd, 2);
-    close (altlog_fd);
+    (void) close (altlog_fd);
     if (dup_return != -1)
     {
       altlog = fdopen (2, "ab");
       if (altlog == NULL)
       {
-        close (2);
+        (void) close (2);
         altlog_fd = -1;
       }
     }