diff options
Diffstat (limited to 'src/fs/fs_search.c')
-rw-r--r-- | src/fs/fs_search.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/fs/fs_search.c b/src/fs/fs_search.c index 8e2d7deba..3dbee43ef 100644 --- a/src/fs/fs_search.c +++ b/src/fs/fs_search.c | |||
@@ -830,7 +830,7 @@ process_kblock (struct GNUNET_FS_SearchContext *sc, | |||
830 | &pt[1], | 830 | &pt[1], |
831 | emsg); | 831 | emsg); |
832 | } | 832 | } |
833 | GNUNET_free_non_null (emsg); | 833 | GNUNET_free (emsg); |
834 | return; | 834 | return; |
835 | } | 835 | } |
836 | j = eos - pt + 1; | 836 | j = eos - pt + 1; |
@@ -900,7 +900,7 @@ process_sblock (struct GNUNET_FS_SearchContext *sc, | |||
900 | _ ("Failed to parse URI `%s': %s\n"), | 900 | _ ("Failed to parse URI `%s': %s\n"), |
901 | uris, emsg); | 901 | uris, emsg); |
902 | GNUNET_break_op (0); /* ublock malformed */ | 902 | GNUNET_break_op (0); /* ublock malformed */ |
903 | GNUNET_free_non_null (emsg); | 903 | GNUNET_free (emsg); |
904 | GNUNET_CONTAINER_meta_data_destroy (meta); | 904 | GNUNET_CONTAINER_meta_data_destroy (meta); |
905 | return; | 905 | return; |
906 | } | 906 | } |
@@ -1548,10 +1548,10 @@ search_result_suspend (void *cls, | |||
1548 | sr->client_info = GNUNET_FS_search_make_status_ (&pi, sc->h, sc); | 1548 | sr->client_info = GNUNET_FS_search_make_status_ (&pi, sc->h, sc); |
1549 | } | 1549 | } |
1550 | GNUNET_break (NULL == sr->client_info); | 1550 | GNUNET_break (NULL == sr->client_info); |
1551 | GNUNET_free_non_null (sr->serialization); | 1551 | GNUNET_free (sr->serialization); |
1552 | GNUNET_FS_uri_destroy (sr->uri); | 1552 | GNUNET_FS_uri_destroy (sr->uri); |
1553 | GNUNET_CONTAINER_meta_data_destroy (sr->meta); | 1553 | GNUNET_CONTAINER_meta_data_destroy (sr->meta); |
1554 | GNUNET_free_non_null (sr->keyword_bitmap); | 1554 | GNUNET_free (sr->keyword_bitmap); |
1555 | GNUNET_free (sr); | 1555 | GNUNET_free (sr); |
1556 | return GNUNET_OK; | 1556 | return GNUNET_OK; |
1557 | } | 1557 | } |
@@ -1596,10 +1596,10 @@ GNUNET_FS_search_signal_suspend_ (void *cls) | |||
1596 | GNUNET_free (sc->requests[i].keyword); | 1596 | GNUNET_free (sc->requests[i].keyword); |
1597 | } | 1597 | } |
1598 | } | 1598 | } |
1599 | GNUNET_free_non_null (sc->requests); | 1599 | GNUNET_free (sc->requests); |
1600 | GNUNET_free_non_null (sc->emsg); | 1600 | GNUNET_free (sc->emsg); |
1601 | GNUNET_FS_uri_destroy (sc->uri); | 1601 | GNUNET_FS_uri_destroy (sc->uri); |
1602 | GNUNET_free_non_null (sc->serialization); | 1602 | GNUNET_free (sc->serialization); |
1603 | GNUNET_free (sc); | 1603 | GNUNET_free (sc); |
1604 | } | 1604 | } |
1605 | 1605 | ||
@@ -1760,10 +1760,10 @@ search_result_free (void *cls, | |||
1760 | GNUNET_break (NULL == sr->probe_ctx); | 1760 | GNUNET_break (NULL == sr->probe_ctx); |
1761 | GNUNET_break (NULL == sr->probe_cancel_task); | 1761 | GNUNET_break (NULL == sr->probe_cancel_task); |
1762 | GNUNET_break (NULL == sr->client_info); | 1762 | GNUNET_break (NULL == sr->client_info); |
1763 | GNUNET_free_non_null (sr->serialization); | 1763 | GNUNET_free (sr->serialization); |
1764 | GNUNET_FS_uri_destroy (sr->uri); | 1764 | GNUNET_FS_uri_destroy (sr->uri); |
1765 | GNUNET_CONTAINER_meta_data_destroy (sr->meta); | 1765 | GNUNET_CONTAINER_meta_data_destroy (sr->meta); |
1766 | GNUNET_free_non_null (sr->keyword_bitmap); | 1766 | GNUNET_free (sr->keyword_bitmap); |
1767 | GNUNET_free (sr); | 1767 | GNUNET_free (sr); |
1768 | return GNUNET_OK; | 1768 | return GNUNET_OK; |
1769 | } | 1769 | } |
@@ -1825,8 +1825,8 @@ GNUNET_FS_search_stop (struct GNUNET_FS_SearchContext *sc) | |||
1825 | for (i = 0; i < sc->uri->data.ksk.keywordCount; i++) | 1825 | for (i = 0; i < sc->uri->data.ksk.keywordCount; i++) |
1826 | GNUNET_CONTAINER_multihashmap_destroy (sc->requests[i].results); | 1826 | GNUNET_CONTAINER_multihashmap_destroy (sc->requests[i].results); |
1827 | } | 1827 | } |
1828 | GNUNET_free_non_null (sc->requests); | 1828 | GNUNET_free (sc->requests); |
1829 | GNUNET_free_non_null (sc->emsg); | 1829 | GNUNET_free (sc->emsg); |
1830 | GNUNET_FS_uri_destroy (sc->uri); | 1830 | GNUNET_FS_uri_destroy (sc->uri); |
1831 | GNUNET_free (sc); | 1831 | GNUNET_free (sc); |
1832 | } | 1832 | } |