diff options
author | David Barksdale <amatus.amongus@gmail.com> | 2014-12-23 04:55:01 +0000 |
---|---|---|
committer | David Barksdale <amatus.amongus@gmail.com> | 2014-12-23 04:55:01 +0000 |
commit | 8bcc9eb56238a7e63655ffc229363f0aaee5b0fd (patch) | |
tree | 27016e22a8b1da221834d1a5c6bfd03a74df6c0b | |
parent | cd5b48f92d07facc4227cbe1485df63340d06df5 (diff) | |
download | gnunet-8bcc9eb56238a7e63655ffc229363f0aaee5b0fd.tar.gz gnunet-8bcc9eb56238a7e63655ffc229363f0aaee5b0fd.zip |
Remove work-around for bad NULL definition
-rw-r--r-- | src/conversation/gnunet-service-conversation.c | 4 | ||||
-rw-r--r-- | src/gns/gnunet-service-gns.c | 4 | ||||
-rw-r--r-- | src/namecache/gnunet-service-namecache.c | 2 | ||||
-rw-r--r-- | src/namestore/gnunet-service-namestore.c | 2 | ||||
-rw-r--r-- | src/scalarproduct/gnunet-service-scalarproduct_alice.c | 4 | ||||
-rw-r--r-- | src/transport/plugin_transport_tcp.c | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/src/conversation/gnunet-service-conversation.c b/src/conversation/gnunet-service-conversation.c index 1bf632854..d69cc47a3 100644 --- a/src/conversation/gnunet-service-conversation.c +++ b/src/conversation/gnunet-service-conversation.c | |||
@@ -1447,7 +1447,7 @@ handle_client_disconnect (void *cls, | |||
1447 | line = GNUNET_SERVER_client_get_user_context (client, struct Line); | 1447 | line = GNUNET_SERVER_client_get_user_context (client, struct Line); |
1448 | if (NULL == line) | 1448 | if (NULL == line) |
1449 | return; | 1449 | return; |
1450 | GNUNET_SERVER_client_set_user_context (client, (void *)NULL); | 1450 | GNUNET_SERVER_client_set_user_context (client, NULL); |
1451 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1451 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1452 | "Client disconnected, closing line\n"); | 1452 | "Client disconnected, closing line\n"); |
1453 | GNUNET_CONTAINER_DLL_remove (lines_head, | 1453 | GNUNET_CONTAINER_DLL_remove (lines_head, |
@@ -1479,7 +1479,7 @@ do_shutdown (void *cls, | |||
1479 | GNUNET_CONTAINER_DLL_remove (lines_head, | 1479 | GNUNET_CONTAINER_DLL_remove (lines_head, |
1480 | lines_tail, | 1480 | lines_tail, |
1481 | line); | 1481 | line); |
1482 | GNUNET_SERVER_client_set_user_context (line->client, (void *) NULL); | 1482 | GNUNET_SERVER_client_set_user_context (line->client, NULL); |
1483 | GNUNET_free (line); | 1483 | GNUNET_free (line); |
1484 | } | 1484 | } |
1485 | if (NULL != cadet) | 1485 | if (NULL != cadet) |
diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c index d9eae6a09..57cdbc5f5 100644 --- a/src/gns/gnunet-service-gns.c +++ b/src/gns/gnunet-service-gns.c | |||
@@ -259,7 +259,7 @@ shutdown_task (void *cls, | |||
259 | GNUNET_SERVER_notification_context_destroy (nc); | 259 | GNUNET_SERVER_notification_context_destroy (nc); |
260 | while (NULL != (clh = clh_head)) | 260 | while (NULL != (clh = clh_head)) |
261 | { | 261 | { |
262 | GNUNET_SERVER_client_set_user_context (clh->client, (void *)NULL); | 262 | GNUNET_SERVER_client_set_user_context (clh->client, NULL); |
263 | GNS_resolver_lookup_cancel (clh->lookup); | 263 | GNS_resolver_lookup_cancel (clh->lookup); |
264 | GNUNET_CONTAINER_DLL_remove (clh_head, clh_tail, clh); | 264 | GNUNET_CONTAINER_DLL_remove (clh_head, clh_tail, clh); |
265 | GNUNET_free (clh); | 265 | GNUNET_free (clh); |
@@ -706,7 +706,7 @@ send_lookup_response (void* cls, | |||
706 | GNUNET_NO); | 706 | GNUNET_NO); |
707 | GNUNET_free (rmsg); | 707 | GNUNET_free (rmsg); |
708 | GNUNET_CONTAINER_DLL_remove (clh_head, clh_tail, clh); | 708 | GNUNET_CONTAINER_DLL_remove (clh_head, clh_tail, clh); |
709 | GNUNET_SERVER_client_set_user_context (clh->client, (void *)NULL); | 709 | GNUNET_SERVER_client_set_user_context (clh->client, NULL); |
710 | GNUNET_free (clh); | 710 | GNUNET_free (clh); |
711 | GNUNET_STATISTICS_update (statistics, | 711 | GNUNET_STATISTICS_update (statistics, |
712 | "Completed lookups", 1, | 712 | "Completed lookups", 1, |
diff --git a/src/namecache/gnunet-service-namecache.c b/src/namecache/gnunet-service-namecache.c index 0b3ece1f4..701bac4ae 100644 --- a/src/namecache/gnunet-service-namecache.c +++ b/src/namecache/gnunet-service-namecache.c | |||
@@ -122,7 +122,7 @@ cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
122 | while (NULL != (nc = client_head)) | 122 | while (NULL != (nc = client_head)) |
123 | { | 123 | { |
124 | GNUNET_CONTAINER_DLL_remove (client_head, client_tail, nc); | 124 | GNUNET_CONTAINER_DLL_remove (client_head, client_tail, nc); |
125 | GNUNET_SERVER_client_set_user_context (nc->client, (void *)NULL); | 125 | GNUNET_SERVER_client_set_user_context (nc->client, NULL); |
126 | GNUNET_free (nc); | 126 | GNUNET_free (nc); |
127 | } | 127 | } |
128 | GNUNET_break (NULL == GNUNET_PLUGIN_unload (db_lib_name, GSN_database)); | 128 | GNUNET_break (NULL == GNUNET_PLUGIN_unload (db_lib_name, GSN_database)); |
diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c index 7def61886..1f4226297 100644 --- a/src/namestore/gnunet-service-namestore.c +++ b/src/namestore/gnunet-service-namestore.c | |||
@@ -304,7 +304,7 @@ cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
304 | GNUNET_free (no); | 304 | GNUNET_free (no); |
305 | } | 305 | } |
306 | GNUNET_CONTAINER_DLL_remove (client_head, client_tail, nc); | 306 | GNUNET_CONTAINER_DLL_remove (client_head, client_tail, nc); |
307 | GNUNET_SERVER_client_set_user_context (nc->client, (void *)NULL); | 307 | GNUNET_SERVER_client_set_user_context (nc->client, NULL); |
308 | GNUNET_free (nc); | 308 | GNUNET_free (nc); |
309 | } | 309 | } |
310 | GNUNET_break (NULL == GNUNET_PLUGIN_unload (db_lib_name, GSN_database)); | 310 | GNUNET_break (NULL == GNUNET_PLUGIN_unload (db_lib_name, GSN_database)); |
diff --git a/src/scalarproduct/gnunet-service-scalarproduct_alice.c b/src/scalarproduct/gnunet-service-scalarproduct_alice.c index a003d6aab..03770144d 100644 --- a/src/scalarproduct/gnunet-service-scalarproduct_alice.c +++ b/src/scalarproduct/gnunet-service-scalarproduct_alice.c | |||
@@ -261,7 +261,7 @@ destroy_service_session (struct AliceServiceSession *s) | |||
261 | if (NULL != s->client) | 261 | if (NULL != s->client) |
262 | { | 262 | { |
263 | GNUNET_SERVER_client_set_user_context (s->client, | 263 | GNUNET_SERVER_client_set_user_context (s->client, |
264 | (void *)NULL); | 264 | NULL); |
265 | GNUNET_SERVER_client_disconnect (s->client); | 265 | GNUNET_SERVER_client_disconnect (s->client); |
266 | s->client = NULL; | 266 | s->client = NULL; |
267 | } | 267 | } |
@@ -1356,7 +1356,7 @@ handle_client_disconnect (void *cls, | |||
1356 | return; | 1356 | return; |
1357 | s->client = NULL; | 1357 | s->client = NULL; |
1358 | GNUNET_SERVER_client_set_user_context (client, | 1358 | GNUNET_SERVER_client_set_user_context (client, |
1359 | (void *)NULL); | 1359 | NULL); |
1360 | destroy_service_session (s); | 1360 | destroy_service_session (s); |
1361 | } | 1361 | } |
1362 | 1362 | ||
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c index 664dcbb7d..021a647ad 100644 --- a/src/transport/plugin_transport_tcp.c +++ b/src/transport/plugin_transport_tcp.c | |||
@@ -837,7 +837,7 @@ tcp_plugin_disconnect_session (void *cls, | |||
837 | } | 837 | } |
838 | if (NULL != session->client) | 838 | if (NULL != session->client) |
839 | GNUNET_SERVER_client_set_user_context (session->client, | 839 | GNUNET_SERVER_client_set_user_context (session->client, |
840 | (void *) NULL); | 840 | NULL); |
841 | 841 | ||
842 | /* clean up state */ | 842 | /* clean up state */ |
843 | if (NULL != session->transmit_handle) | 843 | if (NULL != session->transmit_handle) |