diff options
| author | Christian Grothoff <christian@grothoff.org> | 2011-12-08 17:48:54 +0000 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2011-12-08 17:48:54 +0000 |
| commit | 33867ff5ec4161633b5f0efeca2f9daad9a8ef78 (patch) | |
| tree | b38c291508d12d4b6bc9fd7e2f7c2c9ba6dad0bd | |
| parent | 1ff3fa2d954f9d1e74585ee6652339bb8a1aff4a (diff) | |
| download | gnunet-33867ff5ec4161633b5f0efeca2f9daad9a8ef78.tar.gz gnunet-33867ff5ec4161633b5f0efeca2f9daad9a8ef78.zip | |
-LRN: misc. minor fixes
| -rw-r--r-- | src/testing/Makefile.am | 4 | ||||
| -rw-r--r-- | src/util/service.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am index 55f8e9ad9..96c527de4 100644 --- a/src/testing/Makefile.am +++ b/src/testing/Makefile.am | |||
| @@ -94,8 +94,8 @@ gnunet_testing_LDADD = \ | |||
| 94 | $(top_builddir)/src/testing/libgnunettesting.la \ | 94 | $(top_builddir)/src/testing/libgnunettesting.la \ |
| 95 | $(top_builddir)/src/util/libgnunetutil.la \ | 95 | $(top_builddir)/src/util/libgnunetutil.la \ |
| 96 | $(GN_LIBINTL) | 96 | $(GN_LIBINTL) |
| 97 | #gnunet_testing_DEPENDENCIES = | 97 | gnunet_testing_DEPENDENCIES = \ |
| 98 | # libgnunetttesting.la | 98 | libgnunettesting.la |
| 99 | 99 | ||
| 100 | 100 | ||
| 101 | test_testing_SOURCES = \ | 101 | test_testing_SOURCES = \ |
diff --git a/src/util/service.c b/src/util/service.c index d37fe87c2..d582b6d80 100644 --- a/src/util/service.c +++ b/src/util/service.c | |||
| @@ -1150,7 +1150,7 @@ receive_sockets_from_parent (struct GNUNET_SERVICE_Context *sctx) | |||
| 1150 | { | 1150 | { |
| 1151 | LOG (GNUNET_ERROR_TYPE_ERROR, | 1151 | LOG (GNUNET_ERROR_TYPE_ERROR, |
| 1152 | _("Could not access a pre-bound socket, will try to bind myself\n")); | 1152 | _("Could not access a pre-bound socket, will try to bind myself\n")); |
| 1153 | for (i = 0; sctx->lsocks[i] != NULL && i < count; i++) | 1153 | for (i = 0; i < count && sctx->lsocks[i] != NULL; i++) |
| 1154 | GNUNET_break (0 == GNUNET_NETWORK_socket_close (sctx->lsocks[i])); | 1154 | GNUNET_break (0 == GNUNET_NETWORK_socket_close (sctx->lsocks[i])); |
| 1155 | GNUNET_free (sctx->lsocks); | 1155 | GNUNET_free (sctx->lsocks); |
| 1156 | sctx->lsocks = NULL; | 1156 | sctx->lsocks = NULL; |