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/dht | |
parent | 92fd84dc7ef98452f848a62677c61a2b80b5835e (diff) | |
download | gnunet-e0ca7357cd0bfedc5c29cb731b56279fef8da059.tar.gz gnunet-e0ca7357cd0bfedc5c29cb731b56279fef8da059.zip |
malloc -> new
Diffstat (limited to 'src/dht')
-rw-r--r-- | src/dht/dht_test_lib.c | 2 | ||||
-rw-r--r-- | src/dht/gnunet-service-dht_clients.c | 4 | ||||
-rw-r--r-- | src/dht/gnunet-service-dht_neighbours.c | 2 | ||||
-rw-r--r-- | src/dht/gnunet-service-xdht_clients.c | 4 | ||||
-rw-r--r-- | src/dht/gnunet-service-xdht_neighbours.c | 2 | ||||
-rw-r--r-- | src/dht/plugin_block_dht.c | 2 | ||||
-rw-r--r-- | src/dht/test_dht_monitor.c | 2 | ||||
-rw-r--r-- | src/dht/test_dht_topo.c | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/src/dht/dht_test_lib.c b/src/dht/dht_test_lib.c index 9864da949..92b10e815 100644 --- a/src/dht/dht_test_lib.c +++ b/src/dht/dht_test_lib.c | |||
@@ -201,7 +201,7 @@ GNUNET_DHT_TEST_run (const char *testname, | |||
201 | { | 201 | { |
202 | struct GNUNET_DHT_TEST_Context *ctx; | 202 | struct GNUNET_DHT_TEST_Context *ctx; |
203 | 203 | ||
204 | ctx = GNUNET_malloc (sizeof (struct GNUNET_DHT_TEST_Context)); | 204 | ctx = GNUNET_new (struct GNUNET_DHT_TEST_Context); |
205 | ctx->num_peers = num_peers; | 205 | ctx->num_peers = num_peers; |
206 | ctx->ops = GNUNET_malloc (num_peers * sizeof (struct GNUNET_TESTBED_Operation *)); | 206 | ctx->ops = GNUNET_malloc (num_peers * sizeof (struct GNUNET_TESTBED_Operation *)); |
207 | ctx->dhts = GNUNET_malloc (num_peers * sizeof (struct GNUNET_DHT_Handle *)); | 207 | ctx->dhts = GNUNET_malloc (num_peers * sizeof (struct GNUNET_DHT_Handle *)); |
diff --git a/src/dht/gnunet-service-dht_clients.c b/src/dht/gnunet-service-dht_clients.c index f91311cf3..c6e72cf44 100644 --- a/src/dht/gnunet-service-dht_clients.c +++ b/src/dht/gnunet-service-dht_clients.c | |||
@@ -822,7 +822,7 @@ handle_dht_local_monitor (void *cls, struct GNUNET_SERVER_Client *client, | |||
822 | const struct GNUNET_DHT_MonitorStartStopMessage *msg; | 822 | const struct GNUNET_DHT_MonitorStartStopMessage *msg; |
823 | 823 | ||
824 | msg = (struct GNUNET_DHT_MonitorStartStopMessage *) message; | 824 | msg = (struct GNUNET_DHT_MonitorStartStopMessage *) message; |
825 | r = GNUNET_malloc (sizeof(struct ClientMonitorRecord)); | 825 | r = GNUNET_new (struct ClientMonitorRecord); |
826 | 826 | ||
827 | r->client = find_active_client(client); | 827 | r->client = find_active_client(client); |
828 | r->type = ntohl(msg->type); | 828 | r->type = ntohl(msg->type); |
@@ -833,7 +833,7 @@ handle_dht_local_monitor (void *cls, struct GNUNET_SERVER_Client *client, | |||
833 | r->key = NULL; | 833 | r->key = NULL; |
834 | else | 834 | else |
835 | { | 835 | { |
836 | r->key = GNUNET_malloc (sizeof (struct GNUNET_HashCode)); | 836 | r->key = GNUNET_new (struct GNUNET_HashCode); |
837 | memcpy (r->key, &msg->key, sizeof (struct GNUNET_HashCode)); | 837 | memcpy (r->key, &msg->key, sizeof (struct GNUNET_HashCode)); |
838 | } | 838 | } |
839 | GNUNET_CONTAINER_DLL_insert (monitor_head, monitor_tail, r); | 839 | GNUNET_CONTAINER_DLL_insert (monitor_head, monitor_tail, r); |
diff --git a/src/dht/gnunet-service-dht_neighbours.c b/src/dht/gnunet-service-dht_neighbours.c index 1d7eb560c..d89f26685 100644 --- a/src/dht/gnunet-service-dht_neighbours.c +++ b/src/dht/gnunet-service-dht_neighbours.c | |||
@@ -666,7 +666,7 @@ handle_core_connect (void *cls, const struct GNUNET_PeerIdentity *peer) | |||
666 | &phash); | 666 | &phash); |
667 | peer_bucket = find_bucket (&phash); | 667 | peer_bucket = find_bucket (&phash); |
668 | GNUNET_assert ((peer_bucket >= 0) && (peer_bucket < MAX_BUCKETS)); | 668 | GNUNET_assert ((peer_bucket >= 0) && (peer_bucket < MAX_BUCKETS)); |
669 | ret = GNUNET_malloc (sizeof (struct PeerInfo)); | 669 | ret = GNUNET_new (struct PeerInfo); |
670 | #if 0 | 670 | #if 0 |
671 | ret->latency = latency; | 671 | ret->latency = latency; |
672 | ret->distance = distance; | 672 | ret->distance = distance; |
diff --git a/src/dht/gnunet-service-xdht_clients.c b/src/dht/gnunet-service-xdht_clients.c index 2bcd145a1..9cc156e3d 100644 --- a/src/dht/gnunet-service-xdht_clients.c +++ b/src/dht/gnunet-service-xdht_clients.c | |||
@@ -822,7 +822,7 @@ handle_dht_local_monitor (void *cls, struct GNUNET_SERVER_Client *client, | |||
822 | const struct GNUNET_DHT_MonitorStartStopMessage *msg; | 822 | const struct GNUNET_DHT_MonitorStartStopMessage *msg; |
823 | 823 | ||
824 | msg = (struct GNUNET_DHT_MonitorStartStopMessage *) message; | 824 | msg = (struct GNUNET_DHT_MonitorStartStopMessage *) message; |
825 | r = GNUNET_malloc (sizeof(struct ClientMonitorRecord)); | 825 | r = GNUNET_new (struct ClientMonitorRecord); |
826 | 826 | ||
827 | r->client = find_active_client(client); | 827 | r->client = find_active_client(client); |
828 | r->type = ntohl(msg->type); | 828 | r->type = ntohl(msg->type); |
@@ -833,7 +833,7 @@ handle_dht_local_monitor (void *cls, struct GNUNET_SERVER_Client *client, | |||
833 | r->key = NULL; | 833 | r->key = NULL; |
834 | else | 834 | else |
835 | { | 835 | { |
836 | r->key = GNUNET_malloc (sizeof (struct GNUNET_HashCode)); | 836 | r->key = GNUNET_new (struct GNUNET_HashCode); |
837 | memcpy (r->key, &msg->key, sizeof (struct GNUNET_HashCode)); | 837 | memcpy (r->key, &msg->key, sizeof (struct GNUNET_HashCode)); |
838 | } | 838 | } |
839 | GNUNET_CONTAINER_DLL_insert (monitor_head, monitor_tail, r); | 839 | GNUNET_CONTAINER_DLL_insert (monitor_head, monitor_tail, r); |
diff --git a/src/dht/gnunet-service-xdht_neighbours.c b/src/dht/gnunet-service-xdht_neighbours.c index af7ef1612..8f47feef5 100644 --- a/src/dht/gnunet-service-xdht_neighbours.c +++ b/src/dht/gnunet-service-xdht_neighbours.c | |||
@@ -666,7 +666,7 @@ handle_core_connect (void *cls, const struct GNUNET_PeerIdentity *peer) | |||
666 | &phash); | 666 | &phash); |
667 | peer_bucket = find_bucket (&phash); | 667 | peer_bucket = find_bucket (&phash); |
668 | GNUNET_assert ((peer_bucket >= 0) && (peer_bucket < MAX_BUCKETS)); | 668 | GNUNET_assert ((peer_bucket >= 0) && (peer_bucket < MAX_BUCKETS)); |
669 | ret = GNUNET_malloc (sizeof (struct PeerInfo)); | 669 | ret = GNUNET_new (struct PeerInfo); |
670 | #if 0 | 670 | #if 0 |
671 | ret->latency = latency; | 671 | ret->latency = latency; |
672 | ret->distance = distance; | 672 | ret->distance = distance; |
diff --git a/src/dht/plugin_block_dht.c b/src/dht/plugin_block_dht.c index a21167fb0..d6798f18c 100644 --- a/src/dht/plugin_block_dht.c +++ b/src/dht/plugin_block_dht.c | |||
@@ -172,7 +172,7 @@ libgnunet_plugin_block_dht_init (void *cls) | |||
172 | }; | 172 | }; |
173 | struct GNUNET_BLOCK_PluginFunctions *api; | 173 | struct GNUNET_BLOCK_PluginFunctions *api; |
174 | 174 | ||
175 | api = GNUNET_malloc (sizeof (struct GNUNET_BLOCK_PluginFunctions)); | 175 | api = GNUNET_new (struct GNUNET_BLOCK_PluginFunctions); |
176 | api->evaluate = &block_plugin_dht_evaluate; | 176 | api->evaluate = &block_plugin_dht_evaluate; |
177 | api->get_key = &block_plugin_dht_get_key; | 177 | api->get_key = &block_plugin_dht_get_key; |
178 | api->types = types; | 178 | api->types = types; |
diff --git a/src/dht/test_dht_monitor.c b/src/dht/test_dht_monitor.c index 303fe8f87..98791d28f 100644 --- a/src/dht/test_dht_monitor.c +++ b/src/dht/test_dht_monitor.c | |||
@@ -380,7 +380,7 @@ run (void *cls, | |||
380 | GNUNET_CRYPTO_hash (&i, sizeof (i), &key); | 380 | GNUNET_CRYPTO_hash (&i, sizeof (i), &key); |
381 | for (j=0;j<num_peers;j++) | 381 | for (j=0;j<num_peers;j++) |
382 | { | 382 | { |
383 | get_op = GNUNET_malloc (sizeof (struct GetOperation)); | 383 | get_op = GNUNET_new (struct GetOperation); |
384 | GNUNET_CONTAINER_DLL_insert (get_head, | 384 | GNUNET_CONTAINER_DLL_insert (get_head, |
385 | get_tail, | 385 | get_tail, |
386 | get_op); | 386 | get_op); |
diff --git a/src/dht/test_dht_topo.c b/src/dht/test_dht_topo.c index 1fd61129b..311bb5597 100644 --- a/src/dht/test_dht_topo.c +++ b/src/dht/test_dht_topo.c | |||
@@ -382,7 +382,7 @@ run (void *cls, | |||
382 | GNUNET_CRYPTO_hash (&i, sizeof (i), &key); | 382 | GNUNET_CRYPTO_hash (&i, sizeof (i), &key); |
383 | for (j=0;j<num_peers;j++) | 383 | for (j=0;j<num_peers;j++) |
384 | { | 384 | { |
385 | get_op = GNUNET_malloc (sizeof (struct GetOperation)); | 385 | get_op = GNUNET_new (struct GetOperation); |
386 | GNUNET_CONTAINER_DLL_insert (get_head, | 386 | GNUNET_CONTAINER_DLL_insert (get_head, |
387 | get_tail, | 387 | get_tail, |
388 | get_op); | 388 | get_op); |