fixes

10 files changed, 18 insertions, 33 deletions

diff --git a/src/util/configuration.c b/src/util/configuration.c
index 0ce672dd9..8c32618e2 100644
--- a/src/util/configuration.c
+++ b/src/util/configuration.c
@@ -807,13 +807,11 @@ GNUNET_CONFIGURATION_remove_value_filename (struct GNUNET_CONFIGURATION_Handle
   char *end;
   char *match;
   char old;
-  int ret;
 
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_string (cfg, section, option, &list))
     return GNUNET_NO;
   match = escape_name (value);
-  ret = 0;
   pos = list;
   while (1)
     {
diff --git a/src/util/crypto_hash.c b/src/util/crypto_hash.c
index 45e599bcf..bc15113c6 100644
--- a/src/util/crypto_hash.c
+++ b/src/util/crypto_hash.c
@@ -214,10 +214,6 @@ sha512_transform (unsigned long long *state, const unsigned char *input)
   state[5] += f;
   state[6] += g;
   state[7] += h;
-
-  /* erase our data */
-  a = b = c = d = e = f = g = h = t1 = t2 = 0;
-  memset (W, 0, 80 * sizeof (unsigned long long));
 }
 
 static void
@@ -281,13 +277,13 @@ sha512_final (struct sha512_ctx *sctx, unsigned char *hash)
   static unsigned char padding[128] = { 0x80, };
 
   unsigned int t;
-  unsigned long long t2;
   unsigned char bits[128];
-  unsigned int index, pad_len;
+  unsigned int index;
+  unsigned int pad_len;
+  unsigned long long t2;
   int i, j;
 
-  index = pad_len = t = i = j = 0;
-  t2 = 0;
+  t = i = j = 0;
 
   /* Save number of bits */
   t = sctx->count[0];
diff --git a/src/util/crypto_rsa.c b/src/util/crypto_rsa.c
index f686c0359..edf1b2bdf 100644
--- a/src/util/crypto_rsa.c
+++ b/src/util/crypto_rsa.c
@@ -602,7 +602,7 @@ GNUNET_CRYPTO_rsa_key_create_from_file (const char *filename)
               GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                           _
                           ("Could not aquire lock on file `%s' due to process %u: %s...\n"),
-                          filename, fl.l_pid, STRERROR (errno));
+                          filename, fl.l_pid, STRERROR (ec));
             }
           memset (&fl, 0, sizeof (struct flock));
           fl.l_type = F_WRLCK;
@@ -624,7 +624,6 @@ GNUNET_CRYPTO_rsa_key_create_from_file (const char *filename)
       fl.l_type = F_UNLCK;
       fl.l_whence = SEEK_SET;
       fl.l_len = sizeof (struct RsaPrivateKeyBinaryEncoded);
-      cnt = 0;
       if (0 != fcntl (fd, F_SETLK, &fl))
         GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
                                   "fcntl", filename);
@@ -659,7 +658,7 @@ GNUNET_CRYPTO_rsa_key_create_from_file (const char *filename)
               GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                           _
                           ("Could not aquire lock on file `%s' due to process %u: %s...\n"),
-                          filename, fl.l_pid, STRERROR (errno));
+                          filename, fl.l_pid, STRERROR (ec));
               GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                           _
                           ("This may be ok if someone is currently generating a hostkey.\n"));
diff --git a/src/util/disk.c b/src/util/disk.c
index 3f46923f7..f6a4e7b90 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -1038,7 +1038,6 @@ GNUNET_DISK_file_open (const char *fn, int flags, ...)
 
 #ifndef MINGW
   mode = 0;
-  oflags = 0;
   if (GNUNET_DISK_OPEN_READWRITE == (flags & GNUNET_DISK_OPEN_READWRITE))
     oflags = O_RDWR; /* note: O_RDWR is NOT always O_RDONLY | O_WRONLY */
   else if (flags & GNUNET_DISK_OPEN_READ)
diff --git a/src/util/getopt_helpers.c b/src/util/getopt_helpers.c
index 3aea5d102..a8a800a00 100644
--- a/src/util/getopt_helpers.c
+++ b/src/util/getopt_helpers.c
@@ -50,11 +50,11 @@ GNUNET_GETOPT_format_help_ (struct GNUNET_GETOPT_CommandLineProcessorContext
                             const char *value)
 {
   const char *about = scls;
-  int slen;
-  int i;
+  size_t slen;
+  unsigned int i;
   int j;
-  int ml;
-  int p;
+  size_t ml;
+  size_t p;
   char *scp;
   const char *trans;
   const struct GNUNET_GETOPT_CommandLineOption *opt;
@@ -62,7 +62,6 @@ GNUNET_GETOPT_format_help_ (struct GNUNET_GETOPT_CommandLineProcessorContext
   printf ("%s\n%s\n", ctx->binaryOptions, gettext (about));
   printf (_
           ("Arguments mandatory for long options are also mandatory for short options.\n"));
-  slen = 0;
   i = 0;
   opt = ctx->allOptions;
   while (opt[i].description != NULL)
diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index cc1d61c20..39b5174e3 100644
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -213,14 +213,12 @@ get_path_from_PATH ()
   char *end;
   char *buf;
   const char *p;
-  size_t size;
 
   p = getenv ("PATH");
   if (p == NULL)
     return NULL;
   path = GNUNET_strdup (p);     /* because we write on it */
   buf = GNUNET_malloc (strlen (path) + 20);
-  size = strlen (path);
   pos = path;
 
   while (NULL != (end = strchr (pos, ':')))
diff --git a/src/util/os_network.c b/src/util/os_network.c
index 4268772df..c872350c5 100644
--- a/src/util/os_network.c
+++ b/src/util/os_network.c
@@ -163,13 +163,11 @@ GNUNET_OS_network_interfaces_list (GNUNET_OS_NetworkInterfaceProcessor proc,
 #elif HAVE_GETIFADDRS && HAVE_FREEIFADDRS
 
   struct ifaddrs *ifa_first;
+  struct ifaddrs *ifa_ptr;
   socklen_t alen;
 
   if (getifaddrs (&ifa_first) == 0)
     {
-      struct ifaddrs *ifa_ptr;
-
-      ifa_ptr = ifa_first;
       for (ifa_ptr = ifa_first; ifa_ptr != NULL; ifa_ptr = ifa_ptr->ifa_next)
         {
           if (ifa_ptr->ifa_name != NULL &&
diff --git a/src/util/test_crypto_aes_weak.c b/src/util/test_crypto_aes_weak.c
index 2ce553a21..a694b6481 100644
--- a/src/util/test_crypto_aes_weak.c
+++ b/src/util/test_crypto_aes_weak.c
@@ -145,7 +145,6 @@ getWeakKeys ()
         {
           printf ("testweakkey: gcry_cipher_open failed on trial %d. %s\n",
                   number_of_runs, gcry_strerror (rc));
-          rc = 0;
           continue;
         }
 
diff --git a/src/util/test_os_load.c b/src/util/test_os_load.c
index b46a3eb59..7165e7ef2 100644
--- a/src/util/test_os_load.c
+++ b/src/util/test_os_load.c
@@ -165,7 +165,7 @@ testdisk ()
     }
   fprintf (stderr, "\n");
   GNUNET_CONFIGURATION_destroy (cfg);
-  return 0;
+  return ret;
 }
 
 int
diff --git a/src/util/test_scheduler.c b/src/util/test_scheduler.c
index 0d5af1c0c..811389953 100644
--- a/src/util/test_scheduler.c
+++ b/src/util/test_scheduler.c
@@ -138,7 +138,6 @@ task1 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   int *ok = cls;
   GNUNET_SCHEDULER_TaskIdentifier t2;
-  GNUNET_SCHEDULER_TaskIdentifier t3;
   GNUNET_SCHEDULER_TaskIdentifier t4;
 
   GNUNET_assert (1 == *ok);
@@ -154,12 +153,12 @@ task1 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                                    GNUNET_NO,
                                    GNUNET_SCHEDULER_PRIORITY_IDLE,
                                    t2, &task4, cls);
-  t3 = GNUNET_SCHEDULER_add_delayed (tc->sched,
-                                     GNUNET_NO,
-                                     GNUNET_SCHEDULER_PRIORITY_DEFAULT,
-                                     t2,
-                                     GNUNET_TIME_relative_get_zero (),
-                                     &task3, cls);
+  GNUNET_SCHEDULER_add_delayed (tc->sched,
+                                GNUNET_NO,
+                                GNUNET_SCHEDULER_PRIORITY_DEFAULT,
+                                t2,
+                                GNUNET_TIME_relative_get_zero (),
+                                &task3, cls);
   /* t4 will go first: lower prio, but prereq! */
   GNUNET_SCHEDULER_add_after (tc->sched,
                               GNUNET_NO,