-monkey integration

[oweals/gnunet.git] / src / fs / gnunet-publish.c

diff --git a/src/fs/gnunet-publish.c b/src/fs/gnunet-publish.c
index 39235683c6631be5136b41f85a0bc5745994cea0..f960503c25acc762ce983f646270a0815c3c599a 100644 (file)
--- a/src/fs/gnunet-publish.c
+++ b/src/fs/gnunet-publish.c
@@ -669,6 +669,7 @@ identity_continuation (const char *args0)
             _("Failed to access `%s': %s\n"),
             args0,
             STRERROR (errno));
+    GNUNET_free_non_null (ex);
     return;
   }
   ds = GNUNET_FS_directory_scan_start (args0,
@@ -679,8 +680,10 @@ identity_continuation (const char *args0)
   {
     FPRINTF (stderr,
             "%s", _("Failed to start meta directory scanner.  Is gnunet-helper-publish-fs installed?\n"));
+    GNUNET_free_non_null (ex);
     return;
   }
+  GNUNET_free_non_null (ex);
 }
 
 
@@ -689,7 +692,7 @@ identity_continuation (const char *args0)
  *
  * @param cls closure with 'const char *' of filename to publish
  * @param ego ego handle
- * @param ego_ctx context for application to store data for this ego
+ * @param ctx context for application to store data for this ego
  *                 (during the lifetime of this process, initially NULL)
  * @param name name assigned by the user for this ego,
  *                   NULL if the user just deleted the ego and it
@@ -863,7 +866,7 @@ main (int argc, char *const *argv)
     GNUNET_GETOPT_OPTION_END
   };
   bo.expiration_time =
-      GNUNET_FS_year_to_time (GNUNET_FS_get_current_year () + 2);
+      GNUNET_TIME_year_to_time (GNUNET_TIME_get_current_year () + 2);
 
   if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
     return 2;