aboutsummaryrefslogtreecommitdiff
path: root/src/conversation/gnunet-service-conversation.c
diff options
context:
space:
mode:
authorDavid Barksdale <amatus.amongus@gmail.com>2014-12-23 04:55:01 +0000
committerDavid Barksdale <amatus.amongus@gmail.com>2014-12-23 04:55:01 +0000
commit8bcc9eb56238a7e63655ffc229363f0aaee5b0fd (patch)
tree27016e22a8b1da221834d1a5c6bfd03a74df6c0b /src/conversation/gnunet-service-conversation.c
parentcd5b48f92d07facc4227cbe1485df63340d06df5 (diff)
downloadgnunet-8bcc9eb56238a7e63655ffc229363f0aaee5b0fd.tar.gz
gnunet-8bcc9eb56238a7e63655ffc229363f0aaee5b0fd.zip
Remove work-around for bad NULL definition
Diffstat (limited to 'src/conversation/gnunet-service-conversation.c')
-rw-r--r--src/conversation/gnunet-service-conversation.c4
1 files changed, 2 insertions, 2 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)