Add a third default.

[oweals/gnunet.git] / src / util / server_nc.c

diff --git a/src/util/server_nc.c b/src/util/server_nc.c
index 6e0181ecbfa5d1e05b0ef0e1229595353b3f4e24..d6625eefb23d0aa96d8304cdb70246bd83446a14 100644 (file)
--- a/src/util/server_nc.c
+++ b/src/util/server_nc.c
@@ -4,7 +4,7 @@
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -26,14 +26,9 @@
  */
 
 #include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_connection_lib.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_scheduler_lib.h"
-#include "gnunet_server_lib.h"
-#include "gnunet_time_lib.h"
+#include "gnunet_util_lib.h"
 
-#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
+#define LOG(kind,...) GNUNET_log_from (kind, "util-server-nc", __VA_ARGS__)
 
 
 /**
@@ -201,7 +196,7 @@ handle_client_disconnect (void *cls, struct GNUNET_SERVER_Client *client)
  * @param server server for which this function creates the context
  * @param queue_length maximum number of messages to keep in
  *        the notification queue; optional messages are dropped
- *        it the queue gets longer than this number of messages
+ *        if the queue gets longer than this number of messages
  * @return handle to the notification context
  */
 struct GNUNET_SERVER_NotificationContext *
@@ -273,7 +268,7 @@ GNUNET_SERVER_notification_context_add (struct GNUNET_SERVER_NotificationContext
 
   for (cl = nc->clients_head; NULL != cl; cl = cl->next)
     if (cl->client == client)
-      return; /* already present */    
+      return; /* already present */
   cl = GNUNET_malloc (sizeof (struct ClientList));
   GNUNET_CONTAINER_DLL_insert (nc->clients_head,
                               nc->clients_tail,
@@ -385,7 +380,7 @@ do_unicast (struct GNUNET_SERVER_NotificationContext *nc,
   /* append */
   GNUNET_CONTAINER_DLL_insert_tail (client->pending_head, client->pending_tail,
                                     pml);
-  if (client->th == NULL)
+  if (NULL == client->th)
     client->th =
         GNUNET_SERVER_notify_transmit_ready (client->client,
                                              ntohs (client->pending_head->