gnunet

commit d692b86f8096cb613b8f14418c1dddddd584fe8a
parent 11cd4959d673c5c58d9a952d25425c3ca4ba4b3e
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sun, 20 Oct 2013 13:49:09 +0000

-dead code elimination

Diffstat:
M
src/gns/gnunet-service-gns.c
 | 
3
+--
M
src/gns/gnunet-service-gns_resolver.c
 | 
11
+----------
M
src/gns/gnunet-service-gns_resolver.h
 | 
4
+---

3 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c
@@ -753,8 +753,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
       return;
     }
   }
-  GNS_resolver_init (namestore_handle,
-                     namecache_handle,
+  GNS_resolver_init (namecache_handle,
                      dht_handle,
 		     c,
 		     max_parallel_bg_queries);
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c
@@ -360,11 +360,6 @@ struct CacheOps
 
 
 /**
- * Our handle to the namestore service
- */
-static struct GNUNET_NAMESTORE_Handle *namestore_handle;
-
-/**
  * Our handle to the namecache service
  */
 static struct GNUNET_NAMECACHE_Handle *namecache_handle;
@@ -2143,15 +2138,13 @@ GNS_resolver_lookup_cancel (struct GNS_ResolverHandle *rh)
 /**
  * Initialize the resolver
  *
- * @param nh the namestore handle
  * @param nc the namecache handle
  * @param dht the dht handle
  * @param c configuration handle
  * @param max_bg_queries maximum number of parallel background queries in dht
  */
 void
-GNS_resolver_init (struct GNUNET_NAMESTORE_Handle *nh,
-                   struct GNUNET_NAMECACHE_Handle *nc,
+GNS_resolver_init (struct GNUNET_NAMECACHE_Handle *nc,
 		   struct GNUNET_DHT_Handle *dht,
 		   const struct GNUNET_CONFIGURATION_Handle *c,
 		   unsigned long long max_bg_queries)
@@ -2160,7 +2153,6 @@ GNS_resolver_init (struct GNUNET_NAMESTORE_Handle *nh,
 
   cfg = c;
   namecache_handle = nc;
-  namestore_handle = nh;
   dht_handle = dht;
   dht_lookup_heap =
     GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
@@ -2211,7 +2203,6 @@ GNS_resolver_done ()
   vpn_handle = NULL;
   dht_handle = NULL;
   namecache_handle = NULL;
-  namestore_handle = NULL;
 }
 
 
diff --git a/src/gns/gnunet-service-gns_resolver.h b/src/gns/gnunet-service-gns_resolver.h
@@ -32,15 +32,13 @@
  * Initialize the resolver subsystem.
  * MUST be called before #GNS_resolver_lookup.
  *
- * @param nh handle to the namestore
  * @param nc the namecache handle
  * @param dht handle to the dht
  * @param c configuration handle
  * @param max_bg_queries maximum amount of background queries
  */
 void
-GNS_resolver_init (struct GNUNET_NAMESTORE_Handle *nh,
-                   struct GNUNET_NAMECACHE_Handle *nc,
+GNS_resolver_init (struct GNUNET_NAMECACHE_Handle *nc,
 		   struct GNUNET_DHT_Handle *dht,
 		   const struct GNUNET_CONFIGURATION_Handle *c,
 		   unsigned long long max_bg_queries);