aboutsummaryrefslogtreecommitdiff
path: root/src/fs/fs_search.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-09-10 22:17:19 +0000
committerChristian Grothoff <christian@grothoff.org>2012-09-10 22:17:19 +0000
commit7dc9c567366b73f192eaf4eab4570e6119e07000 (patch)
tree03b0db913f12dfa0e575ff5d735902360e0df3b7 /src/fs/fs_search.c
parentd0e3840931750ca4bf4848d950ab9a0c0b5022bc (diff)
downloadgnunet-7dc9c567366b73f192eaf4eab4570e6119e07000.tar.gz
gnunet-7dc9c567366b73f192eaf4eab4570e6119e07000.zip
eliminating use of 'namespace' as a fieldname / variable name to be C++ compatible
Diffstat (limited to 'src/fs/fs_search.c')
-rw-r--r--src/fs/fs_search.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/fs/fs_search.c b/src/fs/fs_search.c
index bef623287..3b28c9a58 100644
--- a/src/fs/fs_search.c
+++ b/src/fs/fs_search.c
@@ -505,7 +505,7 @@ process_sks_result (struct GNUNET_FS_SearchContext *sc, const char *id_update,
505 if (0 == strlen (id_update)) 505 if (0 == strlen (id_update))
506 return; /* no updates */ 506 return; /* no updates */
507 uu.type = sks; 507 uu.type = sks;
508 uu.data.sks.namespace = sc->uri->data.sks.namespace; 508 uu.data.sks.ns = sc->uri->data.sks.ns;
509 uu.data.sks.identifier = GNUNET_strdup (id_update); 509 uu.data.sks.identifier = GNUNET_strdup (id_update);
510 (void) search_start (sc->h, &uu, sc->anonymity, sc->options, NULL, sr); 510 (void) search_start (sc->h, &uu, sc->anonymity, sc->options, NULL, sr);
511 GNUNET_free (uu.data.sks.identifier); 511 GNUNET_free (uu.data.sks.identifier);
@@ -671,13 +671,13 @@ process_nblock (struct GNUNET_FS_SearchContext *sc, const struct NBlock *nb,
671 uri->data.sks.identifier = GNUNET_strdup (pt); 671 uri->data.sks.identifier = GNUNET_strdup (pt);
672 GNUNET_CRYPTO_hash (&nb->subspace, 672 GNUNET_CRYPTO_hash (&nb->subspace,
673 sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), 673 sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
674 &uri->data.sks.namespace); 674 &uri->data.sks.ns);
675 uris = GNUNET_FS_uri_to_string (uri); 675 uris = GNUNET_FS_uri_to_string (uri);
676 GNUNET_CONTAINER_meta_data_insert (meta, "<gnunet>", EXTRACTOR_METATYPE_URI, 676 GNUNET_CONTAINER_meta_data_insert (meta, "<gnunet>", EXTRACTOR_METATYPE_URI,
677 EXTRACTOR_METAFORMAT_UTF8, "text/plain", 677 EXTRACTOR_METAFORMAT_UTF8, "text/plain",
678 uris, strlen (uris) + 1); 678 uris, strlen (uris) + 1);
679 GNUNET_free (uris); 679 GNUNET_free (uris);
680 GNUNET_PSEUDONYM_add (sc->h->cfg, &uri->data.sks.namespace, meta); 680 GNUNET_PSEUDONYM_add (sc->h->cfg, &uri->data.sks.ns, meta);
681 /* process */ 681 /* process */
682 process_ksk_result (sc, &sc->requests[i], uri, meta); 682 process_ksk_result (sc, &sc->requests[i], uri, meta);
683 683
@@ -1058,7 +1058,7 @@ transmit_search_request (void *cls, size_t size, void *buf)
1058 GNUNET_assert (size >= msize); 1058 GNUNET_assert (size >= msize);
1059 sm->type = htonl (GNUNET_BLOCK_TYPE_FS_SBLOCK); 1059 sm->type = htonl (GNUNET_BLOCK_TYPE_FS_SBLOCK);
1060 sm->anonymity_level = htonl (sc->anonymity); 1060 sm->anonymity_level = htonl (sc->anonymity);
1061 sm->target = sc->uri->data.sks.namespace; 1061 sm->target = sc->uri->data.sks.ns;
1062 identifier = sc->uri->data.sks.identifier; 1062 identifier = sc->uri->data.sks.identifier;
1063 GNUNET_CRYPTO_hash (identifier, strlen (identifier), &key); 1063 GNUNET_CRYPTO_hash (identifier, strlen (identifier), &key);
1064 GNUNET_CRYPTO_hash (&key, sizeof (struct GNUNET_HashCode), &idh); 1064 GNUNET_CRYPTO_hash (&key, sizeof (struct GNUNET_HashCode), &idh);