[GNUnet-SVN] r21255 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2012-05-03 19:46:55 +0200 (Thu, 03 May 2012)
New Revision: 21255

Modified:
   gnunet/src/util/server_nc.c
Log:
-fix

Modified: gnunet/src/util/server_nc.c
===================================================================
--- gnunet/src/util/server_nc.c 2012-05-03 17:43:01 UTC (rev 21254)
+++ gnunet/src/util/server_nc.c 2012-05-03 17:46:55 UTC (rev 21255)
@@ -180,6 +180,7 @@
   {
     GNUNET_CONTAINER_DLL_remove (pos->pending_head, pos->pending_tail, pml);
     GNUNET_free (pml);
+    pos->num_pending--;
   }
   if (pos->th != NULL)
   {
@@ -187,6 +188,7 @@
     pos->th = NULL;
   }
   GNUNET_SERVER_client_drop (client);
+  GNUNET_assert (0 == pos->num_pending);
   GNUNET_free (pos);
 }
 
@@ -235,7 +237,9 @@
     {
       GNUNET_CONTAINER_DLL_remove (pos->pending_head, pos->pending_tail, pml);
       GNUNET_free (pml);
+      pos->num_pending--;
     }
+    GNUNET_assert (0 == pos->num_pending);
     GNUNET_free (pos);
   }
   if (nc->server != NULL)
@@ -313,7 +317,7 @@
     GNUNET_free (pml);
     cl->num_pending--;
   }
-  if (pml != NULL)
+  if (NULL != pml)
   {
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "Have %u messages left in NC queue, will try transmission again\n",
@@ -324,7 +328,9 @@
                                              &transmit_message, cl);
   }
   else
-    GNUNET_assert (cl->num_pending == 0);
+  {
+    GNUNET_assert (0 == cl->num_pending);
+  }
   return ret;
 }