diff options
author | LRN <lrn1986@gmail.com> | 2013-12-19 06:00:23 +0000 |
---|---|---|
committer | LRN <lrn1986@gmail.com> | 2013-12-19 06:00:23 +0000 |
commit | e0ca7357cd0bfedc5c29cb731b56279fef8da059 (patch) | |
tree | ecfd47cf59bc00e656b53fd59c58f5038e342d65 /src/testbed/gnunet-service-testbed_barriers.c | |
parent | 92fd84dc7ef98452f848a62677c61a2b80b5835e (diff) | |
download | gnunet-e0ca7357cd0bfedc5c29cb731b56279fef8da059.tar.gz gnunet-e0ca7357cd0bfedc5c29cb731b56279fef8da059.zip |
malloc -> new
Diffstat (limited to 'src/testbed/gnunet-service-testbed_barriers.c')
-rw-r--r-- | src/testbed/gnunet-service-testbed_barriers.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/testbed/gnunet-service-testbed_barriers.c b/src/testbed/gnunet-service-testbed_barriers.c index 482d0ddcd..de2c175f1 100644 --- a/src/testbed/gnunet-service-testbed_barriers.c +++ b/src/testbed/gnunet-service-testbed_barriers.c | |||
@@ -306,7 +306,7 @@ queue_message (struct ClientCtx *ctx, struct GNUNET_MessageHeader *msg) | |||
306 | struct MessageQueue *mq; | 306 | struct MessageQueue *mq; |
307 | struct GNUNET_SERVER_Client *client = ctx->client; | 307 | struct GNUNET_SERVER_Client *client = ctx->client; |
308 | 308 | ||
309 | mq = GNUNET_malloc (sizeof (struct MessageQueue)); | 309 | mq = GNUNET_new (struct MessageQueue); |
310 | mq->msg = msg; | 310 | mq->msg = msg; |
311 | LOG_DEBUG ("Queueing message of type %u, size %u for sending\n", | 311 | LOG_DEBUG ("Queueing message of type %u, size %u for sending\n", |
312 | ntohs (msg->type), ntohs (msg->size)); | 312 | ntohs (msg->type), ntohs (msg->size)); |
@@ -494,7 +494,7 @@ handle_barrier_wait (void *cls, struct GNUNET_SERVER_Client *client, | |||
494 | client_ctx = GNUNET_SERVER_client_get_user_context (client, struct ClientCtx); | 494 | client_ctx = GNUNET_SERVER_client_get_user_context (client, struct ClientCtx); |
495 | if (NULL == client_ctx) | 495 | if (NULL == client_ctx) |
496 | { | 496 | { |
497 | client_ctx = GNUNET_malloc (sizeof (struct ClientCtx)); | 497 | client_ctx = GNUNET_new (struct ClientCtx); |
498 | client_ctx->client = client; | 498 | client_ctx->client = client; |
499 | GNUNET_SERVER_client_keep (client); | 499 | GNUNET_SERVER_client_keep (client); |
500 | client_ctx->barrier = barrier; | 500 | client_ctx->barrier = barrier; |
@@ -747,7 +747,7 @@ GST_handle_barrier_init (void *cls, struct GNUNET_SERVER_Client *client, | |||
747 | GNUNET_SERVER_receive_done (client, GNUNET_OK); | 747 | GNUNET_SERVER_receive_done (client, GNUNET_OK); |
748 | return; | 748 | return; |
749 | } | 749 | } |
750 | barrier = GNUNET_malloc (sizeof (struct Barrier)); | 750 | barrier = GNUNET_new (struct Barrier); |
751 | (void) memcpy (&barrier->hash, &hash, sizeof (struct GNUNET_HashCode)); | 751 | (void) memcpy (&barrier->hash, &hash, sizeof (struct GNUNET_HashCode)); |
752 | barrier->quorum = msg->quorum; | 752 | barrier->quorum = msg->quorum; |
753 | barrier->name = name; | 753 | barrier->name = name; |
@@ -769,7 +769,7 @@ GST_handle_barrier_init (void *cls, struct GNUNET_SERVER_Client *client, | |||
769 | GNUNET_break (0);/* May happen when we are connecting to the controller */ | 769 | GNUNET_break (0);/* May happen when we are connecting to the controller */ |
770 | continue; | 770 | continue; |
771 | } | 771 | } |
772 | wrapper = GNUNET_malloc (sizeof (struct WBarrier)); | 772 | wrapper = GNUNET_new (struct WBarrier); |
773 | wrapper->barrier = barrier; | 773 | wrapper->barrier = barrier; |
774 | GNUNET_CONTAINER_DLL_insert_tail (barrier->whead, barrier->wtail, wrapper); | 774 | GNUNET_CONTAINER_DLL_insert_tail (barrier->whead, barrier->wtail, wrapper); |
775 | wrapper->hbarrier = GNUNET_TESTBED_barrier_init_ (slave->controller, | 775 | wrapper->hbarrier = GNUNET_TESTBED_barrier_init_ (slave->controller, |