[GNUnet-SVN] r30355 - gnunet/src/gns

[gnunet]

Author: grothoff
Date: 2013-10-20 15:49:09 +0200 (Sun, 20 Oct 2013)
New Revision: 30355

Modified:
   gnunet/src/gns/gnunet-service-gns.c
   gnunet/src/gns/gnunet-service-gns_resolver.c
   gnunet/src/gns/gnunet-service-gns_resolver.h
Log:
-dead code elimination

Modified: gnunet/src/gns/gnunet-service-gns.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns.c 2013-10-20 13:33:21 UTC (rev 30354)
+++ gnunet/src/gns/gnunet-service-gns.c 2013-10-20 13:49:09 UTC (rev 30355)
@@ -753,8 +753,7 @@
       return;
     }
   }
-  GNS_resolver_init (namestore_handle,
-                     namecache_handle,
+  GNS_resolver_init (namecache_handle,
                      dht_handle,
                     c,
                     max_parallel_bg_queries);

Modified: gnunet/src/gns/gnunet-service-gns_resolver.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns_resolver.c        2013-10-20 13:33:21 UTC 
(rev 30354)
+++ gnunet/src/gns/gnunet-service-gns_resolver.c        2013-10-20 13:49:09 UTC 
(rev 30355)
@@ -360,11 +360,6 @@
 
 
 /**
- * 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 @@
 /**
  * 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 @@
 
   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 @@
   vpn_handle = NULL;
   dht_handle = NULL;
   namecache_handle = NULL;
-  namestore_handle = NULL;
 }
 
 

Modified: gnunet/src/gns/gnunet-service-gns_resolver.h
===================================================================
--- gnunet/src/gns/gnunet-service-gns_resolver.h        2013-10-20 13:33:21 UTC 
(rev 30354)
+++ gnunet/src/gns/gnunet-service-gns_resolver.h        2013-10-20 13:49:09 UTC 
(rev 30355)
@@ -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);