[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r21166 - gnunet/src/fs
From: |
gnunet |
Subject: |
[GNUnet-SVN] r21166 - gnunet/src/fs |
Date: |
Thu, 26 Apr 2012 13:21:16 +0200 |
Author: grothoff
Date: 2012-04-26 13:21:16 +0200 (Thu, 26 Apr 2012)
New Revision: 21166
Modified:
gnunet/src/fs/fs_api.c
gnunet/src/fs/fs_download.c
Log:
-fixing persistence cleanup
Modified: gnunet/src/fs/fs_api.c
===================================================================
--- gnunet/src/fs/fs_api.c 2012-04-26 11:07:28 UTC (rev 21165)
+++ gnunet/src/fs/fs_api.c 2012-04-26 11:21:16 UTC (rev 21166)
@@ -1707,9 +1707,8 @@
if (dc->parent == NULL)
return get_serialization_file_name (dc->h,
- (dc->search !=
- NULL) ?
- GNUNET_FS_SYNC_PATH_CHILD_DOWNLOAD :
+ (dc->search != NULL) ?
+ GNUNET_FS_SYNC_PATH_CHILD_DOWNLOAD :
GNUNET_FS_SYNC_PATH_MASTER_DOWNLOAD,
uni);
if (dc->parent->serialization == NULL)
Modified: gnunet/src/fs/fs_download.c
===================================================================
--- gnunet/src/fs/fs_download.c 2012-04-26 11:07:28 UTC (rev 21165)
+++ gnunet/src/fs/fs_download.c 2012-04-26 11:21:16 UTC (rev 21166)
@@ -2229,6 +2229,7 @@
{
struct GNUNET_FS_ProgressInfo pi;
int have_children;
+ int search_was_null;
if (dc->top != NULL)
GNUNET_FS_end_top (dc->h, dc->top);
@@ -2237,6 +2238,7 @@
GNUNET_SCHEDULER_cancel (dc->task);
dc->task = GNUNET_SCHEDULER_NO_TASK;
}
+ search_was_null = (dc->search == NULL);
if (dc->search != NULL)
{
dc->search->download = NULL;
@@ -2262,14 +2264,12 @@
if (dc->serialization != NULL)
GNUNET_FS_remove_sync_file_ (dc->h,
((dc->parent != NULL) ||
- (dc->search !=
- NULL)) ? GNUNET_FS_SYNC_PATH_CHILD_DOWNLOAD
:
+ (! search_was_null)) ?
GNUNET_FS_SYNC_PATH_CHILD_DOWNLOAD :
GNUNET_FS_SYNC_PATH_MASTER_DOWNLOAD,
dc->serialization);
if ((GNUNET_YES == have_children) && (dc->parent == NULL))
GNUNET_FS_remove_sync_dir_ (dc->h,
- (dc->search !=
- NULL) ? GNUNET_FS_SYNC_PATH_CHILD_DOWNLOAD :
+ (! search_was_null) ?
GNUNET_FS_SYNC_PATH_CHILD_DOWNLOAD :
GNUNET_FS_SYNC_PATH_MASTER_DOWNLOAD,
dc->serialization);
pi.status = GNUNET_FS_STATUS_DOWNLOAD_STOPPED;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r21166 - gnunet/src/fs,
gnunet <=