-fix misc compiler warnings

4 files changed, 31 insertions, 34 deletions

diff --git a/src/service/peerstore/test_peerstore_api_data.conf b/src/service/peerstore/test_peerstore_api_data.conf
index 614d0cf5b..638d4a5af 100644
--- a/src/service/peerstore/test_peerstore_api_data.conf
+++ b/src/service/peerstore/test_peerstore_api_data.conf
@@ -8,7 +8,7 @@ UNIXPATH = $GNUNET_TMP/gnunet-service-peerstore.sock
 DATABASE = sqlite
 UNIX_MATCH_UID = NO
 UNIX_MATCH_GID = YES
-#PREFIX = xterm -e gdb --args 
+#PREFIX = xterm -e gdb --args
 
 [peerstore-sqlite]
-FILENAME = $GNUNET_TEST_HOME/gnunet-peerstore-sqlite.db
+FILENAME = $GNUNET_TEST_HOME/gnunet-peerstore-sqlite-ng.db
diff --git a/src/service/peerstore/test_peerstore_api_iterate.c b/src/service/peerstore/test_peerstore_api_iterate.c
index 8d072d418..ca3fdf133 100644
--- a/src/service/peerstore/test_peerstore_api_iterate.c
+++ b/src/service/peerstore/test_peerstore_api_iterate.c
@@ -21,7 +21,6 @@
  * @file peerstore/test_peerstore_api_iterate.c
  * @brief testcase for peerstore iteration operation
  */
-#include "gnunet_common.h"
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
@@ -90,11 +89,11 @@ iter2_cb (void *cls,
   GNUNET_assert (count == 2);
   count = 0;
   ic = GNUNET_PEERSTORE_iteration_start (h,
-                                       ss,
-                                       NULL,
-                                       NULL,
-                                       &iter3_cb,
-                                       NULL);
+                                         ss,
+                                         NULL,
+                                         NULL,
+                                         &iter3_cb,
+                                         NULL);
 }
 
 
@@ -118,11 +117,11 @@ iter1_cb (void *cls,
   GNUNET_assert (count == 1);
   count = 0;
   ic = GNUNET_PEERSTORE_iteration_start (h,
-                                       ss,
-                                       &p1,
-                                       NULL,
-                                       &iter2_cb,
-                                       NULL);
+                                         ss,
+                                         &p1,
+                                         NULL,
+                                         &iter2_cb,
+                                         NULL);
 }
 
 
@@ -160,10 +159,10 @@ store_cont (void *cls, int success)
   {
     count = 0;
     ic = GNUNET_PEERSTORE_iteration_start (h,
-                                         ss,
-                                         &p1,
-                                         k1,
-                                         &iter1_cb, NULL);
+                                           ss,
+                                           &p1,
+                                           k1,
+                                           &iter1_cb, NULL);
     return;
   }
   count++;
diff --git a/src/service/peerstore/test_peerstore_api_store.c b/src/service/peerstore/test_peerstore_api_store.c
index 1883310b9..d2ec9aad7 100644
--- a/src/service/peerstore/test_peerstore_api_store.c
+++ b/src/service/peerstore/test_peerstore_api_store.c
@@ -21,8 +21,8 @@
  * @file peerstore/test_peerstore_api_store.c
  * @brief testcase for peerstore store operation
  */
-#include "gnunet_common.h"
 #include "platform.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_peerstore_service.h"
 #include "gnunet_testing_lib.h"
 
@@ -80,11 +80,11 @@ test3_cont (void *cls,
     return;
   count = 0;
   ic = GNUNET_PEERSTORE_iteration_start (h,
-                                       subsystem,
-                                       &pid,
-                                       key,
-                                       &test3_cont2,
-                                       NULL);
+                                         subsystem,
+                                         &pid,
+                                         key,
+                                         &test3_cont2,
+                                         NULL);
 }
 
 
@@ -137,10 +137,10 @@ test2_cont (void *cls, int success)
     return;
   count = 0;
   ic = GNUNET_PEERSTORE_iteration_start (h,
-                                       subsystem,
-                                       &pid, key,
-                                       &test2_cont2,
-                                       NULL);
+                                         subsystem,
+                                         &pid, key,
+                                         &test2_cont2,
+                                         NULL);
 }
 
 
@@ -195,11 +195,11 @@ test1_cont (void *cls, int success)
     return;
   count = 0;
   ic = GNUNET_PEERSTORE_iteration_start (h,
-                                       subsystem,
-                                       &pid,
-                                       key,
-                                       &test1_cont2,
-                                       NULL);
+                                         subsystem,
+                                         &pid,
+                                         key,
+                                         &test1_cont2,
+                                         NULL);
 }
 
 
diff --git a/src/service/peerstore/test_peerstore_api_watch.c b/src/service/peerstore/test_peerstore_api_watch.c
index 9f547f2dd..90f1180f8 100644
--- a/src/service/peerstore/test_peerstore_api_watch.c
+++ b/src/service/peerstore/test_peerstore_api_watch.c
@@ -21,8 +21,6 @@
  * @file peerstore/test_peerstore_api_watch.c
  * @brief testcase for peerstore watch functionality
  */
-#include "gnunet_common.h"
-#include "gnunet_time_lib.h"
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"