diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-01-29 21:26:46 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-01-29 21:26:46 +0000 |
commit | 1c8875d69a74ceadbe7eb54a3b35d7d2fcdec907 (patch) | |
tree | ed8d826cefcbd8eb38d21f01701a13af7c3e3e52 /src/fs/gnunet-publish.c | |
parent | 3830988cd738e89f546a0ff4dc4bf6e67bc764dd (diff) | |
download | gnunet-1c8875d69a74ceadbe7eb54a3b35d7d2fcdec907.tar.gz gnunet-1c8875d69a74ceadbe7eb54a3b35d7d2fcdec907.zip |
-fix shutdown issues on error
Diffstat (limited to 'src/fs/gnunet-publish.c')
-rw-r--r-- | src/fs/gnunet-publish.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/fs/gnunet-publish.c b/src/fs/gnunet-publish.c index 9cc55a290..a0fd96829 100644 --- a/src/fs/gnunet-publish.c +++ b/src/fs/gnunet-publish.c | |||
@@ -345,6 +345,9 @@ uri_ksk_continuation (void *cls, const struct GNUNET_FS_Uri *ksk_uri, | |||
345 | } | 345 | } |
346 | 346 | ||
347 | 347 | ||
348 | /** | ||
349 | * FIXME: docu | ||
350 | */ | ||
348 | static struct GNUNET_FS_FileInformation * | 351 | static struct GNUNET_FS_FileInformation * |
349 | get_file_information (struct GNUNET_FS_ShareTreeItem *item) | 352 | get_file_information (struct GNUNET_FS_ShareTreeItem *item) |
350 | { | 353 | { |
@@ -385,6 +388,9 @@ get_file_information (struct GNUNET_FS_ShareTreeItem *item) | |||
385 | } | 388 | } |
386 | 389 | ||
387 | 390 | ||
391 | /** | ||
392 | * FIXME: docu | ||
393 | */ | ||
388 | static void | 394 | static void |
389 | directory_trim_complete () | 395 | directory_trim_complete () |
390 | { | 396 | { |
@@ -481,6 +487,11 @@ directory_scan_cb (void *cls, | |||
481 | if (namespace != NULL) | 487 | if (namespace != NULL) |
482 | GNUNET_FS_namespace_delete (namespace, GNUNET_NO); | 488 | GNUNET_FS_namespace_delete (namespace, GNUNET_NO); |
483 | GNUNET_FS_stop (ctx); | 489 | GNUNET_FS_stop (ctx); |
490 | if (kill_task != GNUNET_SCHEDULER_NO_TASK) | ||
491 | { | ||
492 | GNUNET_SCHEDULER_cancel (kill_task); | ||
493 | kill_task = GNUNET_SCHEDULER_NO_TASK; | ||
494 | } | ||
484 | ret = 1; | 495 | ret = 1; |
485 | break; | 496 | break; |
486 | default: | 497 | default: |