bugfixes

11 files changed, 2 insertions, 29 deletions

diff --git a/src/datacache/datacache.c b/src/datacache/datacache.c
index bfd48ff63..c8530055d 100644
--- a/src/datacache/datacache.c
+++ b/src/datacache/datacache.c
@@ -35,11 +35,6 @@ struct GNUNET_DATACACHE_Handle
 {
 
   /**
-   * Our datastore plugin (NULL if not available).
-   */
-  struct DatastorePlugin *plugin;
-  
-  /**
    * Bloomfilter to quickly tell if we don't have the content.
    */
   struct GNUNET_CONTAINER_BloomFilter *filter;
diff --git a/src/datastore/test_datastore_api.c b/src/datastore/test_datastore_api.c
index 0e1ffe155..605cb042d 100644
--- a/src/datastore/test_datastore_api.c
+++ b/src/datastore/test_datastore_api.c
@@ -118,7 +118,6 @@ struct CpsRunContext
   GNUNET_HashCode key;
   int i;
   int rid;
-  int *iptr;
   struct GNUNET_SCHEDULER_Handle *sched;
   const struct GNUNET_CONFIGURATION_Handle *cfg;
   void *data;
diff --git a/src/datastore/test_datastore_api_management.c b/src/datastore/test_datastore_api_management.c
index bcc5b5e85..48daebb1d 100644
--- a/src/datastore/test_datastore_api_management.c
+++ b/src/datastore/test_datastore_api_management.c
@@ -111,7 +111,6 @@ struct CpsRunContext
   struct GNUNET_SCHEDULER_Handle *sched;
   const struct GNUNET_CONFIGURATION_Handle *cfg;
   void *data;
-  size_t size;
   enum RunPhase phase;
 };
 
diff --git a/src/fs/test_fs_download.c b/src/fs/test_fs_download.c
index 9b85e1ca1..04cd3e5d8 100644
--- a/src/fs/test_fs_download.c
+++ b/src/fs/test_fs_download.c
@@ -51,7 +51,6 @@
 struct PeerContext
 {
   struct GNUNET_CONFIGURATION_Handle *cfg;
-  struct GNUNET_PeerIdentity id;   
 #if START_ARM
   pid_t arm_pid;
 #endif
diff --git a/src/fs/test_fs_list_indexed.c b/src/fs/test_fs_list_indexed.c
index 469280445..868c9d71a 100644
--- a/src/fs/test_fs_list_indexed.c
+++ b/src/fs/test_fs_list_indexed.c
@@ -55,7 +55,6 @@
 struct PeerContext
 {
   struct GNUNET_CONFIGURATION_Handle *cfg;
-  struct GNUNET_PeerIdentity id;   
 #if START_ARM
   pid_t arm_pid;
 #endif
diff --git a/src/fs/test_fs_namespace.c b/src/fs/test_fs_namespace.c
index 7a1a6f81e..90286067d 100644
--- a/src/fs/test_fs_namespace.c
+++ b/src/fs/test_fs_namespace.c
@@ -41,7 +41,6 @@ static struct GNUNET_FS_Handle *fs;
 struct PeerContext
 {
   struct GNUNET_CONFIGURATION_Handle *cfg;
-  struct GNUNET_PeerIdentity id;   
 #if START_ARM
   pid_t arm_pid;
 #endif
diff --git a/src/fs/test_fs_publish.c b/src/fs/test_fs_publish.c
index 9473cddb5..1b79b941d 100644
--- a/src/fs/test_fs_publish.c
+++ b/src/fs/test_fs_publish.c
@@ -52,7 +52,6 @@
 struct PeerContext
 {
   struct GNUNET_CONFIGURATION_Handle *cfg;
-  struct GNUNET_PeerIdentity id;   
 #if START_ARM
   pid_t arm_pid;
 #endif
diff --git a/src/fs/test_fs_start_stop.c b/src/fs/test_fs_start_stop.c
index e25de8e70..eac14b070 100644
--- a/src/fs/test_fs_start_stop.c
+++ b/src/fs/test_fs_start_stop.c
@@ -38,7 +38,6 @@ static struct PeerContext p1;
 struct PeerContext
 {
   struct GNUNET_CONFIGURATION_Handle *cfg;
-  struct GNUNET_PeerIdentity id;   
 #if START_ARM
   pid_t arm_pid;
 #endif
diff --git a/src/fs/test_fs_unindex.c b/src/fs/test_fs_unindex.c
index c2fc8913b..eb10c1db9 100644
--- a/src/fs/test_fs_unindex.c
+++ b/src/fs/test_fs_unindex.c
@@ -51,7 +51,6 @@
 struct PeerContext
 {
   struct GNUNET_CONFIGURATION_Handle *cfg;
-  struct GNUNET_PeerIdentity id;   
 #if START_ARM
   pid_t arm_pid;
 #endif
diff --git a/src/hostlist/test_gnunet_daemon_hostlist.c b/src/hostlist/test_gnunet_daemon_hostlist.c
index 2c3647190..d71340377 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist.c
@@ -44,8 +44,6 @@ static struct GNUNET_SCHEDULER_Handle *sched;
 struct PeerContext
 {
   struct GNUNET_CONFIGURATION_Handle *cfg;
-  struct GNUNET_CORE_Handle *ch;
-  struct GNUNET_PeerIdentity id; 
   struct GNUNET_TRANSPORT_Handle *th;
   struct GNUNET_MessageHeader *hello;
 #if START_ARM
diff --git a/src/util/container_heap.c b/src/util/container_heap.c
index efe968e82..4709d97a6 100644
--- a/src/util/container_heap.c
+++ b/src/util/container_heap.c
@@ -28,19 +28,7 @@
 #include "gnunet_protocols.h"
 #include "gnunet_util_lib.h"
 
-/*
- * Struct that is stored in hashmap, pointers to
- * locations in min_heap and max_heap.
- */
-struct GNUNET_CONTAINER_heap_info
-{
-  struct GNUNET_CONTAINER_heap_node *min_loc;
-
-  struct GNUNET_CONTAINER_heap_node *max_loc;
-
-};
-
-/*
+/**
  * Generic heap node structure, contains pointer to parent
  * left child, right child, and actual neighbor.
  */
@@ -211,7 +199,7 @@ static struct GNUNET_CONTAINER_heap_node *
 getPos (struct GNUNET_CONTAINER_Heap *root, unsigned int pos)
 {
   struct GNUNET_CONTAINER_heap_node *ret;
-  int i;
+  unsigned int i;
 
   ret = NULL;
   if (pos > root->size)