aboutsummaryrefslogtreecommitdiff
path: root/src/fs/fs_search.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-08-08 15:24:44 +0000
committerChristian Grothoff <christian@grothoff.org>2013-08-08 15:24:44 +0000
commitd25cefa31b5b5c7c731cd390cfba7f730ab8cdcd (patch)
tree9433027b3908da6121d03a47c148ce43a5ead12b /src/fs/fs_search.c
parentb57e331a56521971070a55d1bb78f34e05c34577 (diff)
downloadgnunet-d25cefa31b5b5c7c731cd390cfba7f730ab8cdcd.tar.gz
gnunet-d25cefa31b5b5c7c731cd390cfba7f730ab8cdcd.zip
-minor fixes
Diffstat (limited to 'src/fs/fs_search.c')
-rw-r--r--src/fs/fs_search.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/fs/fs_search.c b/src/fs/fs_search.c
index 3b0db0429..a0fec03a1 100644
--- a/src/fs/fs_search.c
+++ b/src/fs/fs_search.c
@@ -558,7 +558,7 @@ process_ksk_result (struct GNUNET_FS_SearchContext *sc,
558 is_new = (NULL == sr) || (sr->mandatory_missing > 0); 558 is_new = (NULL == sr) || (sr->mandatory_missing > 0);
559 if (NULL == sr) 559 if (NULL == sr)
560 { 560 {
561 sr = GNUNET_malloc (sizeof (struct GNUNET_FS_SearchResult)); 561 sr = GNUNET_new (struct GNUNET_FS_SearchResult);
562 sr->h = sc->h; 562 sr->h = sc->h;
563 sr->sc = sc; 563 sr->sc = sc;
564 sr->anonymity = sc->anonymity; 564 sr->anonymity = sc->anonymity;
@@ -639,7 +639,7 @@ process_sks_result (struct GNUNET_FS_SearchContext *sc, const char *id_update,
639 &test_result_present, 639 &test_result_present,
640 (void *) uri)) 640 (void *) uri))
641 return; /* duplicate result */ 641 return; /* duplicate result */
642 sr = GNUNET_malloc (sizeof (struct GNUNET_FS_SearchResult)); 642 sr = GNUNET_new (struct GNUNET_FS_SearchResult);
643 sr->h = sc->h; 643 sr->h = sc->h;
644 sr->sc = sc; 644 sr->sc = sc;
645 sr->anonymity = sc->anonymity; 645 sr->anonymity = sc->anonymity;
@@ -721,7 +721,8 @@ decrypt_block_with_keyword (const struct GNUNET_FS_SearchContext *sc,
721 * @param size size of nb 721 * @param size size of nb
722 */ 722 */
723static void 723static void
724process_kblock (struct GNUNET_FS_SearchContext *sc, const struct UBlock *ub, 724process_kblock (struct GNUNET_FS_SearchContext *sc,
725 const struct UBlock *ub,
725 size_t size) 726 size_t size)
726{ 727{
727 size_t j; 728 size_t j;
@@ -793,7 +794,6 @@ process_sblock (struct GNUNET_FS_SearchContext *sc,
793 size_t off; 794 size_t off;
794 char *emsg; 795 char *emsg;
795 796
796 /* decrypt */
797 GNUNET_FS_ublock_decrypt_ (&ub[1], len, 797 GNUNET_FS_ublock_decrypt_ (&ub[1], len,
798 &sc->uri->data.sks.ns, 798 &sc->uri->data.sks.ns,
799 sc->uri->data.sks.identifier, 799 sc->uri->data.sks.identifier,
@@ -837,7 +837,8 @@ process_sblock (struct GNUNET_FS_SearchContext *sc,
837 * @param size size of data 837 * @param size size of data
838 */ 838 */
839static void 839static void
840process_result (struct GNUNET_FS_SearchContext *sc, enum GNUNET_BLOCK_Type type, 840process_result (struct GNUNET_FS_SearchContext *sc,
841 enum GNUNET_BLOCK_Type type,
841 struct GNUNET_TIME_Absolute expiration, 842 struct GNUNET_TIME_Absolute expiration,
842 const void *data, 843 const void *data,
843 size_t size) 844 size_t size)
@@ -1106,7 +1107,7 @@ transmit_search_request (void *cls, size_t size, void *buf)
1106 &dpub); 1107 &dpub);
1107 GNUNET_CRYPTO_hash (&dpub, 1108 GNUNET_CRYPTO_hash (&dpub,
1108 sizeof (dpub), 1109 sizeof (dpub),
1109 &sm->query); 1110 &sm->query);
1110 mbc.put_cnt = (size - msize) / sizeof (struct GNUNET_HashCode); 1111 mbc.put_cnt = (size - msize) / sizeof (struct GNUNET_HashCode);
1111 sqms = GNUNET_CONTAINER_multihashmap_size (sc->master_result_map); 1112 sqms = GNUNET_CONTAINER_multihashmap_size (sc->master_result_map);
1112 mbc.put_cnt = GNUNET_MIN (mbc.put_cnt, sqms - mbc.skip_cnt); 1113 mbc.put_cnt = GNUNET_MIN (mbc.put_cnt, sqms - mbc.skip_cnt);