[GNUnet-SVN] r11244 - gnunet/src/fs

[gnunet]

Author: grothoff
Date: 2010-05-07 08:51:51 +0200 (Fri, 07 May 2010)
New Revision: 11244

Modified:
   gnunet/src/fs/fs.c
   gnunet/src/fs/test_fs_search_persistence.c
Log:
stuff

Modified: gnunet/src/fs/fs.c
===================================================================
--- gnunet/src/fs/fs.c  2010-05-06 21:19:24 UTC (rev 11243)
+++ gnunet/src/fs/fs.c  2010-05-07 06:51:51 UTC (rev 11244)
@@ -965,6 +965,13 @@
                  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 @@
     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;
 }

Modified: gnunet/src/fs/test_fs_search_persistence.c
===================================================================
--- gnunet/src/fs/test_fs_search_persistence.c  2010-05-06 21:19:24 UTC (rev 
11243)
+++ gnunet/src/fs/test_fs_search_persistence.c  2010-05-07 06:51:51 UTC (rev 
11244)
@@ -359,6 +359,7 @@
     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 @@
 #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/");