diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-02-18 21:32:29 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-02-18 21:32:29 +0000 |
commit | 6a30eb236afd1612533f6ab762f9d76fea059afd (patch) | |
tree | 88b3ff8f259dbd9027acb7b2ad8a19b5d693f914 /src/fs | |
parent | bab8aca50cdead171292a5e834ad542254dabe3e (diff) | |
download | gnunet-6a30eb236afd1612533f6ab762f9d76fea059afd.tar.gz gnunet-6a30eb236afd1612533f6ab762f9d76fea059afd.zip |
-use search URI, not result URI
Diffstat (limited to 'src/fs')
-rw-r--r-- | src/fs/fs_api.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/fs/fs_api.c b/src/fs/fs_api.c index 3c0d5bc72..cae2c693d 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) | |||
1811 | goto cleanup; | 1811 | goto cleanup; |
1812 | } | 1812 | } |
1813 | if ( (sr->uri != NULL) && | 1813 | if ( (sr->uri != NULL) && |
1814 | (sr->uri->type == ksk) && | 1814 | (sr->sc->uri->type == ksk) && |
1815 | (GNUNET_OK != GNUNET_BIO_write (wh, sr->keyword_bitmap, | 1815 | (GNUNET_OK != GNUNET_BIO_write (wh, sr->keyword_bitmap, |
1816 | (sr->uri->data.ksk.keywordCount + 7) / 8)) ) | 1816 | (sr->sc->uri->data.ksk.keywordCount + 7) / 8)) ) |
1817 | { | 1817 | { |
1818 | GNUNET_break (0); | 1818 | GNUNET_break (0); |
1819 | goto cleanup; | 1819 | goto cleanup; |
@@ -2115,13 +2115,12 @@ deserialize_search_result (void *cls, const char *filename) | |||
2115 | GNUNET_break (0); | 2115 | GNUNET_break (0); |
2116 | goto cleanup; | 2116 | goto cleanup; |
2117 | } | 2117 | } |
2118 | if ( (NULL != sr->uri) && | 2118 | if (sr->sc->uri->type == ksk) |
2119 | (sr->uri->type == ksk) ) | ||
2120 | { | 2119 | { |
2121 | sr->keyword_bitmap = GNUNET_malloc ((sr->uri->data.ksk.keywordCount + 7) / 8); /* round up, count bits */ | 2120 | sr->keyword_bitmap = GNUNET_malloc ((sr->sc->uri->data.ksk.keywordCount + 7) / 8); /* round up, count bits */ |
2122 | if (GNUNET_OK != GNUNET_BIO_read (rh, "keyword-bitmap", | 2121 | if (GNUNET_OK != GNUNET_BIO_read (rh, "keyword-bitmap", |
2123 | sr->keyword_bitmap, | 2122 | sr->keyword_bitmap, |
2124 | (sr->uri->data.ksk.keywordCount + 7) / 8)) | 2123 | (sr->sc->uri->data.ksk.keywordCount + 7) / 8)) |
2125 | { | 2124 | { |
2126 | GNUNET_break (0); | 2125 | GNUNET_break (0); |
2127 | goto cleanup; | 2126 | goto cleanup; |