5 files changed, 32 insertions, 30 deletions

diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index d60ff62d6..c52ac93c7 100644
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -204,6 +204,7 @@ EXTRA_DIST = \
   test_dht_multipeer.conf \
   test_dht_2dtorus.conf \
   test_dht_line.conf \
+  test_dht_tools.conf \
   test_dht_tools.py.in \
   test_dht_multipeer_topology.dat
 
diff --git a/src/pq/pq_result_helper.c b/src/pq/pq_result_helper.c
index 045fe74b1..d9fed26a6 100644
--- a/src/pq/pq_result_helper.c
+++ b/src/pq/pq_result_helper.c
@@ -100,8 +100,8 @@ extract_varsize_blob (void *cls,
   idst = GNUNET_malloc (len);
   *((void **) dst) = idst;
   GNUNET_memcpy (idst,
-          res,
-          len);
+                 res,
+                 len);
   return GNUNET_OK;
 }
 
@@ -165,7 +165,7 @@ extract_fixed_blob (void *cls,
   {
     GNUNET_break (0);
     return GNUNET_SYSERR;
-  } 
+  }
 
   /* if a field is null, continue but
    * remember that we now return a different result */
@@ -182,8 +182,8 @@ extract_fixed_blob (void *cls,
                     fnum);
   GNUNET_assert (NULL != res);
   GNUNET_memcpy (dst,
-          res,
-          len);
+                 res,
+                 len);
   return GNUNET_OK;
 }
 
@@ -580,7 +580,7 @@ extract_uint16 (void *cls,
   if (PQgetisnull (result,
                    row,
                    fnum))
-  { 
+  {
     GNUNET_break (0);
     return GNUNET_SYSERR;
   }
@@ -590,6 +590,14 @@ extract_uint16 (void *cls,
     GNUNET_break (0);
     return GNUNET_SYSERR;
   }
+  if (sizeof (uint16_t) !=
+      PQgetlength (result,
+                   row,
+                   fnum))
+  {
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
   res = (uint16_t *) PQgetvalue (result,
                                  row,
                                  fnum);
@@ -663,6 +671,14 @@ extract_uint32 (void *cls,
     GNUNET_break (0);
     return GNUNET_SYSERR;
   }
+  if (sizeof (uint32_t) !=
+      PQgetlength (result,
+                   row,
+                   fnum))
+  {
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
   res = (uint32_t *) PQgetvalue (result,
                                  row,
                                  fnum);
@@ -736,6 +752,14 @@ extract_uint64 (void *cls,
     GNUNET_break (0);
     return GNUNET_SYSERR;
   }
+  if (sizeof (uint64_t) !=
+      PQgetlength (result,
+                   row,
+                   fnum))
+  {
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
   res = (uint64_t *) PQgetvalue (result,
                                  row,
                                  fnum);
diff --git a/src/psycutil/psyc_message.c b/src/psycutil/psyc_message.c
index 3421fd0ba..3bd99425e 100644
--- a/src/psycutil/psyc_message.c
+++ b/src/psycutil/psyc_message.c
@@ -818,7 +818,6 @@ GNUNET_PSYC_transmit_cancel (struct GNUNET_PSYC_TransmitHandle *tmit)
 
   /* FIXME */
   struct GNUNET_MessageHeader msg;
-  msg.type = htons (GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_DATA);
   msg.type = htons (GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_CANCEL);
   msg.size = htons (sizeof (msg));
   transmit_queue_insert (tmit, &msg, GNUNET_YES);
diff --git a/src/rps/test_rps.c b/src/rps/test_rps.c
index 6189557f6..7d61ae6a1 100644
--- a/src/rps/test_rps.c
+++ b/src/rps/test_rps.c
@@ -1296,7 +1296,7 @@ manage_service_wrapper (unsigned int i, unsigned int j,
                         enum PEER_ONLINE_DELTA delta,
                         double prob_go_on_off)
 {
-  struct OpListEntry *entry;
+  struct OpListEntry *entry = NULL;
   uint32_t prob;
 
   /* make sure that management operation is not already scheduled */
diff --git a/src/util/scheduler.c b/src/util/scheduler.c
index 279a4ed02..e92405a96 100644
--- a/src/util/scheduler.c
+++ b/src/util/scheduler.c
@@ -135,18 +135,6 @@ struct GNUNET_SCHEDULER_Task
   unsigned int fds_len;
 
   /**
-   * if this task is related to multiple FDs this array contains
-   * all FdInfo structs that were marked as ready by calling
-   * #GNUNET_SCHEDULER_task_ready
-   */
-  struct GNUNET_SCHEDULER_FdInfo *ready_fds;
-
-  /**
-   * Size of the @e ready_fds array
-   */
-  unsigned int ready_fds_len;
-
-  /**
    * Do we own the network and file handles referenced by the FdInfo
    * structs in the fds array. This will only be GNUNET_YES if the
    * task was created by the #GNUNET_SCHEDULER_add_select function.
@@ -347,11 +335,6 @@ static struct GNUNET_SCHEDULER_Task *ready_tail[GNUNET_SCHEDULER_PRIORITY_COUNT]
 static unsigned int ready_count;
 
 /**
- * How many tasks have we run so far?
- */
-static unsigned long long tasks_run;
-
-/**
  * Priority of the task running right now.  Only
  * valid while a task is running.
  */
@@ -561,10 +544,6 @@ destroy_task (struct GNUNET_SCHEDULER_Task *t)
   {
     GNUNET_array_grow (t->fds, t->fds_len, 0);
   }
-  if (t->ready_fds_len > 0)
-  {
-    GNUNET_array_grow (t->ready_fds, t->ready_fds_len, 0);
-  }
 #if EXECINFO
   GNUNET_free (t->backtrace_strings);
 #endif
@@ -2020,7 +1999,6 @@ GNUNET_SCHEDULER_run_from_driver (struct GNUNET_SCHEDULER_Handle *sh)
     active_task = NULL;
     dump_backtrace (pos);
     destroy_task (pos);
-    tasks_run++;
   }
   shutdown_if_no_lifeness ();
   if (0 == ready_count)