[GNUnet-SVN] r18519 - in gnunet/src: testing util

[gnunet]

Author: grothoff
Date: 2011-12-08 18:48:54 +0100 (Thu, 08 Dec 2011)
New Revision: 18519

Modified:
   gnunet/src/testing/Makefile.am
   gnunet/src/util/service.c
Log:
-LRN: misc. minor fixes

Modified: gnunet/src/testing/Makefile.am
===================================================================
--- gnunet/src/testing/Makefile.am      2011-12-08 17:22:03 UTC (rev 18518)
+++ gnunet/src/testing/Makefile.am      2011-12-08 17:48:54 UTC (rev 18519)
@@ -94,8 +94,8 @@
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(GN_LIBINTL)
-#gnunet_testing_DEPENDENCIES =
-#  libgnunetttesting.la                                
+gnunet_testing_DEPENDENCIES = \
+ libgnunettesting.la
 
 
 test_testing_SOURCES = \

Modified: gnunet/src/util/service.c
===================================================================
--- gnunet/src/util/service.c   2011-12-08 17:22:03 UTC (rev 18518)
+++ gnunet/src/util/service.c   2011-12-08 17:48:54 UTC (rev 18519)
@@ -1150,7 +1150,7 @@
   {
     LOG (GNUNET_ERROR_TYPE_ERROR,
          _("Could not access a pre-bound socket, will try to bind myself\n"));
-    for (i = 0; sctx->lsocks[i] != NULL && i < count; i++)
+    for (i = 0; i < count && sctx->lsocks[i] != NULL; i++)
       GNUNET_break (0 == GNUNET_NETWORK_socket_close (sctx->lsocks[i]));
     GNUNET_free (sctx->lsocks);
     sctx->lsocks = NULL;