[GNUnet-SVN] r34767 - in gnunet/src: conversation gns namecache namestore scalarproduct transport

[gnunet]

Author: amatus
Date: 2014-12-23 05:55:01 +0100 (Tue, 23 Dec 2014)
New Revision: 34767

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
   gnunet/src/scalarproduct/gnunet-service-scalarproduct_alice.c
   gnunet/src/transport/plugin_transport_tcp.c
Log:
Remove work-around for bad NULL definition


Modified: gnunet/src/conversation/gnunet-service-conversation.c
===================================================================
--- gnunet/src/conversation/gnunet-service-conversation.c       2014-12-22 
19:43:04 UTC (rev 34766)
+++ gnunet/src/conversation/gnunet-service-conversation.c       2014-12-23 
04:55:01 UTC (rev 34767)
@@ -1447,7 +1447,7 @@
   line = GNUNET_SERVER_client_get_user_context (client, struct Line);
   if (NULL == line)
     return;
-  GNUNET_SERVER_client_set_user_context (client, (void *)NULL);
+  GNUNET_SERVER_client_set_user_context (client, NULL);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Client disconnected, closing line\n");
   GNUNET_CONTAINER_DLL_remove (lines_head,
@@ -1479,7 +1479,7 @@
     GNUNET_CONTAINER_DLL_remove (lines_head,
                                  lines_tail,
                                  line);
-    GNUNET_SERVER_client_set_user_context (line->client, (void *) NULL);
+    GNUNET_SERVER_client_set_user_context (line->client, NULL);
     GNUNET_free (line);
   }
   if (NULL != cadet)

Modified: gnunet/src/gns/gnunet-service-gns.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns.c 2014-12-22 19:43:04 UTC (rev 34766)
+++ gnunet/src/gns/gnunet-service-gns.c 2014-12-23 04:55:01 UTC (rev 34767)
@@ -259,7 +259,7 @@
   GNUNET_SERVER_notification_context_destroy (nc);
   while (NULL != (clh = clh_head))
   {
-    GNUNET_SERVER_client_set_user_context (clh->client, (void *)NULL);
+    GNUNET_SERVER_client_set_user_context (clh->client, NULL);
     GNS_resolver_lookup_cancel (clh->lookup);
     GNUNET_CONTAINER_DLL_remove (clh_head, clh_tail, clh);
     GNUNET_free (clh);
@@ -706,7 +706,7 @@
                                              GNUNET_NO);
   GNUNET_free (rmsg);
   GNUNET_CONTAINER_DLL_remove (clh_head, clh_tail, clh);
-  GNUNET_SERVER_client_set_user_context (clh->client, (void *)NULL);
+  GNUNET_SERVER_client_set_user_context (clh->client, 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     2014-12-22 19:43:04 UTC 
(rev 34766)
+++ gnunet/src/namecache/gnunet-service-namecache.c     2014-12-23 04:55:01 UTC 
(rev 34767)
@@ -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, (void *)NULL);
+    GNUNET_SERVER_client_set_user_context (nc->client, 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     2014-12-22 19:43:04 UTC 
(rev 34766)
+++ gnunet/src/namestore/gnunet-service-namestore.c     2014-12-23 04:55:01 UTC 
(rev 34767)
@@ -304,7 +304,7 @@
       GNUNET_free (no);
     }
     GNUNET_CONTAINER_DLL_remove (client_head, client_tail, nc);
-    GNUNET_SERVER_client_set_user_context (nc->client, (void *)NULL);
+    GNUNET_SERVER_client_set_user_context (nc->client, NULL);
     GNUNET_free (nc);
   }
   GNUNET_break (NULL == GNUNET_PLUGIN_unload (db_lib_name, GSN_database));

Modified: gnunet/src/scalarproduct/gnunet-service-scalarproduct_alice.c
===================================================================
--- gnunet/src/scalarproduct/gnunet-service-scalarproduct_alice.c       
2014-12-22 19:43:04 UTC (rev 34766)
+++ gnunet/src/scalarproduct/gnunet-service-scalarproduct_alice.c       
2014-12-23 04:55:01 UTC (rev 34767)
@@ -261,7 +261,7 @@
   if (NULL != s->client)
   {
     GNUNET_SERVER_client_set_user_context (s->client,
-                                           (void *)NULL);
+                                           NULL);
     GNUNET_SERVER_client_disconnect (s->client);
     s->client = NULL;
   }
@@ -1356,7 +1356,7 @@
     return;
   s->client = NULL;
   GNUNET_SERVER_client_set_user_context (client,
-                                         (void *)NULL);
+                                         NULL);
   destroy_service_session (s);
 }
 

Modified: gnunet/src/transport/plugin_transport_tcp.c
===================================================================
--- gnunet/src/transport/plugin_transport_tcp.c 2014-12-22 19:43:04 UTC (rev 
34766)
+++ gnunet/src/transport/plugin_transport_tcp.c 2014-12-23 04:55:01 UTC (rev 
34767)
@@ -837,7 +837,7 @@
   }
   if (NULL != session->client)
     GNUNET_SERVER_client_set_user_context (session->client,
-                                           (void *) NULL);
+                                           NULL);
 
   /* clean up state */
   if (NULL != session->transmit_handle)