[GNUnet-SVN] r12791 - in gnunet/src: dht include util

[gnunet]

Author: grothoff
Date: 2010-09-01 14:23:18 +0200 (Wed, 01 Sep 2010)
New Revision: 12791

Modified:
   gnunet/src/dht/Makefile.am
   gnunet/src/include/gnunet_common.h
   gnunet/src/util/test_container_multihashmap.c
   gnunet/src/util/test_strings.c
Log:
nitpicks

Modified: gnunet/src/dht/Makefile.am
===================================================================
--- gnunet/src/dht/Makefile.am  2010-09-01 12:01:18 UTC (rev 12790)
+++ gnunet/src/dht/Makefile.am  2010-09-01 12:23:18 UTC (rev 12791)
@@ -44,7 +44,7 @@
   $(XLIB)
 libgnunet_plugin_dhtlog_dummy_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
- 
+
 libgnunet_plugin_dhtlog_mysql_dump_la_SOURCES = \
   plugin_dhtlog_mysql_dump.c
 libgnunet_plugin_dhtlog_mysql_dump_la_LIBADD = \
@@ -83,6 +83,7 @@
  gnunet-service-dht-freenet \
  gnunet-service-dht-kademlia \
  gnunet-service-dht-koorde 
+STUD_TESTS = test_kademlia_end2end
 endif
 
 bin_PROGRAMS = $(STUD_PROGS) \
@@ -189,7 +190,7 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/dht/libgnunetdhtlog.la
 
-check_PROGRAMS = \
+check_PROGRAMS = $(STUD_TESTS) \
  test_dht_api \
  test_dht_twopeer \
  test_dht_twopeer_put_get \
@@ -238,6 +239,14 @@
  $(top_builddir)/src/dht/libgnunetdht.la \
  $(top_builddir)/src/dht/libgnunetdhtlog.la
 
+test_kademlia_end2end_SOURCES = \
+ test_kademlia_end2end.c
+test_kademlia_end2end_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/dht/libgnunetdhtlog.la
+
 EXTRA_DIST = \
   $(check_SCRIPTS) \
   test_dht_api_data.conf \

Modified: gnunet/src/include/gnunet_common.h
===================================================================
--- gnunet/src/include/gnunet_common.h  2010-09-01 12:01:18 UTC (rev 12790)
+++ gnunet/src/include/gnunet_common.h  2010-09-01 12:23:18 UTC (rev 12791)
@@ -491,7 +491,7 @@
  * memory is available.
  */
 void *GNUNET_xrealloc_ (void *ptr,
-                        const size_t n, const char *filename, int linenumber);
+                        size_t n, const char *filename, int linenumber);
 
 /**
  * Free memory. Merely a wrapper for the case that we

Modified: gnunet/src/util/test_container_multihashmap.c
===================================================================
--- gnunet/src/util/test_container_multihashmap.c       2010-09-01 12:01:18 UTC 
(rev 12790)
+++ gnunet/src/util/test_container_multihashmap.c       2010-09-01 12:23:18 UTC 
(rev 12791)
@@ -37,6 +37,7 @@
   struct GNUNET_CONTAINER_MultiHashMap *m;
   GNUNET_HashCode k1;
   GNUNET_HashCode k2;
+  const char *ret;
   int j;
 
   CHECK (NULL != (m = GNUNET_CONTAINER_multihashmap_create (i)));
@@ -59,7 +60,9 @@
                                                          "v1",
                                                          
GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE));
   CHECK (1 == GNUNET_CONTAINER_multihashmap_size (m));
-  CHECK (0 == strcmp ("v1", GNUNET_CONTAINER_multihashmap_get (m, &k1)));
+  ret = GNUNET_CONTAINER_multihashmap_get (m, &k1);
+  GNUNET_assert (ret != NULL);
+  CHECK (0 == strcmp ("v1", ret));
   CHECK (GNUNET_NO == GNUNET_CONTAINER_multihashmap_put (m,
                                                          &k1,
                                                          "v1",

Modified: gnunet/src/util/test_strings.c
===================================================================
--- gnunet/src/util/test_strings.c      2010-09-01 12:01:18 UTC (rev 12790)
+++ gnunet/src/util/test_strings.c      2010-09-01 12:23:18 UTC (rev 12791)
@@ -77,6 +77,7 @@
                   hdir,
                   DIR_SEPARATOR_STR);
   b = GNUNET_STRINGS_filename_expand ("~");
+  GNUNET_assert (b != NULL);
   WANT (buf, b);
   GNUNET_STRINGS_buffer_fill (buf, sizeof (buf), 3, "a", "btx", "c");
   WANTB ("a\0btx\0c", buf, 8);