diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-07-12 20:29:25 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-07-12 20:29:25 +0000 |
commit | d1248e6a3d5603b4176dd67d7af720ac5d459126 (patch) | |
tree | 9e1f5f5fdf379c76d308e7ed91292a9b4d92fc7d /src/fs/fs_api.c | |
parent | a0c135cba1d033ea9cb04a6aa3ec269d82769fc2 (diff) | |
download | gnunet-d1248e6a3d5603b4176dd67d7af720ac5d459126.tar.gz gnunet-d1248e6a3d5603b4176dd67d7af720ac5d459126.zip |
fix #3446
Diffstat (limited to 'src/fs/fs_api.c')
-rw-r--r-- | src/fs/fs_api.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/fs/fs_api.c b/src/fs/fs_api.c index ab04b86b7..29fc0cdd7 100644 --- a/src/fs/fs_api.c +++ b/src/fs/fs_api.c | |||
@@ -2882,8 +2882,9 @@ deserialize_search (struct GNUNET_FS_Handle *h, | |||
2882 | } | 2882 | } |
2883 | sc->h = h; | 2883 | sc->h = h; |
2884 | sc->serialization = GNUNET_strdup (serialization); | 2884 | sc->serialization = GNUNET_strdup (serialization); |
2885 | if ((GNUNET_OK != GNUNET_BIO_read_string (rh, "search-uri", &uris, 10 * 1024)) | 2885 | if ((GNUNET_OK != |
2886 | || (NULL == (sc->uri = GNUNET_FS_uri_parse (uris, &emsg))) || | 2886 | GNUNET_BIO_read_string (rh, "search-uri", &uris, 10 * 1024)) || |
2887 | (NULL == (sc->uri = GNUNET_FS_uri_parse (uris, &emsg))) || | ||
2887 | ((GNUNET_YES != GNUNET_FS_uri_test_ksk (sc->uri)) && | 2888 | ((GNUNET_YES != GNUNET_FS_uri_test_ksk (sc->uri)) && |
2888 | (GNUNET_YES != GNUNET_FS_uri_test_sks (sc->uri))) || | 2889 | (GNUNET_YES != GNUNET_FS_uri_test_sks (sc->uri))) || |
2889 | (GNUNET_OK != read_start_time (rh, &sc->start_time)) || | 2890 | (GNUNET_OK != read_start_time (rh, &sc->start_time)) || |
@@ -2900,8 +2901,7 @@ deserialize_search (struct GNUNET_FS_Handle *h, | |||
2900 | sc->options = (enum GNUNET_FS_SearchOptions) options; | 2901 | sc->options = (enum GNUNET_FS_SearchOptions) options; |
2901 | sc->master_result_map = GNUNET_CONTAINER_multihashmap_create (16, GNUNET_NO); | 2902 | sc->master_result_map = GNUNET_CONTAINER_multihashmap_create (16, GNUNET_NO); |
2902 | dn = get_serialization_file_name_in_dir (h, | 2903 | dn = get_serialization_file_name_in_dir (h, |
2903 | (sc->psearch_result == | 2904 | (NULL == sc->psearch_result) ? |
2904 | NULL) ? | ||
2905 | GNUNET_FS_SYNC_PATH_MASTER_SEARCH : | 2905 | GNUNET_FS_SYNC_PATH_MASTER_SEARCH : |
2906 | GNUNET_FS_SYNC_PATH_CHILD_SEARCH, | 2906 | GNUNET_FS_SYNC_PATH_CHILD_SEARCH, |
2907 | sc->serialization, ""); | 2907 | sc->serialization, ""); |