9 files changed, 46 insertions, 32 deletions

diff --git a/src/util/common_logging.c b/src/util/common_logging.c
index 995f2e88a..2c0fd57a8 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,17 +571,16 @@ 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;
diff --git a/src/util/container_slist.c b/src/util/container_slist.c
index 950c4245e..6b5832583 100644
--- a/src/util/container_slist.c
+++ b/src/util/container_slist.c
@@ -268,6 +268,7 @@ GNUNET_CONTAINER_slist_contains (const struct GNUNET_CONTAINER_SList *l,
   return GNUNET_NO;
 }
 
+typedef int (*Comparator)(const void *,  size_t, const void *,  size_t);
 
 /**
  * Check if a list contains a certain element
@@ -283,7 +284,7 @@ GNUNET_CONTAINER_slist_contains (const struct GNUNET_CONTAINER_SList *l,
 void *
 GNUNET_CONTAINER_slist_contains2 (const struct GNUNET_CONTAINER_SList *l,
                                   const void *buf, size_t len,
-                                  int (*compare)(const void *, const size_t, const void *, const size_t))
+                                  Comparator compare)
 {
   struct GNUNET_CONTAINER_SList_Elem *e;
 
diff --git a/src/util/disk.c b/src/util/disk.c
index 847dad457..cba0d4467 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -270,7 +270,8 @@ GNUNET_DISK_file_seek (const struct GNUNET_DISK_FileHandle * h, OFF_T offset,
   }
 
 #ifdef MINGW
-  LARGE_INTEGER li, new_pos;
+  LARGE_INTEGER li;
+  LARGE_INTEGER new_pos;
   BOOL b;
 
   static DWORD t[] = {[GNUNET_DISK_SEEK_SET] = FILE_BEGIN,
diff --git a/src/util/getopt.c b/src/util/getopt.c
index 169949821..572e534c5 100644
--- a/src/util/getopt.c
+++ b/src/util/getopt.c
@@ -202,9 +202,8 @@ char *
 getenv ();
 
 static char *
-my_index (str, chr)
-  const char *str;
-  int chr;
+my_index (const char *str,
+          int chr)
 {
   while (*str)
   {
@@ -294,8 +293,7 @@ exchange (char **);
 #endif
 
 static void
-exchange (argv)
-  char **argv;
+exchange (char **argv)
 {
   int bottom = first_nonopt;
   int middle = last_nonopt;
@@ -381,10 +379,9 @@ static const char *
 _getopt_initialize (int, char *const *, const char *);
 #endif
 static const char *
-_getopt_initialize (argc, argv, optstring)
-  int argc;
-  char *const *argv;
-  const char *optstring;
+_getopt_initialize (int argc,
+                    char *const *argv,
+                    const char *optstring)
 {
   /* Start processing options with ARGV-element 1 (since ARGV-element 0
    * is the program name); the sequence of previously skipped
diff --git a/src/util/network.c b/src/util/network.c
index 54abcaba1..9323389ee 100644
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -508,15 +508,16 @@ GNUNET_NETWORK_socket_recvfrom_amount (const struct GNUNET_NETWORK_Handle *
 
   error = ioctl (desc->fd, FIONREAD, &pending);
   if (error == 0)
+    return (ssize_t) pending;
+  return GNUNET_NO;
 #else
   u_long pending;
 
   error = ioctlsocket (desc->fd, FIONREAD, &pending);
   if (error != SOCKET_ERROR)
+    return (ssize_t) pending;
+  return GNUNET_NO;
 #endif
-    return pending;
-  else
-    return GNUNET_NO;
 }
 
 
@@ -1079,7 +1080,6 @@ GNUNET_NETWORK_socket_select (struct GNUNET_NETWORK_FDSet *rfds,
                               const struct GNUNET_TIME_Relative timeout)
 {
   int nfds = 0;
-
 #ifdef MINGW
   int handles = 0;
   int ex_handles = 0;
@@ -1090,7 +1090,9 @@ GNUNET_NETWORK_socket_select (struct GNUNET_NETWORK_FDSet *rfds,
   int retcode = 0;
   DWORD ms_total = 0;
 
-  int nsock = 0, nhandles = 0, nSockEvents = 0;
+  int nsock = 0;
+  int nhandles = 0;
+  int nSockEvents = 0;
 
   static HANDLE hEventRead = 0;
   static HANDLE hEventWrite = 0;
@@ -1106,12 +1108,18 @@ GNUNET_NETWORK_socket_select (struct GNUNET_NETWORK_FDSet *rfds,
   DWORD newretcode = 0;
   int returnedpos = 0;
 
-  struct GNUNET_CONTAINER_SList *handles_read, *handles_write, *handles_except;
+  struct GNUNET_CONTAINER_SList *handles_read;
+  struct GNUNET_CONTAINER_SList *handles_write;
+  struct GNUNET_CONTAINER_SList *handles_except;
 
-  fd_set aread, awrite, aexcept;
+  fd_set aread;
+  fd_set awrite;
+  fd_set except;
 
 #if DEBUG_NETWORK
-  fd_set bread, bwrite, bexcept;
+  fd_set bread;
+  fd_set bwrite;
+  fd_set bexcept;
 #endif
 
   /* TODO: Make this growable */
diff --git a/src/util/os_priority.c b/src/util/os_priority.c
index f374ca56d..9def6ca54 100644
--- a/src/util/os_priority.c
+++ b/src/util/os_priority.c
@@ -649,10 +649,15 @@ GNUNET_OS_set_process_priority (struct GNUNET_OS_Process *proc,
 static char *
 CreateCustomEnvTable (char **vars)
 {
-  char *win32_env_table, *ptr, **var_ptr, *result, *result_ptr;
+  char *win32_env_table;
+  char *ptr;
+  char **var_ptr;
+  char *result;
+  char *result_ptr;
   size_t tablesize = 0;
   size_t items_count = 0;
-  size_t n_found = 0, n_var;
+  size_t n_found = 0;
+  size_t n_var;
   char *index = NULL;
   size_t c;
   size_t var_len;
diff --git a/src/util/program.c b/src/util/program.c
index bfa58dc65..b6d0c78c6 100644
--- a/src/util/program.c
+++ b/src/util/program.c
@@ -95,10 +95,10 @@ program_main (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * @param a2 second command line option
  */
 static int
-cmd_sorter (__const void *a1, __const void *a2)
+cmd_sorter (const void *a1, const void *a2)
 {
-  __const struct GNUNET_GETOPT_CommandLineOption *c1 = a1;
-  __const struct GNUNET_GETOPT_CommandLineOption *c2 = a2;
+  const struct GNUNET_GETOPT_CommandLineOption *c1 = a1;
+  const struct GNUNET_GETOPT_CommandLineOption *c2 = a2;
 
   if (toupper ((unsigned char) c1->shortName) >
       toupper ((unsigned char) c2->shortName))
diff --git a/src/util/pseudonym.c b/src/util/pseudonym.c
index d2efdc98f..016573845 100644
--- a/src/util/pseudonym.c
+++ b/src/util/pseudonym.c
@@ -539,7 +539,8 @@ list_pseudonym_helper (void *cls, const char *fullname)
   int32_t rating;
   struct GNUNET_CONTAINER_MetaData *meta;
   const char *fn;
-  char *str, *name_unique;
+  char *str;
+  char *name_unique;
 
   if (strlen (fullname) < sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded))
     return GNUNET_OK;
diff --git a/src/util/server.c b/src/util/server.c
index 6226dea6d..f707d1bf3 100644
--- a/src/util/server.c
+++ b/src/util/server.c
@@ -391,7 +391,7 @@ process_listen_socket (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 static struct GNUNET_NETWORK_Handle *
 open_listen_socket (const struct sockaddr *serverAddr, socklen_t socklen)
 {
-  const static int on = 1;
+  static int on = 1;
   struct GNUNET_NETWORK_Handle *sock;
   uint16_t port;
   int eno;