From: Christian Grothoff <christian@grothoff.org>
Date: Sat, 18 Feb 2012 21:32:29 +0000 (+0000)
Subject: -use search URI, not result URI
X-Git-Tag: initial-import-from-subversion-38251~14811
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6a30eb236afd1612533f6ab762f9d76fea059afd;p=oweals%2Fgnunet.git

-use search URI, not result URI
---

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)
     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;