[GNUnet-SVN] r30656 - in gnunet/src: conversation gns namecache namestore

[gnunet]

Author: amatus
Date: 2013-11-11 00:38:21 +0100 (Mon, 11 Nov 2013)
New Revision: 30656

Modified:
   gnunet/src/conversation/gnunet-service-conversation.c
   gnunet/src/gns/gnunet-service-gns.c
   gnunet/src/namecache/gnunet-service-namecache.c
   gnunet/src/namestore/gnunet-service-namestore.c
Log:
Fix incompatability with musl libc.


Modified: gnunet/src/conversation/gnunet-service-conversation.c
===================================================================
--- gnunet/src/conversation/gnunet-service-conversation.c       2013-11-09 
23:12:27 UTC (rev 30655)
+++ gnunet/src/conversation/gnunet-service-conversation.c       2013-11-10 
23:38:21 UTC (rev 30656)
@@ -1141,7 +1141,7 @@
   line = GNUNET_SERVER_client_get_user_context (client, struct Line);
   if (NULL == line)
     return;
-  GNUNET_SERVER_client_set_user_context (client, NULL);
+  GNUNET_SERVER_client_set_user_context (client, (void *)NULL);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Client disconnected, closing line\n");
   GNUNET_CONTAINER_DLL_remove (lines_head,

Modified: gnunet/src/gns/gnunet-service-gns.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns.c 2013-11-09 23:12:27 UTC (rev 30655)
+++ gnunet/src/gns/gnunet-service-gns.c 2013-11-10 23:38:21 UTC (rev 30656)
@@ -259,7 +259,7 @@
   GNUNET_SERVER_notification_context_destroy (nc);
   while (NULL != (clh = clh_head))
   {
-    GNUNET_SERVER_client_set_user_context (clh->client, NULL);
+    GNUNET_SERVER_client_set_user_context (clh->client, (void *)NULL);
     GNS_resolver_lookup_cancel (clh->lookup);
     GNUNET_CONTAINER_DLL_remove (clh_head, clh_tail, clh);
     GNUNET_free (clh);
@@ -702,7 +702,7 @@
                                              GNUNET_NO);
   GNUNET_free (rmsg);
   GNUNET_CONTAINER_DLL_remove (clh_head, clh_tail, clh);
-  GNUNET_SERVER_client_set_user_context (clh->client, NULL);
+  GNUNET_SERVER_client_set_user_context (clh->client, (void *)NULL);
   GNUNET_free (clh);
   GNUNET_STATISTICS_update (statistics,
                             "Completed lookups", 1,

Modified: gnunet/src/namecache/gnunet-service-namecache.c
===================================================================
--- gnunet/src/namecache/gnunet-service-namecache.c     2013-11-09 23:12:27 UTC 
(rev 30655)
+++ gnunet/src/namecache/gnunet-service-namecache.c     2013-11-10 23:38:21 UTC 
(rev 30656)
@@ -122,7 +122,7 @@
   while (NULL != (nc = client_head))
   {
     GNUNET_CONTAINER_DLL_remove (client_head, client_tail, nc);
-    GNUNET_SERVER_client_set_user_context (nc->client, NULL);
+    GNUNET_SERVER_client_set_user_context (nc->client, (void *)NULL);
     GNUNET_free (nc);
   }
   GNUNET_break (NULL == GNUNET_PLUGIN_unload (db_lib_name, GSN_database));

Modified: gnunet/src/namestore/gnunet-service-namestore.c
===================================================================
--- gnunet/src/namestore/gnunet-service-namestore.c     2013-11-09 23:12:27 UTC 
(rev 30655)
+++ gnunet/src/namestore/gnunet-service-namestore.c     2013-11-10 23:38:21 UTC 
(rev 30656)
@@ -298,7 +298,7 @@
       GNUNET_free (no);
     }
     GNUNET_CONTAINER_DLL_remove (client_head, client_tail, nc);
-    GNUNET_SERVER_client_set_user_context (nc->client, NULL);
+    GNUNET_SERVER_client_set_user_context (nc->client, (void *)NULL);
     GNUNET_free (nc);
   }
   GNUNET_break (NULL == GNUNET_PLUGIN_unload (db_lib_name, GSN_database));