From 9a0c539ac52e3589061e384587ebeff5a3c7c0bf Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 7 May 2010 06:51:51 +0000 Subject: [PATCH] stuff --- src/fs/fs.c | 9 ++++++++- src/fs/test_fs_search_persistence.c | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/fs/fs.c b/src/fs/fs.c index 593d3d197..a569ce27a 100644 --- a/src/fs/fs.c +++ b/src/fs/fs.c @@ -965,6 +965,13 @@ deserialize_file_information (struct GNUNET_FS_Handle *h, emsg); GNUNET_free (emsg); } + if (ret == NULL) + { + if (0 != UNLINK (filename)) + GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, + "unlink", + filename); + } return ret; } @@ -1486,7 +1493,7 @@ deserialize_publish_file (void *cls, GNUNET_FS_file_information_destroy (pc->fi, NULL, NULL); if (0 != UNLINK (filename)) GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", filename); - GNUNET_free_non_null (pc->serialization); + GNUNET_free (pc->serialization); GNUNET_free (pc); return GNUNET_OK; } diff --git a/src/fs/test_fs_search_persistence.c b/src/fs/test_fs_search_persistence.c index eb25a2082..ebcf10f9a 100644 --- a/src/fs/test_fs_search_persistence.c +++ b/src/fs/test_fs_search_persistence.c @@ -359,6 +359,7 @@ main (int argc, char *argv[]) GNUNET_GETOPT_OPTION_END }; + GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-search/"); GNUNET_log_setup ("test_fs_search_persistence", #if VERBOSE "DEBUG", @@ -367,7 +368,7 @@ main (int argc, char *argv[]) #endif NULL); GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1, - argvx, "test-fs-search-persistencce", + argvx, "test-fs-search-persistence", "nohelp", options, &run, NULL); stop_arm (&p1); GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-search/"); -- 2.25.1