diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-03-30 16:22:05 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-03-30 16:22:05 +0000 |
commit | c3b56025c82ad6f22be85d2986081667d9a2eb92 (patch) | |
tree | e9d91d12312ebd6988327d45560fd68efc29bf29 /src | |
parent | 468b3707c580e37fa52783c3c95b3604ef04811a (diff) | |
download | gnunet-c3b56025c82ad6f22be85d2986081667d9a2eb92.tar.gz gnunet-c3b56025c82ad6f22be85d2986081667d9a2eb92.zip |
-cleanup
Diffstat (limited to 'src')
-rw-r--r-- | src/ats/gnunet-service-ats_addresses.c | 7 | ||||
-rw-r--r-- | src/transport/gnunet-service-transport_manipulation.c | 10 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c index 863b7cc40..acf550196 100644 --- a/src/ats/gnunet-service-ats_addresses.c +++ b/src/ats/gnunet-service-ats_addresses.c | |||
@@ -252,6 +252,7 @@ enum ATS_Mode | |||
252 | MODE_MLP | 252 | MODE_MLP |
253 | }; | 253 | }; |
254 | 254 | ||
255 | |||
255 | /** | 256 | /** |
256 | * Pending Address suggestion requests | 257 | * Pending Address suggestion requests |
257 | */ | 258 | */ |
@@ -273,6 +274,7 @@ struct GAS_Addresses_Suggestion_Requests | |||
273 | struct GNUNET_PeerIdentity id; | 274 | struct GNUNET_PeerIdentity id; |
274 | }; | 275 | }; |
275 | 276 | ||
277 | |||
276 | /** | 278 | /** |
277 | * Handle for ATS address component | 279 | * Handle for ATS address component |
278 | */ | 280 | */ |
@@ -378,7 +380,9 @@ static unsigned int | |||
378 | assemble_ats_information (const struct ATS_Address *aa, struct GNUNET_ATS_Information **dest) | 380 | assemble_ats_information (const struct ATS_Address *aa, struct GNUNET_ATS_Information **dest) |
379 | { | 381 | { |
380 | unsigned int ats_count = GNUNET_ATS_PropertyCount - 1; | 382 | unsigned int ats_count = GNUNET_ATS_PropertyCount - 1; |
381 | struct GNUNET_ATS_Information *ats = GNUNET_malloc (ats_count * sizeof (struct GNUNET_ATS_Information)); | 383 | struct GNUNET_ATS_Information *ats; |
384 | |||
385 | ats = GNUNET_malloc (ats_count * sizeof (struct GNUNET_ATS_Information)); | ||
382 | (*dest) = ats; | 386 | (*dest) = ats; |
383 | 387 | ||
384 | ats[0].type = ntohl(GNUNET_ATS_UTILIZATION_UP); | 388 | ats[0].type = ntohl(GNUNET_ATS_UTILIZATION_UP); |
@@ -400,6 +404,7 @@ assemble_ats_information (const struct ATS_Address *aa, struct GNUNET_ATS_Infor | |||
400 | return ats_count; | 404 | return ats_count; |
401 | } | 405 | } |
402 | 406 | ||
407 | |||
403 | /** | 408 | /** |
404 | * Disassemble ATS information and update address | 409 | * Disassemble ATS information and update address |
405 | * | 410 | * |
diff --git a/src/transport/gnunet-service-transport_manipulation.c b/src/transport/gnunet-service-transport_manipulation.c index ffb9a0ecd..a51e9da4e 100644 --- a/src/transport/gnunet-service-transport_manipulation.c +++ b/src/transport/gnunet-service-transport_manipulation.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet. | 2 | This file is part of GNUnet. |
3 | (C) 2010,2011 Christian Grothoff (and other contributing authors) | 3 | (C) 2010-2013 Christian Grothoff (and other contributing authors) |
4 | 4 | ||
5 | GNUnet is free software; you can redistribute it and/or modify | 5 | GNUnet is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published | 6 | it under the terms of the GNU General Public License as published |
@@ -496,9 +496,11 @@ GST_manipulation_init (const struct GNUNET_CONFIGURATION_Handle *GST_cfg) | |||
496 | man_handle.peers = GNUNET_CONTAINER_multihashmap_create (10, GNUNET_NO); | 496 | man_handle.peers = GNUNET_CONTAINER_multihashmap_create (10, GNUNET_NO); |
497 | } | 497 | } |
498 | 498 | ||
499 | int free_tmps (void *cls, | 499 | |
500 | const struct GNUNET_HashCode * key, | 500 | static int |
501 | void *value) | 501 | free_tmps (void *cls, |
502 | const struct GNUNET_HashCode * key, | ||
503 | void *value) | ||
502 | { | 504 | { |
503 | struct DelayQueueEntry *dqe; | 505 | struct DelayQueueEntry *dqe; |
504 | struct DelayQueueEntry *next; | 506 | struct DelayQueueEntry *next; |