merging configs

[oweals/gnunet.git] / src / dns / plugin_block_dns.c

diff --git a/src/dns/plugin_block_dns.c b/src/dns/plugin_block_dns.c
index 96a4dc04e76d5682091691f64262780fe845c8c1..8ac1ef2b580848ffdb8973159d37118813676e3e 100644 (file)
--- a/src/dns/plugin_block_dns.c
+++ b/src/dns/plugin_block_dns.c
@@ -48,7 +48,7 @@
  */
 static enum GNUNET_BLOCK_EvaluationResult
 block_plugin_dns_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
-                           const GNUNET_HashCode * query,
+                           const struct GNUNET_HashCode * query,
                            struct GNUNET_CONTAINER_BloomFilter **bf,
                            int32_t bf_mutator, const void *xquery,
                            size_t xquery_size, const void *reply_block,
@@ -85,7 +85,7 @@ block_plugin_dns_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
       return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
     }
 
-    if (GNUNET_TIME_relative_get_zero ().rel_value ==
+    if (0 ==
         GNUNET_TIME_absolute_get_remaining (GNUNET_TIME_absolute_ntoh
                                             (rec->expiration_time)).rel_value)
     {
@@ -124,13 +124,13 @@ block_plugin_dns_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
 static int
 block_plugin_dns_get_key (void *cls, enum GNUNET_BLOCK_Type type,
                           const void *block, size_t block_size,
-                          GNUNET_HashCode * key)
+                          struct GNUNET_HashCode * key)
 {
   if (type != GNUNET_BLOCK_TYPE_DNS)
     return GNUNET_SYSERR;
   const struct GNUNET_DNS_Record *rec = block;
 
-  memcpy (key, &rec->service_descriptor, sizeof (GNUNET_HashCode));
+  memcpy (key, &rec->service_descriptor, sizeof (struct GNUNET_HashCode));
   return GNUNET_OK;
 }