[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r19515 - gnunet/src/fs
From: |
gnunet |
Subject: |
[GNUnet-SVN] r19515 - gnunet/src/fs |
Date: |
Sun, 29 Jan 2012 22:26:46 +0100 |
Author: grothoff
Date: 2012-01-29 22:26:46 +0100 (Sun, 29 Jan 2012)
New Revision: 19515
Modified:
gnunet/src/fs/fs_dirmetascan.c
gnunet/src/fs/gnunet-publish.c
Log:
-fix shutdown issues on error
Modified: gnunet/src/fs/fs_dirmetascan.c
===================================================================
--- gnunet/src/fs/fs_dirmetascan.c 2012-01-29 21:24:56 UTC (rev 19514)
+++ gnunet/src/fs/fs_dirmetascan.c 2012-01-29 21:26:46 UTC (rev 19515)
@@ -100,7 +100,7 @@
/* free resources */
if (NULL != ds->toplevel)
GNUNET_FS_share_tree_free (ds->toplevel);
- GNUNET_free (ds->ex_arg);
+ GNUNET_free_non_null (ds->ex_arg);
GNUNET_free (ds->filename_expanded);
GNUNET_free (ds);
}
@@ -300,6 +300,10 @@
if (0 != strcmp (filename,
ds->pos->filename))
{
+ fprintf (stderr,
+ "Expected `%s', got `%s'\n",
+ ds->pos->filename,
+ filename);
GNUNET_break (0);
break;
}
Modified: gnunet/src/fs/gnunet-publish.c
===================================================================
--- gnunet/src/fs/gnunet-publish.c 2012-01-29 21:24:56 UTC (rev 19514)
+++ gnunet/src/fs/gnunet-publish.c 2012-01-29 21:26:46 UTC (rev 19515)
@@ -345,6 +345,9 @@
}
+/**
+ * FIXME: docu
+ */
static struct GNUNET_FS_FileInformation *
get_file_information (struct GNUNET_FS_ShareTreeItem *item)
{
@@ -385,6 +388,9 @@
}
+/**
+ * FIXME: docu
+ */
static void
directory_trim_complete ()
{
@@ -481,6 +487,11 @@
if (namespace != NULL)
GNUNET_FS_namespace_delete (namespace, GNUNET_NO);
GNUNET_FS_stop (ctx);
+ if (kill_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (kill_task);
+ kill_task = GNUNET_SCHEDULER_NO_TASK;
+ }
ret = 1;
break;
default:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r19515 - gnunet/src/fs,
gnunet <=