- docs

[oweals/gnunet.git] / src / testbed / testbed_api_peers.c

diff --git a/src/testbed/testbed_api_peers.c b/src/testbed/testbed_api_peers.c
index f463dafde76720a28de9f920d60a497537d1ee8a..f8a4b167ddce344512e29c8417b5619a54f2b8da 100644 (file)
--- a/src/testbed/testbed_api_peers.c
+++ b/src/testbed/testbed_api_peers.c
@@ -97,7 +97,7 @@ static void
 opstart_peer_create (void *cls)
 {
   struct OperationContext *opc = cls;
-  struct PeerCreateData *data;
+  struct PeerCreateData *data = opc->data;
   struct GNUNET_TESTBED_PeerCreateMessage *msg;
   char *config;
   char *xconfig;
@@ -106,7 +106,7 @@ opstart_peer_create (void *cls)
   uint16_t msize;
 
   GNUNET_assert (OP_PEER_CREATE == opc->type);  
-  GNUNET_assert (NULL != (data = opc->data));
+  GNUNET_assert (NULL != data);
   GNUNET_assert (NULL != data->peer);
   opc->state = OPC_STATE_STARTED;
   config = GNUNET_CONFIGURATION_serialize (data->cfg, &c_size);
@@ -161,11 +161,11 @@ static void
 opstart_peer_destroy (void *cls)
 {
   struct OperationContext *opc = cls;
-  struct GNUNET_TESTBED_Peer *peer;
+  struct GNUNET_TESTBED_Peer *peer = opc->data;
   struct GNUNET_TESTBED_PeerDestroyMessage *msg;
 
   GNUNET_assert (OP_PEER_DESTROY == opc->type);
-  GNUNET_assert (NULL != (peer = opc->data));
+  GNUNET_assert (NULL != peer);
   opc->state = OPC_STATE_STARTED;
   msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_PeerDestroyMessage));
   msg->header.size = htons (sizeof (struct GNUNET_TESTBED_PeerDestroyMessage));
@@ -374,7 +374,8 @@ oprelease_peer_getinfo (void *cls)
     GNUNET_free (opc->data);
     break;
   case OPC_STATE_FINISHED:
-    GNUNET_assert (NULL != (data = opc->data));
+    data = opc->data;
+    GNUNET_assert (NULL != data);
     switch (data->pit)
     {
     case GNUNET_TESTBED_PIT_CONFIGURATION:
@@ -877,10 +878,10 @@ static void
 opstart_manage_service (void *cls)
 {
   struct OperationContext *opc = cls;
+  struct ManageServiceData *data = opc->data;
   struct GNUNET_TESTBED_ManagePeerServiceMessage *msg;
-  struct ManageServiceData *data;
   
-  GNUNET_assert (NULL != (data = opc->data));  
+  GNUNET_assert (NULL != data);  
   msg = GNUNET_malloc (data->msize);
   msg->header.size = htons (data->msize);
   msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_MANAGE_PEER_SERVICE);