coverity fixes

4 files changed, 30 insertions, 39 deletions

diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c
index c4ba665e3..bd163f1dd 100644
--- a/src/testbed/gnunet-service-testbed.c
+++ b/src/testbed/gnunet-service-testbed.c
@@ -1187,8 +1187,7 @@ handle_add_host (void *cls, struct GNUNET_SERVER_Client *client,
   host_id = ntohl (msg->host_id);
   LOG_DEBUG ("Received ADDHOST message\n");
   LOG_DEBUG ("-------host id: %u\n", host_id);
-  if (NULL != hostname)
-    LOG_DEBUG ("-------hostname: %s\n", hostname);
+  LOG_DEBUG ("-------hostname: %s\n", hostname);
   if (0 != username_length)
     LOG_DEBUG ("-------username: %s\n", username);
   else
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c
index c1709333e..7808d7a34 100644
--- a/src/testbed/testbed_api.c
+++ b/src/testbed/testbed_api.c
@@ -272,7 +272,7 @@ handle_opsuccess (struct GNUNET_TESTBED_Controller *c,
                   GNUNET_TESTBED_GenericOperationSuccessEventMessage *msg)
 {
   struct OperationContext *opc;
-  struct GNUNET_TESTBED_EventInformation *event;
+  struct GNUNET_TESTBED_EventInformation event;
   uint64_t op_id;
 
   op_id = GNUNET_ntohll (msg->operation_id);
@@ -282,55 +282,47 @@ handle_opsuccess (struct GNUNET_TESTBED_Controller *c,
     LOG_DEBUG ("Operation not found\n");
     return GNUNET_YES;
   }
-  event = NULL;
-  if (0 != (c->event_mask & (1L << GNUNET_TESTBED_ET_OPERATION_FINISHED)))
-    event = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_EventInformation));
-  if (NULL != event)
-    event->type = GNUNET_TESTBED_ET_OPERATION_FINISHED;
   switch (opc->type)
   {
   case OP_FORWARDED:
-  {
-    struct ForwardedOperationData *fo_data;
-
-    fo_data = opc->data;
-    if (NULL != fo_data->cc)
-      fo_data->cc (fo_data->cc_cls, (const struct GNUNET_MessageHeader *) msg);
-    GNUNET_CONTAINER_DLL_remove (c->ocq_head, c->ocq_tail, opc);
-    GNUNET_free (fo_data);
-    GNUNET_free (opc);
-    return GNUNET_YES;
-  }
+    {
+      struct ForwardedOperationData *fo_data;
+      
+      fo_data = opc->data;
+      if (NULL != fo_data->cc)
+        fo_data->cc (fo_data->cc_cls, (const struct GNUNET_MessageHeader *) msg);
+      GNUNET_CONTAINER_DLL_remove (c->ocq_head, c->ocq_tail, opc);
+      GNUNET_free (fo_data);
+      GNUNET_free (opc);
+      return GNUNET_YES;
+    }
     break;
   case OP_PEER_DESTROY:
-  {
-    struct GNUNET_TESTBED_Peer *peer;
-
-    peer = opc->data;
-    GNUNET_free (peer);
-    opc->data = NULL;
-    //PEERDESTROYDATA
-  }
+    {
+      struct GNUNET_TESTBED_Peer *peer;
+      
+      peer = opc->data;
+      GNUNET_free (peer);
+      opc->data = NULL;
+      //PEERDESTROYDATA
+    }
     break;
   case OP_LINK_CONTROLLERS:
     break;
   default:
     GNUNET_assert (0);
   }
-  if (NULL != event)
-  {
-    event->details.operation_finished.operation = opc->op;
-    event->details.operation_finished.op_cls = NULL;
-    event->details.operation_finished.emsg = NULL;
-    event->details.operation_finished.generic = NULL;
-  }
+  event.type = GNUNET_TESTBED_ET_OPERATION_FINISHED;
+  event.details.operation_finished.operation = opc->op;
+  event.details.operation_finished.op_cls = NULL;
+  event.details.operation_finished.emsg = NULL;
+  event.details.operation_finished.generic = NULL;
   GNUNET_CONTAINER_DLL_remove (opc->c->ocq_head, opc->c->ocq_tail, opc);
   opc->state = OPC_STATE_FINISHED;
-  if (NULL != event)
+  if (0 != (c->event_mask & (1L << GNUNET_TESTBED_ET_OPERATION_FINISHED)))
   {
     if (NULL != c->cc)
-      c->cc (c->cc_cls, event);
-    GNUNET_free (event);
+      c->cc (c->cc_cls, &event);
   }
   return GNUNET_YES;
 }
diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c
index cbbc9fdee..b9cdfa0db 100644
--- a/src/testbed/testbed_api_hosts.c
+++ b/src/testbed/testbed_api_hosts.c
@@ -348,7 +348,7 @@ GNUNET_TESTBED_host_destroy (struct GNUNET_TESTBED_Host *host)
   }
   host_list =
       GNUNET_realloc (host_list,
-                      sizeof (struct GNUNET_TESTBED_Host) * host_list_size);
+                      sizeof (struct GNUNET_TESTBED_Host *) * host_list_size);
 }
 
 
diff --git a/src/testbed/testbed_api_services.c b/src/testbed/testbed_api_services.c
index 62bafb724..78d441c61 100644
--- a/src/testbed/testbed_api_services.c
+++ b/src/testbed/testbed_api_services.c
@@ -142,6 +142,7 @@ configuration_receiver (void *cls, const struct GNUNET_MessageHeader *msg)
   struct GNUNET_TESTBED_EventInformation info;
   uint16_t mtype;
 
+  c = data->peer->controller;
   mtype = ntohs (msg->type);
   emsg = NULL;
   info.type = GNUNET_TESTBED_ET_OPERATION_FINISHED;
@@ -165,7 +166,6 @@ configuration_receiver (void *cls, const struct GNUNET_MessageHeader *msg)
   data->op_result = data->ca (data->cada_cls, data->cfg);  
   info.details.operation_finished.emsg = NULL;
   info.details.operation_finished.generic = data->op_result;
-  c = data->peer->controller;
   data->state = SERVICE_CONNECTED;
   
  call_cb: