-misc fixes based on cppcheck

2 files changed, 25 insertions, 24 deletions

diff --git a/src/experimentation/gnunet-daemon-experimentation_nodes.c b/src/experimentation/gnunet-daemon-experimentation_nodes.c
index a4da92d50..37b0eba45 100644
--- a/src/experimentation/gnunet-daemon-experimentation_nodes.c
+++ b/src/experimentation/gnunet-daemon-experimentation_nodes.c
@@ -260,17 +260,17 @@ remove_request (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * @param buf the buffer to copy to
  * @return bytes passed
  */
-size_t send_experimentation_request_cb (void *cls, size_t bufsize, void *buf)
+static size_t 
+send_experimentation_request_cb (void *cls, size_t bufsize, void *buf)
 {
-        struct Node *n = cls;
-        struct Experimentation_Request msg;
-        size_t msg_size = sizeof (msg);
-        size_t ri_size = sizeof (struct Experimentation_Issuer) * GSE_my_issuer_count;
-        size_t total_size = msg_size + ri_size;
-
-        memset (buf, '\0', bufsize);
-        n->cth = NULL;
-  if (buf == NULL)
+  struct Node *n = cls;
+  struct Experimentation_Request msg;
+  size_t msg_size = sizeof (msg);
+  size_t ri_size = sizeof (struct Experimentation_Issuer) * GSE_my_issuer_count;
+  size_t total_size = msg_size + ri_size;
+        
+  n->cth = NULL;
+  if (NULL == buf)
   {
     /* client disconnected */
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Client disconnected\n");
@@ -279,6 +279,7 @@ size_t send_experimentation_request_cb (void *cls, size_t bufsize, void *buf)
     GNUNET_SCHEDULER_add_now (&remove_request, n);
     return 0;
   }
+  memset (buf, '\0', bufsize);
   GNUNET_assert (bufsize >= total_size);
 
         msg.msg.size = htons (total_size);
@@ -299,7 +300,8 @@ size_t send_experimentation_request_cb (void *cls, size_t bufsize, void *buf)
  *
  * @param peer the peer to send to
  */
-static void send_experimentation_request (const struct GNUNET_PeerIdentity *peer)
+static void 
+send_experimentation_request (const struct GNUNET_PeerIdentity *peer)
 {
         struct Node *n;
         struct NodeComCtx *e_ctx;
diff --git a/src/experimentation/gnunet-daemon-experimentation_scheduler.c b/src/experimentation/gnunet-daemon-experimentation_scheduler.c
index 34142fabb..aef97ee48 100644
--- a/src/experimentation/gnunet-daemon-experimentation_scheduler.c
+++ b/src/experimentation/gnunet-daemon-experimentation_scheduler.c
@@ -227,21 +227,20 @@ static void run_experiment_outbound (void *cls,const struct GNUNET_SCHEDULER_Tas
 void
 GED_scheduler_handle_start (struct Node *n, struct Experiment *e)
 {
-        struct ScheduledExperiment *se;
-
-        if ((NULL != (se = find_experiment (waiting_in_head, waiting_in_tail, n, e, GNUNET_NO))) ||
-                 (NULL != (se = find_experiment (running_in_head, running_in_tail, n, e, GNUNET_NO))))
-        {
-                GNUNET_break_op (0);
-                return;
-        }
-
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received %s message from peer %s for experiment `%s'\n",
-                        "START", GNUNET_i2s (&n->id), e->name);
-
-        GED_scheduler_add (n, e, GNUNET_NO);
+  if ((NULL != find_experiment (waiting_in_head, waiting_in_tail, n, e, GNUNET_NO)) ||
+      (NULL != find_experiment (running_in_head, running_in_tail, n, e, GNUNET_NO)))
+  {
+    GNUNET_break_op (0);
+    return;
+  }
+  
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+              "Received %s message from peer %s for experiment `%s'\n",
+              "START", GNUNET_i2s (&n->id), e->name);
+  GED_scheduler_add (n, e, GNUNET_NO);
 }
 
+
 /**
  * Handle a START_ACK message from a remote node
  *