-another renaming fest for GNUNET_NAMESTORE_ to GNUNET_GNSRECORD_ symbols that were moved

6 files changed, 27 insertions, 27 deletions

diff --git a/src/namecache/gnunet-namecache.c b/src/namecache/gnunet-namecache.c
index cda40fae9..8635fa75f 100644
--- a/src/namecache/gnunet-namecache.c
+++ b/src/namecache/gnunet-namecache.c
@@ -99,7 +99,7 @@ do_shutdown (void *cls,
 static void
 display_records_from_block (void *cls,
                             unsigned int rd_len,
-                            const struct GNUNET_NAMESTORE_RecordData *rd)
+                            const struct GNUNET_GNSRECORD_Data *rd)
 {
   const char *typestring;
   char *s;
@@ -145,7 +145,7 @@ display_records_from_block (void *cls,
  */
 static void
 handle_block (void *cls,
-              const struct GNUNET_NAMESTORE_Block *block)
+              const struct GNUNET_GNSRECORD_Block *block)
 {
   qe = NULL;
   if (NULL == block)
@@ -154,7 +154,7 @@ handle_block (void *cls,
              "No matching block found\n");
   }
   else if (GNUNET_OK !=
-           GNUNET_NAMESTORE_block_decrypt (block,
+           GNUNET_GNSRECORD_block_decrypt (block,
                                            &pubkey,
                                            name,
                                            &display_records_from_block,
@@ -202,7 +202,7 @@ run (void *cls, char *const *args, const char *cfgfile,
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
                                 &do_shutdown,
                                 NULL);
-  GNUNET_NAMESTORE_query_from_public_key (&pubkey,
+  GNUNET_GNSRECORD_query_from_public_key (&pubkey,
                                           name,
                                           &dhash);
   qe = GNUNET_NAMECACHE_lookup_block (ns,
diff --git a/src/namecache/gnunet-service-namecache.c b/src/namecache/gnunet-service-namecache.c
index 832f02b45..701bac4ae 100644
--- a/src/namecache/gnunet-service-namecache.c
+++ b/src/namecache/gnunet-service-namecache.c
@@ -215,7 +215,7 @@ struct LookupBlockContext
  */
 static void
 handle_lookup_block_it (void *cls,
-                        const struct GNUNET_NAMESTORE_Block *block)
+                        const struct GNUNET_GNSRECORD_Block *block)
 {
   struct LookupBlockContext *lnc = cls;
   struct LookupBlockResponseMessage *r;
@@ -316,7 +316,7 @@ handle_block_cache (void *cls,
   struct NamecacheClient *nc;
   const struct BlockCacheMessage *rp_msg;
   struct BlockCacheResponseMessage rpr_msg;
-  struct GNUNET_NAMESTORE_Block *block;
+  struct GNUNET_GNSRECORD_Block *block;
   size_t esize;
   int res;
 
@@ -329,7 +329,7 @@ handle_block_cache (void *cls,
   }
   rp_msg = (const struct BlockCacheMessage *) message;
   esize = ntohs (rp_msg->gns_header.header.size) - sizeof (struct BlockCacheMessage);
-  block = GNUNET_malloc (sizeof (struct GNUNET_NAMESTORE_Block) + esize);
+  block = GNUNET_malloc (sizeof (struct GNUNET_GNSRECORD_Block) + esize);
   block->signature = rp_msg->signature;
   block->derived_key = rp_msg->derived_key;
   block->purpose.size = htonl (sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose) +
diff --git a/src/namecache/namecache_api.c b/src/namecache/namecache_api.c
index a28ed7d53..942272b99 100644
--- a/src/namecache/namecache_api.c
+++ b/src/namecache/namecache_api.c
@@ -76,7 +76,7 @@ struct GNUNET_NAMECACHE_QueueEntry
   /**
    * Function to call with the blocks we get back; or NULL.
    */
-  GNUNET_NAMESTORE_BlockProcessor block_proc;
+  GNUNET_GNSRECORD_BlockProcessor block_proc;
 
   /**
    * Closure for @e block_proc.
@@ -208,8 +208,8 @@ handle_lookup_block_response (struct GNUNET_NAMECACHE_QueueEntry *qe,
                               const struct LookupBlockResponseMessage *msg,
                               size_t size)
 {
-  struct GNUNET_NAMESTORE_Block *block;
-  char buf[size + sizeof (struct GNUNET_NAMESTORE_Block)
+  struct GNUNET_GNSRECORD_Block *block;
+  char buf[size + sizeof (struct GNUNET_GNSRECORD_Block)
            - sizeof (struct LookupBlockResponseMessage)];
 
   LOG (GNUNET_ERROR_TYPE_DEBUG,
@@ -223,7 +223,7 @@ handle_lookup_block_response (struct GNUNET_NAMECACHE_QueueEntry *qe,
     return GNUNET_OK;
   }
 
-  block = (struct GNUNET_NAMESTORE_Block *) buf;
+  block = (struct GNUNET_GNSRECORD_Block *) buf;
   block->signature = msg->signature;
   block->derived_key = msg->derived_key;
   block->purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_GNS_RECORD_SIGN);
@@ -235,7 +235,7 @@ handle_lookup_block_response (struct GNUNET_NAMECACHE_QueueEntry *qe,
           &msg[1],
           size - sizeof (struct LookupBlockResponseMessage));
   if (GNUNET_OK !=
-      GNUNET_NAMESTORE_block_verify (block))
+      GNUNET_GNSRECORD_block_verify (block))
   {
     GNUNET_break (0);
     return GNUNET_SYSERR;
@@ -623,7 +623,7 @@ GNUNET_NAMECACHE_disconnect (struct GNUNET_NAMECACHE_Handle *h)
  */
 struct GNUNET_NAMECACHE_QueueEntry *
 GNUNET_NAMECACHE_block_cache (struct GNUNET_NAMECACHE_Handle *h,
-                              const struct GNUNET_NAMESTORE_Block *block,
+                              const struct GNUNET_GNSRECORD_Block *block,
                               GNUNET_NAMECACHE_ContinuationWithStatus cont,
                               void *cont_cls)
 {
@@ -683,7 +683,7 @@ GNUNET_NAMECACHE_block_cache (struct GNUNET_NAMECACHE_Handle *h,
 struct GNUNET_NAMECACHE_QueueEntry *
 GNUNET_NAMECACHE_lookup_block (struct GNUNET_NAMECACHE_Handle *h,
                                const struct GNUNET_HashCode *derived_hash,
-                               GNUNET_NAMESTORE_BlockProcessor proc, void *proc_cls)
+                               GNUNET_GNSRECORD_BlockProcessor proc, void *proc_cls)
 {
   struct GNUNET_NAMECACHE_QueueEntry *qe;
   struct PendingMessage *pe;
diff --git a/src/namecache/plugin_namecache_postgres.c b/src/namecache/plugin_namecache_postgres.c
index 72cfcf243..7135375dc 100644
--- a/src/namecache/plugin_namecache_postgres.c
+++ b/src/namecache/plugin_namecache_postgres.c
@@ -255,7 +255,7 @@ delete_old_block (struct Plugin *plugin,
  */
 static int
 namecache_postgres_cache_block (void *cls,
-                                const struct GNUNET_NAMESTORE_Block *block)
+                                const struct GNUNET_GNSRECORD_Block *block)
 {
   struct Plugin *plugin = cls;
   struct GNUNET_HashCode query;
@@ -327,7 +327,7 @@ namecache_postgres_lookup_block (void *cls,
   PGresult *res;
   unsigned int cnt;
   size_t bsize;
-  const struct GNUNET_NAMESTORE_Block *block;
+  const struct GNUNET_GNSRECORD_Block *block;
 
   res = PQexecPrepared (plugin->dbh,
                         "lookup_block", 1,
@@ -353,7 +353,7 @@ namecache_postgres_lookup_block (void *cls,
   GNUNET_assert (1 == cnt);
   GNUNET_assert (1 != PQnfields (res));
   bsize = PQgetlength (res, 0, 0);
-  block = (const struct GNUNET_NAMESTORE_Block *) PQgetvalue (res, 0, 0);
+  block = (const struct GNUNET_GNSRECORD_Block *) PQgetvalue (res, 0, 0);
   if ( (bsize < sizeof (*block)) ||
        (bsize != ntohl (block->purpose.size) +
         sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) +
diff --git a/src/namecache/plugin_namecache_sqlite.c b/src/namecache/plugin_namecache_sqlite.c
index 7eb8b4503..2e78fee44 100644
--- a/src/namecache/plugin_namecache_sqlite.c
+++ b/src/namecache/plugin_namecache_sqlite.c
@@ -366,7 +366,7 @@ namecache_sqlite_expire_blocks (struct Plugin *plugin)
  */
 static int
 namecache_sqlite_cache_block (void *cls,
-                              const struct GNUNET_NAMESTORE_Block *block)
+                              const struct GNUNET_GNSRECORD_Block *block)
 {
   struct Plugin *plugin = cls;
   struct GNUNET_HashCode query;
@@ -495,7 +495,7 @@ namecache_sqlite_lookup_block (void *cls,
   int ret;
   int sret;
   size_t block_size;
-  const struct GNUNET_NAMESTORE_Block *block;
+  const struct GNUNET_GNSRECORD_Block *block;
 
   if (SQLITE_OK != sqlite3_bind_blob (plugin->lookup_block, 1,
                                       query, sizeof (struct GNUNET_HashCode),
@@ -514,7 +514,7 @@ namecache_sqlite_lookup_block (void *cls,
   {
     block = sqlite3_column_blob (plugin->lookup_block, 0);
     block_size = sqlite3_column_bytes (plugin->lookup_block, 0);
-    if ( (block_size < sizeof (struct GNUNET_NAMESTORE_Block)) ||
+    if ( (block_size < sizeof (struct GNUNET_GNSRECORD_Block)) ||
          (ntohl (block->purpose.size) +
           sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) +
           sizeof (struct GNUNET_CRYPTO_EcdsaSignature) != block_size) )
diff --git a/src/namecache/test_namecache_api_cache_block.c b/src/namecache/test_namecache_api_cache_block.c
index f28016cd1..cbc74211f 100644
--- a/src/namecache/test_namecache_api_cache_block.c
+++ b/src/namecache/test_namecache_api_cache_block.c
@@ -94,7 +94,7 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 static void
 rd_decrypt_cb (void *cls,
                unsigned int rd_count,
-               const struct GNUNET_NAMESTORE_RecordData *rd)
+               const struct GNUNET_GNSRECORD_Data *rd)
 {
   char rd_cmp_data[TEST_RECORD_DATALEN];
 
@@ -115,7 +115,7 @@ rd_decrypt_cb (void *cls,
 
 static void
 name_lookup_proc (void *cls,
-                  const struct GNUNET_NAMESTORE_Block *block)
+                  const struct GNUNET_GNSRECORD_Block *block)
 {
   const char *name = cls;
   nsqe = NULL;
@@ -140,7 +140,7 @@ name_lookup_proc (void *cls,
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Namecache returned block, decrypting \n");
-  GNUNET_assert (GNUNET_OK == GNUNET_NAMESTORE_block_decrypt(block,
+  GNUNET_assert (GNUNET_OK == GNUNET_GNSRECORD_block_decrypt(block,
                 &pubkey, name, &rd_decrypt_cb, (void *) name));
 }
 
@@ -158,7 +158,7 @@ cache_cont (void *cls, int32_t success, const char *emsg)
               (success == GNUNET_OK) ? "SUCCESS" : "FAIL");
 
   /* Create derived hash */
-  GNUNET_NAMESTORE_query_from_public_key (&pubkey, name, &derived_hash);
+  GNUNET_GNSRECORD_query_from_public_key (&pubkey, name, &derived_hash);
 
   nsqe = GNUNET_NAMECACHE_lookup_block (nsh, &derived_hash,
                                          &name_lookup_proc, (void *) name);
@@ -170,8 +170,8 @@ run (void *cls,
      const struct GNUNET_CONFIGURATION_Handle *cfg,
      struct GNUNET_TESTING_Peer *peer)
 {
-  struct GNUNET_NAMESTORE_RecordData rd;
-  struct GNUNET_NAMESTORE_Block *block;
+  struct GNUNET_GNSRECORD_Data rd;
+  struct GNUNET_GNSRECORD_Block *block;
   char *hostkey_file;
   const char * name = "dummy.dummy.gnunet";
 
@@ -193,7 +193,7 @@ run (void *cls,
   rd.data_size = TEST_RECORD_DATALEN;
   rd.data = GNUNET_malloc (TEST_RECORD_DATALEN);
   memset ((char *) rd.data, 'a', TEST_RECORD_DATALEN);
-  block = GNUNET_NAMESTORE_block_create (privkey,
+  block = GNUNET_GNSRECORD_block_create (privkey,
       GNUNET_TIME_UNIT_FOREVER_ABS, name, &rd, 1 );
   if (NULL == block)
   {