aboutsummaryrefslogtreecommitdiff
path: root/src/fs/fs_api.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-02-18 21:32:29 +0000
committerChristian Grothoff <christian@grothoff.org>2012-02-18 21:32:29 +0000
commit6a30eb236afd1612533f6ab762f9d76fea059afd (patch)
tree88b3ff8f259dbd9027acb7b2ad8a19b5d693f914 /src/fs/fs_api.c
parentbab8aca50cdead171292a5e834ad542254dabe3e (diff)
-use search URI, not result URI
Diffstat (limited to 'src/fs/fs_api.c')
-rw-r--r--src/fs/fs_api.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/fs/fs_api.c b/src/fs/fs_api.c
index 3c0d5bc724..cae2c693dc 100644
--- a/src/fs/fs_api.c
+++ b/src/fs/fs_api.c
@@ -1811,9 +1811,9 @@ GNUNET_FS_search_result_sync_ (struct GNUNET_FS_SearchResult *sr)
goto cleanup;
}
if ( (sr->uri != NULL) &&
- (sr->uri->type == ksk) &&
+ (sr->sc->uri->type == ksk) &&
(GNUNET_OK != GNUNET_BIO_write (wh, sr->keyword_bitmap,
- (sr->uri->data.ksk.keywordCount + 7) / 8)) )
+ (sr->sc->uri->data.ksk.keywordCount + 7) / 8)) )
{
GNUNET_break (0);
goto cleanup;
@@ -2115,13 +2115,12 @@ deserialize_search_result (void *cls, const char *filename)
GNUNET_break (0);
goto cleanup;
}
- if ( (NULL != sr->uri) &&
- (sr->uri->type == ksk) )
+ if (sr->sc->uri->type == ksk)
{
- sr->keyword_bitmap = GNUNET_malloc ((sr->uri->data.ksk.keywordCount + 7) / 8); /* round up, count bits */
+ sr->keyword_bitmap = GNUNET_malloc ((sr->sc->uri->data.ksk.keywordCount + 7) / 8); /* round up, count bits */
if (GNUNET_OK != GNUNET_BIO_read (rh, "keyword-bitmap",
sr->keyword_bitmap,
- (sr->uri->data.ksk.keywordCount + 7) / 8))
+ (sr->sc->uri->data.ksk.keywordCount + 7) / 8))
{
GNUNET_break (0);
goto cleanup;