diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-04-26 11:21:16 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-04-26 11:21:16 +0000 |
commit | a24e9fbd68f7381df86b70c8cd866c21e7cb4f28 (patch) | |
tree | 6a15d897483ededb5a1b24f40ff5b3302515a04e /src/fs/fs_download.c | |
parent | adfaa89d363e5b309cc6920ed8465e64250db729 (diff) | |
download | gnunet-a24e9fbd68f7381df86b70c8cd866c21e7cb4f28.tar.gz gnunet-a24e9fbd68f7381df86b70c8cd866c21e7cb4f28.zip |
-fixing persistence cleanup
Diffstat (limited to 'src/fs/fs_download.c')
-rw-r--r-- | src/fs/fs_download.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/fs/fs_download.c b/src/fs/fs_download.c index e93db4cfd..43cd5264b 100644 --- a/src/fs/fs_download.c +++ b/src/fs/fs_download.c | |||
@@ -2229,6 +2229,7 @@ GNUNET_FS_download_stop (struct GNUNET_FS_DownloadContext *dc, int do_delete) | |||
2229 | { | 2229 | { |
2230 | struct GNUNET_FS_ProgressInfo pi; | 2230 | struct GNUNET_FS_ProgressInfo pi; |
2231 | int have_children; | 2231 | int have_children; |
2232 | int search_was_null; | ||
2232 | 2233 | ||
2233 | if (dc->top != NULL) | 2234 | if (dc->top != NULL) |
2234 | GNUNET_FS_end_top (dc->h, dc->top); | 2235 | GNUNET_FS_end_top (dc->h, dc->top); |
@@ -2237,6 +2238,7 @@ GNUNET_FS_download_stop (struct GNUNET_FS_DownloadContext *dc, int do_delete) | |||
2237 | GNUNET_SCHEDULER_cancel (dc->task); | 2238 | GNUNET_SCHEDULER_cancel (dc->task); |
2238 | dc->task = GNUNET_SCHEDULER_NO_TASK; | 2239 | dc->task = GNUNET_SCHEDULER_NO_TASK; |
2239 | } | 2240 | } |
2241 | search_was_null = (dc->search == NULL); | ||
2240 | if (dc->search != NULL) | 2242 | if (dc->search != NULL) |
2241 | { | 2243 | { |
2242 | dc->search->download = NULL; | 2244 | dc->search->download = NULL; |
@@ -2262,14 +2264,12 @@ GNUNET_FS_download_stop (struct GNUNET_FS_DownloadContext *dc, int do_delete) | |||
2262 | if (dc->serialization != NULL) | 2264 | if (dc->serialization != NULL) |
2263 | GNUNET_FS_remove_sync_file_ (dc->h, | 2265 | GNUNET_FS_remove_sync_file_ (dc->h, |
2264 | ((dc->parent != NULL) || | 2266 | ((dc->parent != NULL) || |
2265 | (dc->search != | 2267 | (! search_was_null)) ? GNUNET_FS_SYNC_PATH_CHILD_DOWNLOAD : |
2266 | NULL)) ? GNUNET_FS_SYNC_PATH_CHILD_DOWNLOAD : | ||
2267 | GNUNET_FS_SYNC_PATH_MASTER_DOWNLOAD, | 2268 | GNUNET_FS_SYNC_PATH_MASTER_DOWNLOAD, |
2268 | dc->serialization); | 2269 | dc->serialization); |
2269 | if ((GNUNET_YES == have_children) && (dc->parent == NULL)) | 2270 | if ((GNUNET_YES == have_children) && (dc->parent == NULL)) |
2270 | GNUNET_FS_remove_sync_dir_ (dc->h, | 2271 | GNUNET_FS_remove_sync_dir_ (dc->h, |
2271 | (dc->search != | 2272 | (! search_was_null) ? GNUNET_FS_SYNC_PATH_CHILD_DOWNLOAD : |
2272 | NULL) ? GNUNET_FS_SYNC_PATH_CHILD_DOWNLOAD : | ||
2273 | GNUNET_FS_SYNC_PATH_MASTER_DOWNLOAD, | 2273 | GNUNET_FS_SYNC_PATH_MASTER_DOWNLOAD, |
2274 | dc->serialization); | 2274 | dc->serialization); |
2275 | pi.status = GNUNET_FS_STATUS_DOWNLOAD_STOPPED; | 2275 | pi.status = GNUNET_FS_STATUS_DOWNLOAD_STOPPED; |