diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-05-06 06:57:16 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-05-06 06:57:16 +0000 |
commit | 6ebc869359633883f576a9f23e6ddf6b698eec14 (patch) | |
tree | 36cd33df16fcb9535c5293eb1ca927ea3b19b2b1 /src/fs/fs_search.c | |
parent | 4ca6db55581c3ae234743cd5953da49c86ab144d (diff) | |
download | gnunet-6ebc869359633883f576a9f23e6ddf6b698eec14.tar.gz gnunet-6ebc869359633883f576a9f23e6ddf6b698eec14.zip |
init top on deserialization
Diffstat (limited to 'src/fs/fs_search.c')
-rw-r--r-- | src/fs/fs_search.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/fs/fs_search.c b/src/fs/fs_search.c index 9f62e04b1..171eebf4b 100644 --- a/src/fs/fs_search.c +++ b/src/fs/fs_search.c | |||
@@ -1233,16 +1233,6 @@ search_result_resume_probes (void *cls, | |||
1233 | 1233 | ||
1234 | 1234 | ||
1235 | /** | 1235 | /** |
1236 | * Create SUSPEND event for the given search operation | ||
1237 | * and then clean up our state (without stop signal). | ||
1238 | * | ||
1239 | * @param cls the 'struct GNUNET_FS_SearchContext' to signal for | ||
1240 | */ | ||
1241 | static void | ||
1242 | search_signal_suspend (void *cls); | ||
1243 | |||
1244 | |||
1245 | /** | ||
1246 | * Signal suspend and free the given search result. | 1236 | * Signal suspend and free the given search result. |
1247 | * | 1237 | * |
1248 | * @param cls the global FS handle | 1238 | * @param cls the global FS handle |
@@ -1263,7 +1253,7 @@ search_result_suspend (void *cls, | |||
1263 | if (sr->download != NULL) | 1253 | if (sr->download != NULL) |
1264 | GNUNET_FS_download_signal_suspend_ (sr->download); | 1254 | GNUNET_FS_download_signal_suspend_ (sr->download); |
1265 | if (sr->update_search != NULL) | 1255 | if (sr->update_search != NULL) |
1266 | search_signal_suspend (sr->update_search); | 1256 | GNUNET_FS_search_signal_suspend_ (sr->update_search); |
1267 | pi.status = GNUNET_FS_STATUS_SEARCH_RESULT_SUSPEND; | 1257 | pi.status = GNUNET_FS_STATUS_SEARCH_RESULT_SUSPEND; |
1268 | pi.value.search.specifics.result_suspend.cctx = sr->client_info; | 1258 | pi.value.search.specifics.result_suspend.cctx = sr->client_info; |
1269 | pi.value.search.specifics.result_suspend.meta = sr->meta; | 1259 | pi.value.search.specifics.result_suspend.meta = sr->meta; |
@@ -1289,8 +1279,8 @@ search_result_suspend (void *cls, | |||
1289 | * | 1279 | * |
1290 | * @param cls the 'struct GNUNET_FS_SearchContext' to signal for | 1280 | * @param cls the 'struct GNUNET_FS_SearchContext' to signal for |
1291 | */ | 1281 | */ |
1292 | static void | 1282 | void |
1293 | search_signal_suspend (void *cls) | 1283 | GNUNET_FS_search_signal_suspend_ (void *cls) |
1294 | { | 1284 | { |
1295 | struct GNUNET_FS_SearchContext *sc = cls; | 1285 | struct GNUNET_FS_SearchContext *sc = cls; |
1296 | struct GNUNET_FS_ProgressInfo pi; | 1286 | struct GNUNET_FS_ProgressInfo pi; |
@@ -1342,7 +1332,7 @@ GNUNET_FS_search_start (struct GNUNET_FS_Handle *h, | |||
1342 | { | 1332 | { |
1343 | struct GNUNET_FS_SearchContext *ret; | 1333 | struct GNUNET_FS_SearchContext *ret; |
1344 | ret = search_start (h, uri, anonymity, options, cctx, NULL); | 1334 | ret = search_start (h, uri, anonymity, options, cctx, NULL); |
1345 | ret->top = GNUNET_FS_make_top (h, &search_signal_suspend, ret); | 1335 | ret->top = GNUNET_FS_make_top (h, &GNUNET_FS_search_signal_suspend_, ret); |
1346 | return ret; | 1336 | return ret; |
1347 | } | 1337 | } |
1348 | 1338 | ||