1 files changed, 10 insertions, 10 deletions

diff --git a/src/fs/gnunet-auto-share.c b/src/fs/gnunet-auto-share.c
index 3aed0268b..f91e9d00d 100644
--- a/src/fs/gnunet-auto-share.c
+++ b/src/fs/gnunet-auto-share.c
@@ -201,9 +201,9 @@ load_state ()
   while (n-- > 0)
   {
     struct GNUNET_BIO_ReadSpec rs[] = {
-      GNUNET_BIO_read_spec_string("filename", &fn, 1024),
-      GNUNET_BIO_read_spec_object("id", &id, sizeof(struct GNUNET_HashCode)),
-      GNUNET_BIO_read_spec_end(),
+      GNUNET_BIO_read_spec_string ("filename", &fn, 1024),
+      GNUNET_BIO_read_spec_object ("id", &id, sizeof(struct GNUNET_HashCode)),
+      GNUNET_BIO_read_spec_end (),
     };
     if (GNUNET_OK != GNUNET_BIO_read_spec_commit (rh, rs))
       goto error;
@@ -227,13 +227,13 @@ load_state ()
     return;
   rh = NULL;
 error:
-  GNUNET_free_non_null (fn);
+  GNUNET_free (fn);
   if (NULL != rh)
     (void) GNUNET_BIO_read_close (rh, &emsg);
   GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
               _ ("Failed to load state: %s\n"),
               emsg);
-  GNUNET_free_non_null (emsg);
+  GNUNET_free (emsg);
 }
 
 
@@ -258,7 +258,8 @@ write_item (void *cls, const struct GNUNET_HashCode *key, void *value)
   struct GNUNET_BIO_WriteSpec ws[] = {
     GNUNET_BIO_write_spec_string ("auto-share-write-item-filename",
                                   wi->filename),
-    GNUNET_BIO_write_spec_object ("id", &wi->id, sizeof(struct GNUNET_HashCode)),
+    GNUNET_BIO_write_spec_object ("id", &wi->id, sizeof(struct
+                                                        GNUNET_HashCode)),
     GNUNET_BIO_write_spec_end (),
   };
   if (GNUNET_OK != GNUNET_BIO_write_spec_commit (wh, ws))
@@ -478,8 +479,7 @@ work (void *cls)
   argv[argc] = NULL;
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, _ ("Publishing `%s'\n"), wi->filename);
   GNUNET_assert (NULL == publish_proc);
-  publish_proc = GNUNET_OS_start_process_vap (GNUNET_YES,
-                                              0,
+  publish_proc = GNUNET_OS_start_process_vap (GNUNET_OS_USE_PIPE_CONTROL,
                                               NULL,
                                               NULL,
                                               NULL,
@@ -748,7 +748,7 @@ main (int argc, char *const *argv)
 
   if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
     return 2;
-  sigpipe = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, GNUNET_NO, GNUNET_NO);
+  sigpipe = GNUNET_DISK_pipe (GNUNET_DISK_PF_NONE);
   GNUNET_assert (NULL != sigpipe);
   shc_chld =
     GNUNET_SIGNAL_handler_install (GNUNET_SIGCHLD, &sighandler_child_death);
@@ -781,7 +781,7 @@ main (int argc, char *const *argv)
   shc_chld = NULL;
   GNUNET_DISK_pipe_close (sigpipe);
   sigpipe = NULL;
-  GNUNET_free_non_null (cfg_filename);
+  GNUNET_free (cfg_filename);
   cfg_filename = NULL;
   GNUNET_free_nz ((void *) argv);
   return ok;