45 files changed, 258 insertions, 244 deletions
diff --git a/src/util/bio.c b/src/util/bio.c
index ce15f073b..39050bb87 100644
--- a/src/util/bio.c
+++ b/src/util/bio.c
@@ -171,7 +171,7 @@ GNUNET_BIO_read_close (struct GNUNET_BIO_ReadHandle *h, char **emsg)
  if (NULL != emsg)
    *emsg = h->emsg;
  else
-    GNUNET_free_non_null (h->emsg);
+    GNUNET_free (h->emsg);
  switch (h->type)
  {
  case IO_FILE:
@@ -260,7 +260,7 @@ read_from_buffer (struct GNUNET_BIO_ReadHandle *h,
                  char *result,
                  size_t len)
 {
-  if (h->size < len || h->size - h->pos < len)
+  if ((h->size < len) || (h->size - h->pos < len))
  {
    GNUNET_asprintf (&h->emsg,
                     _ ("Error while reading `%s' from buffer: %s"),
@@ -345,7 +345,7 @@ GNUNET_BIO_read_string (struct GNUNET_BIO_ReadHandle *h,
      GNUNET_asprintf (&h->emsg,
                       _ ("Error reading length of string `%s'"),
                       what);
-    GNUNET_free_non_null (tmp);
+    GNUNET_free (tmp);
    return GNUNET_SYSERR;
  }
  if (0 == big)
@@ -431,6 +431,7 @@ GNUNET_BIO_read_meta_data (struct GNUNET_BIO_ReadHandle *h,
  return GNUNET_OK;
 }
 /**
 * Read a float.
 *
@@ -439,9 +440,9 @@ GNUNET_BIO_read_meta_data (struct GNUNET_BIO_ReadHandle *h,
 * @param f address of float to read
 */
 int
-GNUNET_BIO_read_float(struct GNUNET_BIO_ReadHandle *h,
+GNUNET_BIO_read_float (struct GNUNET_BIO_ReadHandle *h,
-                      const char *what,
+                       const char *what,
-                      float *f)
+                       float *f)
 {
  int32_t *i = (int32_t *) f;
  return GNUNET_BIO_read_int32 (h, what, i);
@@ -456,9 +457,9 @@ GNUNET_BIO_read_float(struct GNUNET_BIO_ReadHandle *h,
 * @param f address of double to read
 */
 int
-GNUNET_BIO_read_double(struct GNUNET_BIO_ReadHandle *h,
+GNUNET_BIO_read_double (struct GNUNET_BIO_ReadHandle *h,
-                       const char *what,
+                        const char *what,
-                       double *f)
+                        double *f)
 {
  int64_t *i = (int64_t *) f;
  return GNUNET_BIO_read_int64 (h, what, i);
@@ -612,7 +613,7 @@ GNUNET_BIO_write_close (struct GNUNET_BIO_WriteHandle *h, char **emsg)
  if (NULL != emsg)
    *emsg = h->emsg;
  else
-    GNUNET_free_non_null (h->emsg);
+    GNUNET_free (h->emsg);
  switch (h->type)
  {
  case IO_FILE:
@@ -623,7 +624,7 @@ GNUNET_BIO_write_close (struct GNUNET_BIO_WriteHandle *h, char **emsg)
      if (NULL != emsg)
        *emsg = h->emsg;
      else
-        GNUNET_free_non_null (h->emsg);
+        GNUNET_free (h->emsg);
      err = GNUNET_SYSERR;
    }
    else
@@ -663,7 +664,7 @@ GNUNET_BIO_flush (struct GNUNET_BIO_WriteHandle *h)
  {
    GNUNET_DISK_file_close (h->fd);
    h->fd = NULL;
-    GNUNET_free_non_null (h->emsg);
+    GNUNET_free (h->emsg);
    GNUNET_asprintf (&h->emsg, _ ("Unable to flush buffer to file"));
    return GNUNET_SYSERR;
  }
@@ -692,13 +693,13 @@ GNUNET_BIO_get_buffer_contents (struct GNUNET_BIO_WriteHandle *h,
 {
  if (IO_BUFFER != h->type)
    return GNUNET_SYSERR;
-  if (NULL == contents || NULL == size)
+  if ((NULL == contents) || (NULL == size))
    return GNUNET_SYSERR;
  int ret = (NULL != h->emsg) ? GNUNET_SYSERR : GNUNET_OK;
  if (NULL != emsg)
    *emsg = h->emsg;
  else
-    GNUNET_free_non_null (h->emsg);
+    GNUNET_free (h->emsg);
  *contents = GNUNET_buffer_reap ((struct GNUNET_Buffer *) h->buffer, size);
  return ret;
 }
@@ -750,7 +751,7 @@ write_to_file (struct GNUNET_BIO_WriteHandle *h,
                       _ ("Error while writing `%s' to file: %s"),
                       what,
                       tmp);
-      GNUNET_free_non_null (tmp);
+      GNUNET_free (tmp);
      return GNUNET_SYSERR;
    }
  }
@@ -870,7 +871,7 @@ GNUNET_BIO_write_meta_data (struct GNUNET_BIO_WriteHandle *h,
  if (-1 == size)
  {
    GNUNET_free (buf);
-    GNUNET_free_non_null (h->emsg);
+    GNUNET_free (h->emsg);
    GNUNET_asprintf (&h->emsg,
                     _ ("Failed to serialize metadata `%s'"),
                     what);
@@ -897,9 +898,9 @@ GNUNET_BIO_write_meta_data (struct GNUNET_BIO_WriteHandle *h,
 * @param f float to write
 */
 int
-GNUNET_BIO_write_float(struct GNUNET_BIO_WriteHandle *h,
+GNUNET_BIO_write_float (struct GNUNET_BIO_WriteHandle *h,
-                       const char *what,
+                        const char *what,
-                       float f)
+                        float f)
 {
  int32_t i = f;
  return GNUNET_BIO_write_int32 (h, what, i);
@@ -914,9 +915,9 @@ GNUNET_BIO_write_float(struct GNUNET_BIO_WriteHandle *h,
 * @param f double to write
 */
 int
-GNUNET_BIO_write_double(struct GNUNET_BIO_WriteHandle *h,
+GNUNET_BIO_write_double (struct GNUNET_BIO_WriteHandle *h,
-                        const char *what,
+                         const char *what,
-                        double f)
+                         double f)
 {
  int64_t i = f;
  return GNUNET_BIO_write_int64 (h, what, i);
@@ -1196,7 +1197,7 @@ GNUNET_BIO_read_spec_int64 (const char *what,
 * @param f address of float to read
 */
 struct GNUNET_BIO_ReadSpec
-GNUNET_BIO_read_spec_float(const char *what, float *f)
+GNUNET_BIO_read_spec_float (const char *what, float *f)
 {
  struct GNUNET_BIO_ReadSpec rs = {
    .rh = &read_spec_handler_int32,
@@ -1216,7 +1217,7 @@ GNUNET_BIO_read_spec_float(const char *what, float *f)
 * @param f address of double to read
 */
 struct GNUNET_BIO_ReadSpec
-GNUNET_BIO_read_spec_double(const char *what, double *f)
+GNUNET_BIO_read_spec_double (const char *what, double *f)
 {
  struct GNUNET_BIO_ReadSpec rs = {
    .rh = &read_spec_handler_int64,
@@ -1243,7 +1244,7 @@ GNUNET_BIO_read_spec_commit (struct GNUNET_BIO_ReadHandle *h,
 {
  int ret = GNUNET_OK;
-  for (size_t i=0; NULL!=rs[i].rh; ++i)
+  for (size_t i = 0; NULL!=rs[i].rh; ++i)
  {
    ret = rs[i].rh (rs[i].cls, h, rs[i].what, rs[i].target, rs[i].size);
    if (GNUNET_OK != ret)
@@ -1490,7 +1491,7 @@ GNUNET_BIO_write_spec_int64 (const char *what,
 * @return the write spec
 */
 struct GNUNET_BIO_WriteSpec
-GNUNET_BIO_write_spec_float(const char *what, float *f)
+GNUNET_BIO_write_spec_float (const char *what, float *f)
 {
  struct GNUNET_BIO_WriteSpec ws = {
    .wh = &write_spec_handler_int32,
@@ -1512,7 +1513,7 @@ GNUNET_BIO_write_spec_float(const char *what, float *f)
 * @return the write spec
 */
 struct GNUNET_BIO_WriteSpec
-GNUNET_BIO_write_spec_double(const char *what, double *f)
+GNUNET_BIO_write_spec_double (const char *what, double *f)
 {
  struct GNUNET_BIO_WriteSpec ws = {
    .wh = &write_spec_handler_int64,
@@ -1540,7 +1541,7 @@ GNUNET_BIO_write_spec_commit (struct GNUNET_BIO_WriteHandle *h,
 {
  int ret = GNUNET_OK;
-  for (size_t i=0; NULL!=ws[i].wh; ++i)
+  for (size_t i = 0; NULL!=ws[i].wh; ++i)
  {
    ret = ws[i].wh (ws[i].cls, h, ws[i].what, ws[i].source, ws[i].source_size);
    if (GNUNET_OK != ret)
diff --git a/src/util/buffer.c b/src/util/buffer.c
index c865f6307..d0261889e 100644
--- a/src/util/buffer.c
+++ b/src/util/buffer.c
@@ -162,7 +162,7 @@ GNUNET_buffer_reap (struct GNUNET_Buffer *buf, size_t *size)
 void
 GNUNET_buffer_clear (struct GNUNET_Buffer *buf)
 {
-  GNUNET_free_non_null (buf->mem);
+  GNUNET_free (buf->mem);
  memset (buf, 0, sizeof (struct GNUNET_Buffer));
 }
diff --git a/src/util/client.c b/src/util/client.c
index a7b1a2a0f..86dabe664 100644
--- a/src/util/client.c
+++ b/src/util/client.c
@@ -422,7 +422,7 @@ connection_client_destroy_impl (struct GNUNET_MQ_Handle *mq,
  }
  cancel_aps (cstate);
  GNUNET_free (cstate->service_name);
-  GNUNET_free_non_null (cstate->hostname);
+  GNUNET_free (cstate->hostname);
  GNUNET_MST_destroy (cstate->mst);
  GNUNET_free (cstate);
 }
@@ -563,7 +563,7 @@ try_unixpath (const char *service_name,
    if (NULL != sock)
      GNUNET_NETWORK_socket_close (sock);
  }
-  GNUNET_free_non_null (unixpath);
+  GNUNET_free (unixpath);
 #endif
  return NULL;
 }
@@ -747,7 +747,7 @@ test_service_configuration (const char *service_name,
                               _ ("not a valid filename"));
    return GNUNET_SYSERR;   /* UNIXPATH specified but invalid! */
  }
-  GNUNET_free_non_null (unixpath);
+  GNUNET_free (unixpath);
 #endif
  if ((GNUNET_YES ==
@@ -768,7 +768,7 @@ test_service_configuration (const char *service_name,
                                              &hostname)) &&
      (0 != strlen (hostname)))
    ret = GNUNET_OK;
-  GNUNET_free_non_null (hostname);
+  GNUNET_free (hostname);
  return ret;
 }
@@ -1043,7 +1043,7 @@ GNUNET_CLIENT_test (const struct GNUNET_CONFIGURATION_Handle *cfg,
    /* service running remotely */
    ret = GNUNET_OK;
  }
-  GNUNET_free_non_null (hostname);
+  GNUNET_free (hostname);
  return ret;
 }
diff --git a/src/util/common_allocation.c b/src/util/common_allocation.c
index fd91e23b2..4aad49777 100644
--- a/src/util/common_allocation.c
+++ b/src/util/common_allocation.c
@@ -323,13 +323,12 @@ GNUNET_xrealloc_ (void *ptr, size_t n, const char *filename, int linenumber)
 * want to keep track of allocations.
 *
 * @param ptr the pointer to free
- * @param filename where in the code was the call to GNUNET_free
+ * @param filename where in the code was the call to GNUNET_free()
- * @param linenumber where in the code was the call to GNUNET_free
+ * @param linenumber where in the code was the call to GNUNET_free()
 */
 void
 GNUNET_xfree_ (void *ptr, const char *filename, int linenumber)
 {
-  GNUNET_assert_at (NULL != ptr, filename, linenumber);
 #ifdef W32_MEM_LIMIT
  ptr = &((size_t *) ptr)[-1];
  mem_used -= *((size_t *) ptr);
diff --git a/src/util/common_logging.c b/src/util/common_logging.c
index 3894cdda1..b30175543 100644
--- a/src/util/common_logging.c
+++ b/src/util/common_logging.c
@@ -715,9 +715,9 @@ GNUNET_log_setup (const char *comp,
 #if ! defined(GNUNET_CULL_LOGGING)
  parse_all_definitions ();
 #endif
-  GNUNET_free_non_null (component);
+  GNUNET_free (component);
  GNUNET_asprintf (&component, "%s-%d", comp, getpid ());
-  GNUNET_free_non_null (component_nopid);
+  GNUNET_free (component_nopid);
  component_nopid = GNUNET_strdup (comp);
  env_logfile = getenv ("GNUNET_FORCE_LOGFILE");
@@ -725,7 +725,7 @@ GNUNET_log_setup (const char *comp,
    logfile = env_logfile;
  if (NULL == logfile)
    return GNUNET_OK;
-  GNUNET_free_non_null (log_file_name);
+  GNUNET_free (log_file_name);
  log_file_name = GNUNET_STRINGS_filename_expand (logfile);
  if (NULL == log_file_name)
    return GNUNET_SYSERR;
diff --git a/src/util/configuration.c b/src/util/configuration.c
index 7ed87cc1e..26beacaff 100644
--- a/src/util/configuration.c
+++ b/src/util/configuration.c
@@ -286,7 +286,7 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
  line_orig = NULL;
  while (r_bytes < size)
  {
-    GNUNET_free_non_null (line_orig);
+    GNUNET_free (line_orig);
    /* fgets-like behaviour on buffer */
    to_read = size - r_bytes;
    pos = memchr (&mem[r_bytes], '\n', to_read);
@@ -404,7 +404,7 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
    ret = GNUNET_SYSERR;
    break;
  }
-  GNUNET_free_non_null (line_orig);
+  GNUNET_free (line_orig);
  GNUNET_free (section);
  GNUNET_assert ((GNUNET_OK != ret) || (r_bytes == size));
  return ret;
@@ -734,7 +734,7 @@ GNUNET_CONFIGURATION_remove_section (struct GNUNET_CONFIGURATION_Handle *cfg,
      {
        spos->entries = ent->next;
        GNUNET_free (ent->key);
-        GNUNET_free_non_null (ent->val);
+        GNUNET_free (ent->val);
        GNUNET_free (ent);
        cfg->dirty = GNUNET_YES;
      }
@@ -926,13 +926,13 @@ GNUNET_CONFIGURATION_set_value_string (struct GNUNET_CONFIGURATION_Handle *cfg,
  {
    if (NULL == value)
    {
-      GNUNET_free_non_null (e->val);
+      GNUNET_free (e->val);
      e->val = NULL;
    }
    else
    {
      nv = GNUNET_strdup (value);
-      GNUNET_free_non_null (e->val);
+      GNUNET_free (e->val);
      e->val = nv;
    }
    return;
@@ -1383,7 +1383,7 @@ expand_dollar (const struct GNUNET_CONFIGURATION_Handle *cfg,
  result = GNUNET_malloc (strlen (prefix) + strlen (post) + 1);
  strcpy (result, prefix);
  strcat (result, post);
-  GNUNET_free_non_null (def);
+  GNUNET_free (def);
  GNUNET_free (prefix);
  GNUNET_free (orig);
  return result;
@@ -1810,4 +1810,45 @@ GNUNET_CONFIGURATION_load_from (struct GNUNET_CONFIGURATION_Handle *cfg,
 }
+/**
+ * Return GNUnet's default configuration.  A new configuration is allocated
+ * each time and it's up to the caller to destroy it when done.  This function
+ * returns GNUnet's configuration even when #GNUNET_OS_init has been called
+ * with a value different from #GNUNET_OS_project_data_default.
+ *
+ * @return a freshly allocated configuration
+ */
+struct GNUNET_CONFIGURATION_Handle *
+GNUNET_CONFIGURATION_default (void)
+{
+  const struct GNUNET_OS_ProjectData *pd = GNUNET_OS_project_data_get ();
+  const struct GNUNET_OS_ProjectData *dpd = GNUNET_OS_project_data_default ();
+  GNUNET_OS_init (dpd);
+  struct GNUNET_CONFIGURATION_Handle *cfg = GNUNET_CONFIGURATION_create ();
+  const char *xdg = getenv ("XDG_CONFIG_HOME");
+  char *cfgname = NULL;
+  if (NULL != xdg)
+    GNUNET_asprintf (&cfgname, "%s/%s", xdg, pd->config_file);
+  else
+    cfgname = GNUNET_strdup (pd->user_config_file);
+  if (GNUNET_OK != GNUNET_CONFIGURATION_load (cfg, cfgname))
+  {
+    GNUNET_OS_init (pd);
+    GNUNET_CONFIGURATION_destroy (cfg);
+    GNUNET_free (cfgname);
+    return NULL;
+  }
+  GNUNET_free (cfgname);
+  GNUNET_OS_init (pd);
+  return cfg;
+}
 /* end of configuration.c */
diff --git a/src/util/container_bloomfilter.c b/src/util/container_bloomfilter.c
index eca651862..d7460043d 100644
--- a/src/util/container_bloomfilter.c
+++ b/src/util/container_bloomfilter.c
@@ -707,7 +707,7 @@ GNUNET_CONTAINER_bloomfilter_free (struct GNUNET_CONTAINER_BloomFilter *bf)
    return;
  if (bf->fh != NULL)
    GNUNET_DISK_file_close (bf->fh);
-  GNUNET_free_non_null (bf->filename);
+  GNUNET_free (bf->filename);
  GNUNET_free (bf->bitArray);
  GNUNET_free (bf);
 }
diff --git a/src/util/container_meta_data.c b/src/util/container_meta_data.c
index ad362408e..b66a7b258 100644
--- a/src/util/container_meta_data.c
+++ b/src/util/container_meta_data.c
@@ -217,9 +217,9 @@ GNUNET_CONTAINER_meta_data_create ()
 static void
 meta_item_free (struct MetaItem *mi)
 {
-  GNUNET_free_non_null (mi->plugin_name);
+  GNUNET_free (mi->plugin_name);
-  GNUNET_free_non_null (mi->mime_type);
+  GNUNET_free (mi->mime_type);
-  GNUNET_free_non_null (mi->data);
+  GNUNET_free (mi->data);
  GNUNET_free (mi);
 }
@@ -258,7 +258,7 @@ GNUNET_CONTAINER_meta_data_destroy (struct GNUNET_CONTAINER_MetaData *md)
    GNUNET_CONTAINER_DLL_remove (md->items_head, md->items_tail, pos);
    meta_item_free (pos);
  }
-  GNUNET_free_non_null (md->sbuf);
+  GNUNET_free (md->sbuf);
  GNUNET_free (md);
 }
@@ -280,7 +280,7 @@ GNUNET_CONTAINER_meta_data_clear (struct GNUNET_CONTAINER_MetaData *md)
    GNUNET_CONTAINER_DLL_remove (md->items_head, md->items_tail, mi);
    meta_item_free (mi);
  }
-  GNUNET_free_non_null (md->sbuf);
+  GNUNET_free (md->sbuf);
  memset (md, 0, sizeof(struct GNUNET_CONTAINER_MetaData));
 }
@@ -976,7 +976,7 @@ GNUNET_CONTAINER_meta_data_serialize (const struct GNUNET_CONTAINER_MetaData
    if (NULL != pos->mime_type)
      left -= strlen (pos->mime_type) + 1;
-    GNUNET_free_non_null (cdata);
+    GNUNET_free (cdata);
    cdata = NULL;
    i++;
@@ -1180,7 +1180,7 @@ GNUNET_CONTAINER_meta_data_deserialize (const char *input, size_t size)
                                       ntohl (ent.type), format, mime_type,
                                       meta_data, dlen);
  }
-  GNUNET_free_non_null (data);
+  GNUNET_free (data);
  return md;
 }
diff --git a/src/util/crypto_ecc.c b/src/util/crypto_ecc.c
index e1608ae55..019dbe94e 100644
--- a/src/util/crypto_ecc.c
+++ b/src/util/crypto_ecc.c
@@ -141,7 +141,7 @@ decode_private_ecdsa_key (const struct GNUNET_CRYPTO_EcdsaPrivateKey *priv)
  int rc;
  uint8_t d[32];
-  for (size_t i=0; i<32; i++)
+  for (size_t i = 0; i<32; i++)
    d[i] = priv->d[31 - i];
  rc = gcry_sexp_build (&result,
@@ -195,7 +195,7 @@ GNUNET_CRYPTO_eddsa_key_get_public (
  struct GNUNET_CRYPTO_EddsaPublicKey *pub)
 {
  unsigned char pk[crypto_sign_PUBLICKEYBYTES];
-  unsigned char sk[crypto_sign_SECRETKEYBYTES]; 
+  unsigned char sk[crypto_sign_SECRETKEYBYTES];
  BENCHMARK_START (eddsa_key_get_public);
  GNUNET_assert (0 == crypto_sign_seed_keypair (pk, sk, priv->d));
@@ -929,7 +929,7 @@ GNUNET_CRYPTO_ecdsa_private_key_derive (
  h = derive_h (&pub, label, context);
  /* Convert to big endian for libgcrypt */
-  for (size_t i=0; i < 32; i++)
+  for (size_t i = 0; i < 32; i++)
    dc[i] = priv->d[31 - i];
  GNUNET_CRYPTO_mpi_scan_unsigned (&x, dc, sizeof(dc));
  d = gcry_mpi_new (256);
@@ -941,9 +941,9 @@ GNUNET_CRYPTO_ecdsa_private_key_derive (
  ret = GNUNET_new (struct GNUNET_CRYPTO_EcdsaPrivateKey);
  GNUNET_CRYPTO_mpi_print_unsigned (dc, sizeof(dc), d);
  /* Convert to big endian for libgcrypt */
-  for (size_t i=0; i < 32; i++)
+  for (size_t i = 0; i < 32; i++)
    ret->d[i] = dc[31 - i];
-  sodium_memzero(dc, sizeof(dc));
+  sodium_memzero (dc, sizeof(dc));
  gcry_mpi_release (d);
  return ret;
 }
diff --git a/src/util/crypto_hash.c b/src/util/crypto_hash.c
index 622953476..0dbe9dbe8 100644
--- a/src/util/crypto_hash.c
+++ b/src/util/crypto_hash.c
@@ -250,12 +250,13 @@ GNUNET_CRYPTO_hash_to_aes_key (const struct GNUNET_HashCode *hc,
 */
 int
 GNUNET_CRYPTO_hash_get_bit_ltr (const struct GNUNET_HashCode *code,
-                            unsigned int bit)
+                                unsigned int bit)
 {
  GNUNET_assert (bit < 8 * sizeof(struct GNUNET_HashCode));
  return (((unsigned char *) code)[bit >> 3] & (128 >> (bit & 7))) > 0;
 }
 /**
 * Obtain a bit from a hashcode.
 * @param code the GNUNET_CRYPTO_hash to index bit-wise
@@ -272,7 +273,6 @@ GNUNET_CRYPTO_hash_get_bit_rtl (const struct GNUNET_HashCode *code,
 }
 /**
 * Determine how many low order bits match in two
 * `struct GNUNET_HashCode`s.  i.e. - 010011 and 011111 share
diff --git a/src/util/crypto_kdf.c b/src/util/crypto_kdf.c
index 1b3bd686f..4f3830308 100644
--- a/src/util/crypto_kdf.c
+++ b/src/util/crypto_kdf.c
@@ -62,7 +62,8 @@ GNUNET_CRYPTO_kdf_v (void *result,
   * hash function."
   *
   * http://eprint.iacr.org/2010/264
-   */return GNUNET_CRYPTO_hkdf_v (result,
+   *///
+  return GNUNET_CRYPTO_hkdf_v (result,
                               out_len,
                               GCRY_MD_SHA512,
                               GCRY_MD_SHA256,
@@ -142,7 +143,6 @@ GNUNET_CRYPTO_kdf_mod_mpi (gcry_mpi_t *r,
  {
    /* Ain't clear if n is always divisible by 8 */
    uint8_t buf[ (nbits - 1) / 8 + 1 ];
    uint16_t ctr_nbo = htons (ctr);
    rc = GNUNET_CRYPTO_kdf (buf,
diff --git a/src/util/crypto_mpi.c b/src/util/crypto_mpi.c
index 099921611..6df47c7e1 100644
--- a/src/util/crypto_mpi.c
+++ b/src/util/crypto_mpi.c
@@ -157,8 +157,8 @@ GNUNET_CRYPTO_mpi_scan_unsigned (gcry_mpi_t *result,
 */
 void
 GNUNET_CRYPTO_mpi_scan_unsigned_le (gcry_mpi_t *result,
-                                 const void *data,
+                                    const void *data,
-                                 size_t size)
+                                    size_t size)
 {
  int rc;
diff --git a/src/util/crypto_rsa.c b/src/util/crypto_rsa.c
index cb4640d48..b12ec7434 100644
--- a/src/util/crypto_rsa.c
+++ b/src/util/crypto_rsa.c
@@ -1301,7 +1301,8 @@ GNUNET_CRYPTO_rsa_verify (const struct GNUNET_HashCode *hash,
     * so the exchange is being malicious in an unfamilair way, maybe
     * just trying to crash us.  Arguably, we've only an internal error
     * though because we should've detected this in our previous call
-     * to GNUNET_CRYPTO_rsa_unblind. */return GNUNET_NO;
+     * to GNUNET_CRYPTO_rsa_unblind. *///
+    return GNUNET_NO;
  }
  data = mpi_to_sexp (r);
diff --git a/src/util/disk.c b/src/util/disk.c
index 9018aa955..6560726ea 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -1451,33 +1451,23 @@ GNUNET_DISK_file_sync (const struct GNUNET_DISK_FileHandle *h)
 /**
 * Creates an interprocess channel
 *
- * @param blocking_read creates an asynchronous pipe for reading if set to GNUNET_NO
+ * @param pf how to configure the pipe
- * @param blocking_write creates an asynchronous pipe for writing if set to GNUNET_NO
- * @param inherit_read inherit the parent processes stdin (only for windows)
- * @param inherit_write inherit the parent processes stdout (only for windows)
 * @return handle to the new pipe, NULL on error
 */
 struct GNUNET_DISK_PipeHandle *
-GNUNET_DISK_pipe (int blocking_read,
+GNUNET_DISK_pipe (enum GNUNET_DISK_PipeFlags pf)
-                  int blocking_write,
-                  int inherit_read,
-                  int inherit_write)
 {
  int fd[2];
-  int ret;
-  int eno;
-  (void) inherit_read;
+  if (-1 == pipe (fd))
-  (void) inherit_write;
-  ret = pipe (fd);
-  if (ret == -1)
  {
-    eno = errno;
+    int eno = errno;
    LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "pipe");
    errno = eno;
    return NULL;
  }
-  return GNUNET_DISK_pipe_from_fd (blocking_read, blocking_write, fd);
+  return GNUNET_DISK_pipe_from_fd (pf, fd);
 }
@@ -1485,29 +1475,26 @@ GNUNET_DISK_pipe (int blocking_read,
 * Creates a pipe object from a couple of file descriptors.
 * Useful for wrapping existing pipe FDs.
 *
- * @param blocking_read creates an asynchronous pipe for reading if set to GNUNET_NO
+ * @param pf how to configure the pipe
- * @param blocking_write creates an asynchronous pipe for writing if set to GNUNET_NO
 * @param fd an array of two fd values. One of them may be -1 for read-only or write-only pipes
 *
 * @return handle to the new pipe, NULL on error
 */
 struct GNUNET_DISK_PipeHandle *
-GNUNET_DISK_pipe_from_fd (int blocking_read, int blocking_write, int fd[2])
+GNUNET_DISK_pipe_from_fd (enum GNUNET_DISK_PipeFlags pf,
+                          int fd[2])
 {
  struct GNUNET_DISK_PipeHandle *p;
+  int ret = 0;
-  p = GNUNET_new (struct GNUNET_DISK_PipeHandle);
-  int ret;
  int flags;
  int eno = 0; /* make gcc happy */
-  ret = 0;
+  p = GNUNET_new (struct GNUNET_DISK_PipeHandle);
  if (fd[0] >= 0)
  {
    p->fd[0] = GNUNET_new (struct GNUNET_DISK_FileHandle);
    p->fd[0]->fd = fd[0];
-    if (! blocking_read)
+    if (0 == (GNUNET_DISK_PF_BLOCKING_READ & pf))
    {
      flags = fcntl (fd[0], F_GETFL);
      flags |= O_NONBLOCK;
@@ -1530,7 +1517,7 @@ GNUNET_DISK_pipe_from_fd (int blocking_read, int blocking_write, int fd[2])
  {
    p->fd[1] = GNUNET_new (struct GNUNET_DISK_FileHandle);
    p->fd[1]->fd = fd[1];
-    if (! blocking_write)
+    if (0 == (GNUNET_DISK_PF_BLOCKING_WRITE & pf))
    {
      flags = fcntl (fd[1], F_GETFL);
      flags |= O_NONBLOCK;
@@ -1556,13 +1543,12 @@ GNUNET_DISK_pipe_from_fd (int blocking_read, int blocking_write, int fd[2])
      GNUNET_break (0 == close (p->fd[0]->fd));
    if (p->fd[1]->fd >= 0)
      GNUNET_break (0 == close (p->fd[1]->fd));
-    GNUNET_free_non_null (p->fd[0]);
+    GNUNET_free (p->fd[0]);
-    GNUNET_free_non_null (p->fd[1]);
+    GNUNET_free (p->fd[1]);
    GNUNET_free (p);
    errno = eno;
    return NULL;
  }
  return p;
 }
@@ -1572,7 +1558,7 @@ GNUNET_DISK_pipe_from_fd (int blocking_read, int blocking_write, int fd[2])
 *
 * @param p pipe to close
 * @param end which end of the pipe to close
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
 */
 int
 GNUNET_DISK_pipe_close_end (struct GNUNET_DISK_PipeHandle *p,
@@ -1644,7 +1630,7 @@ GNUNET_DISK_pipe_detach_end (struct GNUNET_DISK_PipeHandle *p,
 * Closes an interprocess channel
 *
 * @param p pipe to close
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
 */
 int
 GNUNET_DISK_pipe_close (struct GNUNET_DISK_PipeHandle *p)
diff --git a/src/util/dnsparser.c b/src/util/dnsparser.c
index ab687414e..401723106 100644
--- a/src/util/dnsparser.c
+++ b/src/util/dnsparser.c
@@ -109,8 +109,8 @@ GNUNET_DNSPARSER_free_soa (struct GNUNET_DNSPARSER_SoaRecord *soa)
 {
  if (NULL == soa)
    return;
-  GNUNET_free_non_null (soa->mname);
+  GNUNET_free (soa->mname);
-  GNUNET_free_non_null (soa->rname);
+  GNUNET_free (soa->rname);
  GNUNET_free (soa);
 }
@@ -125,7 +125,7 @@ GNUNET_DNSPARSER_free_cert (struct GNUNET_DNSPARSER_CertRecord *cert)
 {
  if (NULL == cert)
    return;
-  GNUNET_free_non_null (cert->certificate_data);
+  GNUNET_free (cert->certificate_data);
  GNUNET_free (cert);
 }
@@ -140,7 +140,7 @@ GNUNET_DNSPARSER_free_srv (struct GNUNET_DNSPARSER_SrvRecord *srv)
 {
  if (NULL == srv)
    return;
-  GNUNET_free_non_null (srv->target);
+  GNUNET_free (srv->target);
  GNUNET_free (srv);
 }
@@ -155,7 +155,7 @@ GNUNET_DNSPARSER_free_mx (struct GNUNET_DNSPARSER_MxRecord *mx)
 {
  if (NULL == mx)
    return;
-  GNUNET_free_non_null (mx->mxhost);
+  GNUNET_free (mx->mxhost);
  GNUNET_free (mx);
 }
@@ -168,7 +168,7 @@ GNUNET_DNSPARSER_free_mx (struct GNUNET_DNSPARSER_MxRecord *mx)
 void
 GNUNET_DNSPARSER_free_record (struct GNUNET_DNSPARSER_Record *r)
 {
-  GNUNET_free_non_null (r->name);
+  GNUNET_free (r->name);
  switch (r->type)
  {
  case GNUNET_DNSPARSER_TYPE_MX:
@@ -190,11 +190,11 @@ GNUNET_DNSPARSER_free_record (struct GNUNET_DNSPARSER_Record *r)
  case GNUNET_DNSPARSER_TYPE_NS:
  case GNUNET_DNSPARSER_TYPE_CNAME:
  case GNUNET_DNSPARSER_TYPE_PTR:
-    GNUNET_free_non_null (r->data.hostname);
+    GNUNET_free (r->data.hostname);
    break;
  default:
-    GNUNET_free_non_null (r->data.raw.data);
+    GNUNET_free (r->data.raw.data);
    break;
  }
 }
@@ -854,17 +854,17 @@ void
 GNUNET_DNSPARSER_free_packet (struct GNUNET_DNSPARSER_Packet *p)
 {
  for (unsigned int i = 0; i < p->num_queries; i++)
-    GNUNET_free_non_null (p->queries[i].name);
+    GNUNET_free (p->queries[i].name);
-  GNUNET_free_non_null (p->queries);
+  GNUNET_free (p->queries);
  for (unsigned int i = 0; i < p->num_answers; i++)
    GNUNET_DNSPARSER_free_record (&p->answers[i]);
-  GNUNET_free_non_null (p->answers);
+  GNUNET_free (p->answers);
  for (unsigned int i = 0; i < p->num_authority_records; i++)
    GNUNET_DNSPARSER_free_record (&p->authority_records[i]);
-  GNUNET_free_non_null (p->authority_records);
+  GNUNET_free (p->authority_records);
  for (unsigned int i = 0; i < p->num_additional_records; i++)
    GNUNET_DNSPARSER_free_record (&p->additional_records[i]);
-  GNUNET_free_non_null (p->additional_records);
+  GNUNET_free (p->additional_records);
  GNUNET_free (p);
 }
diff --git a/src/util/getopt_helpers.c b/src/util/getopt_helpers.c
index a56ef2d96..592875531 100644
--- a/src/util/getopt_helpers.c
+++ b/src/util/getopt_helpers.c
@@ -377,7 +377,7 @@ set_string (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx,
  (void) ctx;
  (void) option;
  GNUNET_assert (NULL != value);
-  GNUNET_free_non_null (*val);
+  GNUNET_free (*val);
  *val = GNUNET_strdup (value);
  return GNUNET_OK;
 }
@@ -458,7 +458,7 @@ set_filename (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx,
  (void) ctx;
  (void) option;
  GNUNET_assert (NULL != value);
-  GNUNET_free_non_null (*val);
+  GNUNET_free (*val);
  *val = GNUNET_STRINGS_filename_expand (value);
  return GNUNET_OK;
 }
diff --git a/src/util/gnunet-config.c b/src/util/gnunet-config.c
index 5883c1497..2b279dda2 100644
--- a/src/util/gnunet-config.c
+++ b/src/util/gnunet-config.c
@@ -258,7 +258,7 @@ run (void *cls,
        GNUNET_CONFIGURATION_write ((NULL == out) ? diff : out, cfgfile))
      global_ret = 2;
  }
-  GNUNET_free_non_null (cfg_fn);
+  GNUNET_free (cfg_fn);
  if (NULL != out)
    GNUNET_CONFIGURATION_destroy (out);
 cleanup:
diff --git a/src/util/gnunet-qr.c b/src/util/gnunet-qr.c
index cd23c3a9c..83b2af2fc 100644
--- a/src/util/gnunet-qr.c
+++ b/src/util/gnunet-qr.c
@@ -31,7 +31,7 @@
 #define LOG(fmt, ...)  \
  if (verbose) \
-    printf (fmt, ## __VA_ARGS__)
+  printf (fmt, ## __VA_ARGS__)
 /**
 * Video device to capture from. Sane default for GNU/Linux systems.
@@ -161,10 +161,7 @@ gnunet_uri (void *cls,
    return;
  }
  GNUNET_free (subsystem);
-  sigpipe = GNUNET_DISK_pipe (GNUNET_NO,
+  sigpipe = GNUNET_DISK_pipe (GNUNET_DISK_PF_NONE);
-                              GNUNET_NO,
-                              GNUNET_NO,
-                              GNUNET_NO);
  GNUNET_assert (NULL != sigpipe);
  rt = GNUNET_SCHEDULER_add_read_file (
    GNUNET_TIME_UNIT_FOREVER_REL,
@@ -192,8 +189,7 @@ gnunet_uri (void *cls,
    GNUNET_array_append (argv,
                         argc,
                         NULL);
-    p = GNUNET_OS_start_process_vap (GNUNET_NO,
+    p = GNUNET_OS_start_process_vap (GNUNET_OS_INHERIT_STD_ALL,
-                                     GNUNET_OS_INHERIT_STD_ALL,
                                     NULL,
                                     NULL,
                                     NULL,
diff --git a/src/util/gnunet-scrypt.c b/src/util/gnunet-scrypt.c
index 7d13ce469..aa64144a8 100644
--- a/src/util/gnunet-scrypt.c
+++ b/src/util/gnunet-scrypt.c
@@ -323,7 +323,7 @@ main (int argc, char *const *argv)
    ? 0
    : 1;
  GNUNET_free_nz ((void *) argv);
-  GNUNET_free_non_null (pwfn);
+  GNUNET_free (pwfn);
  return ret;
 }
diff --git a/src/util/gnunet-service-resolver.c b/src/util/gnunet-service-resolver.c
index 357453da7..5ed70807e 100644
--- a/src/util/gnunet-service-resolver.c
+++ b/src/util/gnunet-service-resolver.c
@@ -217,7 +217,7 @@ free_cache_entry (struct ResolveCache *rc)
    GNUNET_free (pos->record);
    GNUNET_free (pos);
  }
-  GNUNET_free_non_null (rc->hostname);
+  GNUNET_free (rc->hostname);
  GNUNET_CONTAINER_DLL_remove (cache_head, cache_tail, rc);
  cache_size--;
  GNUNET_free (rc);
@@ -241,7 +241,7 @@ free_hosts_entry (struct ResolveCache *rc)
    GNUNET_free (pos->record);
    GNUNET_free (pos);
  }
-  GNUNET_free_non_null (rc->hostname);
+  GNUNET_free (rc->hostname);
  GNUNET_CONTAINER_DLL_remove (hosts_head, hosts_tail, rc);
  cache_size--;
  GNUNET_free (rc);
@@ -267,7 +267,7 @@ free_active_lookup (struct ActiveLookup *al)
    GNUNET_SCHEDULER_cancel (al->timeout_task);
    al->timeout_task = NULL;
  }
-  GNUNET_free_non_null (al->hostname);
+  GNUNET_free (al->hostname);
  GNUNET_free (al);
 }
@@ -1094,7 +1094,7 @@ handle_get (void *cls, const struct GNUNET_RESOLVER_GetMessage *msg)
                 client_request_id,
                 client);
  }
-  GNUNET_free_non_null (hostname);
+  GNUNET_free (hostname);
 }
@@ -1115,7 +1115,7 @@ shutdown_task (void *cls)
  while (NULL != hosts_head)
    free_hosts_entry (hosts_head);
  GNUNET_DNSSTUB_stop (dnsstub_ctx);
-  GNUNET_free_non_null (my_domain);
+  GNUNET_free (my_domain);
 }
@@ -1296,7 +1296,7 @@ init_cb (void *cls,
                GNUNET_OK == result ? "success" : "failure");
    GNUNET_free (dns_servers[i]);
  }
-  GNUNET_free_non_null (dns_servers);
+  GNUNET_free (dns_servers);
 }
diff --git a/src/util/gnunet-uri.c b/src/util/gnunet-uri.c
index 48c46ee49..9443c9120 100644
--- a/src/util/gnunet-uri.c
+++ b/src/util/gnunet-uri.c
@@ -115,8 +115,7 @@ run (void *cls,
    GNUNET_DISK_pipe_handle (sigpipe, GNUNET_DISK_PIPE_END_READ),
    &maint_child_death,
    NULL);
-  p = GNUNET_OS_start_process (GNUNET_NO,
+  p = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_NONE,
-                               0,
                               NULL,
                               NULL,
                               NULL,
@@ -168,7 +167,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 (sigpipe != NULL);
  shc_chld =
    GNUNET_SIGNAL_handler_install (GNUNET_SIGCHLD, &sighandler_child_death);
diff --git a/src/util/helper.c b/src/util/helper.c
index 8c8fb7b6a..7360b7d4b 100644
--- a/src/util/helper.c
+++ b/src/util/helper.c
@@ -401,9 +401,9 @@ static void
 start_helper (struct GNUNET_HELPER_Handle *h)
 {
  h->helper_in =
-    GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_YES, GNUNET_NO);
+    GNUNET_DISK_pipe (GNUNET_DISK_PF_BLOCKING_RW);
  h->helper_out =
-    GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_NO, GNUNET_YES);
+    GNUNET_DISK_pipe (GNUNET_DISK_PF_BLOCKING_RW);
  if ((h->helper_in == NULL) || (h->helper_out == NULL))
  {
    /* out of file descriptors? try again later... */
@@ -422,8 +422,10 @@ start_helper (struct GNUNET_HELPER_Handle *h)
    GNUNET_DISK_pipe_handle (h->helper_out, GNUNET_DISK_PIPE_END_READ);
  h->fh_to_helper =
    GNUNET_DISK_pipe_handle (h->helper_in, GNUNET_DISK_PIPE_END_WRITE);
-  h->helper_proc = GNUNET_OS_start_process_vap (h->with_control_pipe,
+  h->helper_proc = GNUNET_OS_start_process_vap (h->with_control_pipe
-                                                GNUNET_OS_INHERIT_STD_ERR,
+                                                ? GNUNET_OS_INHERIT_STD_ERR
+                                                | GNUNET_OS_USE_PIPE_CONTROL
+                                                : GNUNET_OS_INHERIT_STD_ERR,
                                                h->helper_in,
                                                h->helper_out,
                                                NULL,
diff --git a/src/util/mq.c b/src/util/mq.c
index 78dc7dba2..302b310de 100644
--- a/src/util/mq.c
+++ b/src/util/mq.c
@@ -881,7 +881,7 @@ GNUNET_MQ_destroy (struct GNUNET_MQ_Handle *mq)
    GNUNET_CONTAINER_multihashmap32_destroy (mq->assoc_map);
    mq->assoc_map = NULL;
  }
-  GNUNET_free_non_null (mq->handlers);
+  GNUNET_free (mq->handlers);
  GNUNET_free (mq);
 }
diff --git a/src/util/network.c b/src/util/network.c
index 223ce2080..b18030fcd 100644
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -621,7 +621,7 @@ GNUNET_NETWORK_socket_close (struct GNUNET_NETWORK_Handle *desc)
 void
 GNUNET_NETWORK_socket_free_memory_only_ (struct GNUNET_NETWORK_Handle *desc)
 {
-  GNUNET_free_non_null (desc->addr);
+  GNUNET_free (desc->addr);
  GNUNET_free (desc);
 }
diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index 714df6957..34b88d761 100644
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -563,11 +563,11 @@ GNUNET_OS_installation_get_path (enum GNUNET_OS_InstallationPathKind dirkind)
          (GNUNET_YES == GNUNET_DISK_directory_test (tmp, GNUNET_YES)))
      {
        GNUNET_free (execpath);
-        GNUNET_free_non_null (dirname);
+        GNUNET_free (dirname);
        return tmp;
      }
      GNUNET_free (tmp);
-      GNUNET_free_non_null (dirname);
+      GNUNET_free (dirname);
    }
    GNUNET_asprintf (&dirname,
                     DIR_SEPARATOR_STR "%s" DIR_SEPARATOR_STR,
@@ -643,11 +643,11 @@ GNUNET_OS_installation_get_path (enum GNUNET_OS_InstallationPathKind dirkind)
          (GNUNET_YES == GNUNET_DISK_directory_test (tmp, GNUNET_YES)))
      {
        GNUNET_free (execpath);
-        GNUNET_free_non_null (dirname);
+        GNUNET_free (dirname);
        return tmp;
      }
      GNUNET_free (tmp);
-      GNUNET_free_non_null (dirname);
+      GNUNET_free (dirname);
    }
    GNUNET_asprintf (&dirname,
                     DIR_SEPARATOR_STR "%s" DIR_SEPARATOR_STR
diff --git a/src/util/os_priority.c b/src/util/os_priority.c
index 5799d893b..8d045c72b 100644
--- a/src/util/os_priority.c
+++ b/src/util/os_priority.c
@@ -326,7 +326,6 @@ open_dev_null (int target_fd, int flags)
 /**
 * Start a process.
 *
- * @param pipe_control should a pipe be used to send signals to the child?
 * @param std_inheritance a set of GNUNET_OS_INHERIT_STD_* flags controlling which
 *        std handles of the parent are inherited by the child.
 *        pipe_stdin and pipe_stdout take priority over std_inheritance
@@ -341,8 +340,7 @@ open_dev_null (int target_fd, int flags)
 * @return process ID of the new process, -1 on error
 */
 static struct GNUNET_OS_Process *
-start_process (int pipe_control,
+start_process (enum GNUNET_OS_InheritStdioFlags std_inheritance,
-               enum GNUNET_OS_InheritStdioFlags std_inheritance,
               struct GNUNET_DISK_PipeHandle *pipe_stdin,
               struct GNUNET_DISK_PipeHandle *pipe_stdout,
               struct GNUNET_DISK_PipeHandle *pipe_stderr,
@@ -373,12 +371,12 @@ start_process (int pipe_control,
  if (GNUNET_SYSERR ==
      GNUNET_OS_check_helper_binary (filename, GNUNET_NO, NULL))
    return NULL; /* not executable */
-  if (GNUNET_YES == pipe_control)
+  if (0 != (std_inheritance & GNUNET_OS_USE_PIPE_CONTROL))
  {
    struct GNUNET_DISK_PipeHandle *childpipe;
    int dup_childpipe_read_fd = -1;
-    childpipe = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, GNUNET_YES, GNUNET_NO);
+    childpipe = GNUNET_DISK_pipe (GNUNET_DISK_PF_NONE);
    if (NULL == childpipe)
      return NULL;
    childpipe_read =
@@ -486,7 +484,7 @@ start_process (int pipe_control,
    gnunet_proc = GNUNET_new (struct GNUNET_OS_Process);
    gnunet_proc->pid = ret;
    gnunet_proc->control_pipe = childpipe_write;
-    if (GNUNET_YES == pipe_control)
+    if (0 != (std_inheritance & GNUNET_OS_USE_PIPE_CONTROL))
    {
      close (childpipe_read_fd);
    }
@@ -594,7 +592,6 @@ start_process (int pipe_control,
 /**
 * Start a process.
 *
- * @param pipe_control should a pipe be used to send signals to the child?
 * @param std_inheritance a set of GNUNET_OS_INHERIT_STD_* flags
 * @param pipe_stdin pipe to use to send input to child process (or NULL)
 * @param pipe_stdout pipe to use to get output from child process (or NULL)
@@ -604,16 +601,14 @@ start_process (int pipe_control,
 * @return pointer to process structure of the new process, NULL on error
 */
 struct GNUNET_OS_Process *
-GNUNET_OS_start_process_vap (int pipe_control,
+GNUNET_OS_start_process_vap (enum GNUNET_OS_InheritStdioFlags std_inheritance,
-                             enum GNUNET_OS_InheritStdioFlags std_inheritance,
                             struct GNUNET_DISK_PipeHandle *pipe_stdin,
                             struct GNUNET_DISK_PipeHandle *pipe_stdout,
                             struct GNUNET_DISK_PipeHandle *pipe_stderr,
                             const char *filename,
                             char *const argv[])
 {
-  return start_process (pipe_control,
+  return start_process (std_inheritance,
-                        std_inheritance,
                        pipe_stdin,
                        pipe_stdout,
                        pipe_stderr,
@@ -626,7 +621,6 @@ GNUNET_OS_start_process_vap (int pipe_control,
 /**
 * Start a process.
 *
- * @param pipe_control should a pipe be used to send signals to the child?
 * @param std_inheritance a set of GNUNET_OS_INHERIT_STD_* flags
 * @param pipe_stdin pipe to use to send input to child process (or NULL)
 * @param pipe_stdout pipe to use to get output from child process (or NULL)
@@ -636,8 +630,7 @@ GNUNET_OS_start_process_vap (int pipe_control,
 * @return pointer to process structure of the new process, NULL on error
 */
 struct GNUNET_OS_Process *
-GNUNET_OS_start_process_va (int pipe_control,
+GNUNET_OS_start_process_va (enum GNUNET_OS_InheritStdioFlags std_inheritance,
-                            enum GNUNET_OS_InheritStdioFlags std_inheritance,
                            struct GNUNET_DISK_PipeHandle *pipe_stdin,
                            struct GNUNET_DISK_PipeHandle *pipe_stdout,
                            struct GNUNET_DISK_PipeHandle *pipe_stderr,
@@ -660,8 +653,7 @@ GNUNET_OS_start_process_va (int pipe_control,
  while (NULL != (argv[argc] = va_arg (ap, char *)))
    argc++;
  va_end (ap);
-  ret = GNUNET_OS_start_process_vap (pipe_control,
+  ret = GNUNET_OS_start_process_vap (std_inheritance,
-                                     std_inheritance,
                                     pipe_stdin,
                                     pipe_stdout,
                                     pipe_stderr,
@@ -675,7 +667,6 @@ GNUNET_OS_start_process_va (int pipe_control,
 /**
 * Start a process.
 *
- * @param pipe_control should a pipe be used to send signals to the child?
 * @param std_inheritance a set of GNUNET_OS_INHERIT_STD_* flags
 * @param pipe_stdin pipe to use to send input to child process (or NULL)
 * @param pipe_stdout pipe to use to get output from child process (or NULL)
@@ -684,8 +675,7 @@ GNUNET_OS_start_process_va (int pipe_control,
 * @return pointer to process structure of the new process, NULL on error
 */
 struct GNUNET_OS_Process *
-GNUNET_OS_start_process (int pipe_control,
+GNUNET_OS_start_process (enum GNUNET_OS_InheritStdioFlags std_inheritance,
-                         enum GNUNET_OS_InheritStdioFlags std_inheritance,
                         struct GNUNET_DISK_PipeHandle *pipe_stdin,
                         struct GNUNET_DISK_PipeHandle *pipe_stdout,
                         struct GNUNET_DISK_PipeHandle *pipe_stderr,
@@ -696,8 +686,7 @@ GNUNET_OS_start_process (int pipe_control,
  va_list ap;
  va_start (ap, filename);
-  ret = GNUNET_OS_start_process_va (pipe_control,
+  ret = GNUNET_OS_start_process_va (std_inheritance,
-                                    std_inheritance,
                                    pipe_stdin,
                                    pipe_stdout,
                                    pipe_stderr,
@@ -711,7 +700,6 @@ GNUNET_OS_start_process (int pipe_control,
 /**
 * Start a process.
 *
- * @param pipe_control should a pipe be used to send signals to the child?
 * @param std_inheritance a set of GNUNET_OS_INHERIT_STD_* flags controlling which
 *        std handles of the parent are inherited by the child.
 *        pipe_stdin and pipe_stdout take priority over std_inheritance
@@ -723,14 +711,12 @@ GNUNET_OS_start_process (int pipe_control,
 * @return process ID of the new process, -1 on error
 */
 struct GNUNET_OS_Process *
-GNUNET_OS_start_process_v (int pipe_control,
+GNUNET_OS_start_process_v (enum GNUNET_OS_InheritStdioFlags std_inheritance,
-                           enum GNUNET_OS_InheritStdioFlags std_inheritance,
                           const int *lsocks,
                           const char *filename,
                           char *const argv[])
 {
-  return start_process (pipe_control,
+  return start_process (std_inheritance,
-                        std_inheritance,
                        NULL,
                        NULL,
                        NULL,
@@ -747,7 +733,6 @@ GNUNET_OS_start_process_v (int pipe_control,
 * in the order they appear.  Arguments containing spaces can be used by
 * quoting them with @em ".
 *
- * @param pipe_control should a pipe be used to send signals to the child?
 * @param std_inheritance a set of GNUNET_OS_INHERIT_STD_* flags
 * @param lsocks array of listen sockets to dup systemd-style (or NULL);
 *         must be NULL on platforms where dup is not supported
@@ -759,8 +744,7 @@ GNUNET_OS_start_process_v (int pipe_control,
 * @return pointer to process structure of the new process, NULL on error
 */
 struct GNUNET_OS_Process *
-GNUNET_OS_start_process_s (int pipe_control,
+GNUNET_OS_start_process_s (enum GNUNET_OS_InheritStdioFlags std_inheritance,
-                           unsigned int std_inheritance,
                           const int *lsocks,
                           const char *filename,
                           ...)
@@ -869,8 +853,7 @@ GNUNET_OS_start_process_s (int pipe_control,
    }
  }
  binary_path = argv[0];
-  proc = GNUNET_OS_start_process_v (pipe_control,
+  proc = GNUNET_OS_start_process_v (std_inheritance,
-                                    std_inheritance,
                                    lsocks,
                                    binary_path,
                                    argv);
@@ -1169,13 +1152,18 @@ GNUNET_OS_command_run (GNUNET_OS_LineProcessor proc,
  struct GNUNET_DISK_PipeHandle *opipe;
  va_list ap;
-  opipe = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_NO, GNUNET_YES);
+  opipe = GNUNET_DISK_pipe (GNUNET_DISK_PF_BLOCKING_RW);
  if (NULL == opipe)
    return NULL;
  va_start (ap, binary);
  /* redirect stdout, don't inherit stderr/stdin */
  eip =
-    GNUNET_OS_start_process_va (GNUNET_NO, 0, NULL, opipe, NULL, binary, ap);
+    GNUNET_OS_start_process_va (GNUNET_OS_INHERIT_STD_NONE,
+                                NULL,
+                                opipe,
+                                NULL,
+                                binary,
+                                ap);
  va_end (ap);
  if (NULL == eip)
  {
diff --git a/src/util/perf_malloc.c b/src/util/perf_malloc.c
index 6582505c8..1c91402da 100644
--- a/src/util/perf_malloc.c
+++ b/src/util/perf_malloc.c
@@ -56,11 +56,11 @@ perf_realloc ()
    ptr = GNUNET_malloc (i);
    memset (ptr, 1, i);
    ptr = GNUNET_realloc (ptr, i + 5);
-    for (size_t j=0;j<i;j++)
+    for (size_t j = 0; j<i; j++)
      GNUNET_assert (1 == ptr[j]);
    memset (ptr, 6, i + 5);
    ptr = GNUNET_realloc (ptr, i - 5);
-    for (size_t j=0;j<i-5;j++)
+    for (size_t j = 0; j<i - 5; j++)
      GNUNET_assert (6 == ptr[j]);
    GNUNET_free (ptr);
  }
diff --git a/src/util/perf_scheduler.c b/src/util/perf_scheduler.c
index 3ea76e24c..4d4d0a228 100644
--- a/src/util/perf_scheduler.c
+++ b/src/util/perf_scheduler.c
@@ -94,8 +94,8 @@ main (int argc, char *argv[])
            GNUNET_YES));
  GAUGER ("UTIL", "Scheduler",
          tasks / 1024 / (1
-                       + GNUNET_TIME_absolute_get_duration
+                          + GNUNET_TIME_absolute_get_duration
-                         (start).rel_value_us / 1000LL), "tasks/ms");
+                            (start).rel_value_us / 1000LL), "tasks/ms");
  return 0;
 }
diff --git a/src/util/program.c b/src/util/program.c
index 5ad069edd..8bda34b4f 100644
--- a/src/util/program.c
+++ b/src/util/program.c
@@ -342,10 +342,10 @@ GNUNET_PROGRAM_run2 (int argc,
  ret = GNUNET_OK;
 cleanup:
  GNUNET_CONFIGURATION_destroy (cfg);
-  GNUNET_free_non_null (cc.cfgfile);
+  GNUNET_free (cc.cfgfile);
-  GNUNET_free_non_null (cfg_fn);
+  GNUNET_free (cfg_fn);
-  GNUNET_free_non_null (loglev);
+  GNUNET_free (loglev);
-  GNUNET_free_non_null (logfile);
+  GNUNET_free (logfile);
  return ret;
 }
diff --git a/src/util/regex.c b/src/util/regex.c
index d3ab35652..fed325cd6 100644
--- a/src/util/regex.c
+++ b/src/util/regex.c
@@ -174,10 +174,10 @@ num_to_regex (uint16_t value,
    GNUNET_asprintf (&ret,
                     "%s%s%s%s",
                     a, b, c, d);
-  GNUNET_free_non_null (a);
+  GNUNET_free (a);
-  GNUNET_free_non_null (b);
+  GNUNET_free (b);
-  GNUNET_free_non_null (c);
+  GNUNET_free (c);
-  GNUNET_free_non_null (d);
+  GNUNET_free (d);
  return ret;
 }
@@ -607,7 +607,7 @@ address_to_regex (const void *addr,
    reg = num_to_regex (a[i], m[i]);
    if (NULL == reg)
    {
-      GNUNET_free_non_null (ret);
+      GNUNET_free (ret);
      return NULL;
    }
    if (NULL == ret)
@@ -721,7 +721,7 @@ GNUNET_TUN_ipv4policy2regex (const char *policy)
    line = ipv4_to_regex (&np[i]);
    if (NULL == line)
    {
-      GNUNET_free_non_null (reg);
+      GNUNET_free (reg);
      GNUNET_free (np);
      return NULL;
    }
@@ -777,7 +777,7 @@ GNUNET_TUN_ipv6policy2regex (const char *policy)
    line = ipv6_to_regex (&np[i]);
    if (NULL == line)
    {
-      GNUNET_free_non_null (reg);
+      GNUNET_free (reg);
      GNUNET_free (np);
      return NULL;
    }
diff --git a/src/util/scheduler.c b/src/util/scheduler.c
index 93393bd7c..b5ce20254 100644
--- a/src/util/scheduler.c
+++ b/src/util/scheduler.c
@@ -2214,10 +2214,7 @@ GNUNET_SCHEDULER_driver_init (const struct GNUNET_SCHEDULER_Driver *driver)
  GNUNET_assert (NULL == shutdown_pipe_handle);
  /* general set-up */
  sh = GNUNET_new (struct GNUNET_SCHEDULER_Handle);
-  shutdown_pipe_handle = GNUNET_DISK_pipe (GNUNET_NO,
+  shutdown_pipe_handle = GNUNET_DISK_pipe (GNUNET_DISK_PF_NONE);
-                                           GNUNET_NO,
-                                           GNUNET_NO,
-                                           GNUNET_NO);
  GNUNET_assert (NULL != shutdown_pipe_handle);
  pr = GNUNET_DISK_pipe_handle (shutdown_pipe_handle,
                                GNUNET_DISK_PIPE_END_READ);
diff --git a/src/util/service.c b/src/util/service.c
index ea078b19b..e6bbe855f 100644
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -1144,7 +1144,7 @@ get_server_addresses (const char *service_name,
          (EACCES == errno))
      {
        LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "socket");
-        GNUNET_free_non_null (hostname);
+        GNUNET_free (hostname);
        GNUNET_free (unixpath);
        return GNUNET_SYSERR;
      }
@@ -1170,7 +1170,7 @@ get_server_addresses (const char *service_name,
         _ (
           "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"),
         service_name);
-    GNUNET_free_non_null (hostname);
+    GNUNET_free (hostname);
    return GNUNET_SYSERR;
  }
  if (0 == port)
@@ -1178,8 +1178,8 @@ get_server_addresses (const char *service_name,
    saddrs = GNUNET_new_array (2, struct sockaddr *);
    saddrlens = GNUNET_new_array (2, socklen_t);
    add_unixpath (saddrs, saddrlens, unixpath);
-    GNUNET_free_non_null (unixpath);
+    GNUNET_free (unixpath);
-    GNUNET_free_non_null (hostname);
+    GNUNET_free (hostname);
    *addrs = saddrs;
    *addr_lens = saddrlens;
    return 1;
@@ -1203,7 +1203,7 @@ get_server_addresses (const char *service_name,
           hostname,
           gai_strerror (ret));
      GNUNET_free (hostname);
-      GNUNET_free_non_null (unixpath);
+      GNUNET_free (unixpath);
      return GNUNET_SYSERR;
    }
    next = res;
@@ -1223,7 +1223,7 @@ get_server_addresses (const char *service_name,
           hostname);
      freeaddrinfo (res);
      GNUNET_free (hostname);
-      GNUNET_free_non_null (unixpath);
+      GNUNET_free (unixpath);
      return GNUNET_SYSERR;
    }
    resi = i;
@@ -1330,7 +1330,7 @@ get_server_addresses (const char *service_name,
      ((struct sockaddr_in *) saddrs[i])->sin_port = htons (port);
    }
  }
-  GNUNET_free_non_null (unixpath);
+  GNUNET_free (unixpath);
  *addrs = saddrs;
  *addr_lens = saddrlens;
  return resi;
@@ -1557,8 +1557,8 @@ setup_service (struct GNUNET_SERVICE_Handle *sh)
      }
      GNUNET_CONTAINER_DLL_insert (sh->slc_head, sh->slc_tail, slc);
    }
-    GNUNET_free_non_null (addrlens);
+    GNUNET_free (addrlens);
-    GNUNET_free_non_null (addrs);
+    GNUNET_free (addrs);
    if ((0 != num) && (NULL == sh->slc_head))
    {
      /* All attempts to bind failed, hard failure */
@@ -1566,7 +1566,7 @@ setup_service (struct GNUNET_SERVICE_Handle *sh)
        GNUNET_ERROR_TYPE_ERROR,
        _ (
          "Could not bind to any of the ports I was supposed to, refusing to run!\n"));
-      GNUNET_free_non_null (csocks);
+      GNUNET_free (csocks);
      return GNUNET_SYSERR;
    }
  }
@@ -1793,10 +1793,10 @@ teardown_service (struct GNUNET_SERVICE_Handle *sh)
 {
  struct ServiceListenContext *slc;
-  GNUNET_free_non_null (sh->v4_denied);
+  GNUNET_free (sh->v4_denied);
-  GNUNET_free_non_null (sh->v6_denied);
+  GNUNET_free (sh->v6_denied);
-  GNUNET_free_non_null (sh->v4_allowed);
+  GNUNET_free (sh->v4_allowed);
-  GNUNET_free_non_null (sh->v6_allowed);
+  GNUNET_free (sh->v6_allowed);
  while (NULL != (slc = sh->slc_head))
  {
    GNUNET_CONTAINER_DLL_remove (sh->slc_head, sh->slc_tail, slc);
@@ -1890,7 +1890,7 @@ GNUNET_SERVICE_start (const char *service_name,
  sh->handlers = GNUNET_MQ_copy_handlers2 (handlers, &return_agpl, NULL);
  if (GNUNET_OK != setup_service (sh))
  {
-    GNUNET_free_non_null (sh->handlers);
+    GNUNET_free (sh->handlers);
    GNUNET_free (sh);
    return NULL;
  }
@@ -1913,7 +1913,7 @@ GNUNET_SERVICE_stop (struct GNUNET_SERVICE_Handle *srv)
  while (NULL != (client = srv->clients_head))
    GNUNET_SERVICE_client_drop (client);
  teardown_service (srv);
-  GNUNET_free_non_null (srv->handlers);
+  GNUNET_free (srv->handlers);
  GNUNET_free (srv);
 }
@@ -2021,8 +2021,8 @@ GNUNET_SERVICE_run_ (int argc,
  sh.disconnect_cb = disconnect_cb;
  sh.cb_cls = cls;
  sh.handlers = (NULL == pd->agpl_url)
-    ? GNUNET_MQ_copy_handlers (handlers)
+                ? GNUNET_MQ_copy_handlers (handlers)
-    : GNUNET_MQ_copy_handlers2 (handlers, &return_agpl, NULL);
+                : GNUNET_MQ_copy_handlers2 (handlers, &return_agpl, NULL);
  sh.service_name = service_name;
  sh.ret = 0;
  /* setup subsystems */
@@ -2159,13 +2159,13 @@ shutdown:
  }
 #endif
  teardown_service (&sh);
-  GNUNET_free_non_null (sh.handlers);
+  GNUNET_free (sh.handlers);
  GNUNET_SPEEDUP_stop_ ();
  GNUNET_CONFIGURATION_destroy (cfg);
-  GNUNET_free_non_null (logfile);
+  GNUNET_free (logfile);
-  GNUNET_free_non_null (loglev);
+  GNUNET_free (loglev);
  GNUNET_free (cfg_filename);
-  GNUNET_free_non_null (opt_cfg_filename);
+  GNUNET_free (opt_cfg_filename);
  return err ? GNUNET_SYSERR : sh.ret;
 }
diff --git a/src/util/socks.c b/src/util/socks.c
index 756be753a..7ab297272 100644
--- a/src/util/socks.c
+++ b/src/util/socks.c
@@ -665,7 +665,7 @@ GNUNET_SOCKS_do_connect (const char *service_name,
                                                  (host0 != NULL) ? host0
                                                  : "127.0.0.1",
                                                  port0);
-  GNUNET_free_non_null (host0);
+  GNUNET_free (host0);
  /* Sets to NULL if they do not exist */
  (void) GNUNET_CONFIGURATION_get_value_string (cfg,
@@ -677,8 +677,8 @@ GNUNET_SOCKS_do_connect (const char *service_name,
                                                "SOCKSPASS",
                                                &pass);
  ih = GNUNET_SOCKS_init_handshake (user, pass);
-  GNUNET_free_non_null (user);
+  GNUNET_free (user);
-  GNUNET_free_non_null (pass);
+  GNUNET_free (pass);
  GNUNET_SOCKS_set_handshake_destination (ih, host1, port1);
  GNUNET_free (host1);
diff --git a/src/util/strings.c b/src/util/strings.c
index 9510b3b3b..41180dd71 100644
--- a/src/util/strings.c
+++ b/src/util/strings.c
@@ -1148,7 +1148,7 @@ GNUNET_STRINGS_path_is_absolute (const char *filename,
      if (r_uri_scheme)
        *r_uri_scheme = uri;
      else
-        GNUNET_free_non_null (uri);
+        GNUNET_free (uri);
      return GNUNET_STRINGS_path_is_absolute (post_scheme_path,
                                              GNUNET_NO,
@@ -1985,7 +1985,7 @@ GNUNET_STRINGS_base64_decode (const char *data, size_t len, void **out)
                "ignoring CR/LF\n");                              \
    i++;                                                          \
    if (i >= len)                                                 \
-      goto END;                                                   \
+    goto END;                                                   \
  }
  GNUNET_assert (len / 3 < SIZE_MAX);
diff --git a/src/util/test_bio.c b/src/util/test_bio.c
index 0c8453121..f18014719 100644
--- a/src/util/test_bio.c
+++ b/src/util/test_bio.c
@@ -52,14 +52,14 @@ test_normal_rw (void)
    GNUNET_BIO_write_spec_string ("test-normal-rw-string", TESTSTRING),
    GNUNET_BIO_write_spec_meta_data ("test-normal-rw-metadata", mdW),
    GNUNET_BIO_write_spec_int64 ("test-normal-rw-int64", &wNum),
-    GNUNET_BIO_write_spec_end(),
+    GNUNET_BIO_write_spec_end (),
  };
  struct GNUNET_BIO_ReadSpec rs[] = {
    GNUNET_BIO_read_spec_string ("test-normal-rw-string", &rString, 200),
    GNUNET_BIO_read_spec_meta_data ("test-normal-rw-metadata", &mdR),
    GNUNET_BIO_read_spec_int64 ("test-normal-rw-int64", &rNum),
-    GNUNET_BIO_read_spec_end(),
+    GNUNET_BIO_read_spec_end (),
  };
  /* I/O on file */
@@ -73,12 +73,13 @@ test_normal_rw (void)
  GNUNET_assert (GNUNET_OK == GNUNET_BIO_read_spec_commit (rh, rs));
  GNUNET_assert (GNUNET_OK == GNUNET_BIO_read_close (rh, NULL));
  GNUNET_assert (0 == strcmp (TESTSTRING, rString));
-  GNUNET_assert (GNUNET_YES == GNUNET_CONTAINER_meta_data_test_equal (mdR, mdW));
+  GNUNET_assert (GNUNET_YES == GNUNET_CONTAINER_meta_data_test_equal (mdR,
+                                                                      mdW));
  GNUNET_assert (wNum == rNum);
  GNUNET_CONTAINER_meta_data_destroy (mdR);
  GNUNET_assert (GNUNET_OK == GNUNET_DISK_directory_remove (filename));
-  GNUNET_free(filename);
+  GNUNET_free (filename);
  /* I/O on buffer */
  wh = GNUNET_BIO_write_open_buffer ();
@@ -96,7 +97,8 @@ test_normal_rw (void)
  GNUNET_assert (GNUNET_OK == GNUNET_BIO_read_spec_commit (rh, rs));
  GNUNET_assert (GNUNET_OK == GNUNET_BIO_read_close (rh, NULL));
  GNUNET_assert (0 == strcmp (TESTSTRING, rString));
-  GNUNET_assert (GNUNET_YES == GNUNET_CONTAINER_meta_data_test_equal (mdR, mdW));
+  GNUNET_assert (GNUNET_YES == GNUNET_CONTAINER_meta_data_test_equal (mdR,
+                                                                      mdW));
  GNUNET_assert (wNum == rNum);
  GNUNET_free (buffer);
@@ -314,7 +316,7 @@ test_fullfile_rw (void)
                                 200),
    GNUNET_BIO_read_spec_meta_data ("test-fullfile-rw-metadata",
                                    &mdR),
-    GNUNET_BIO_read_spec_end(),
+    GNUNET_BIO_read_spec_end (),
  };
  wh = GNUNET_BIO_write_open_file ("/dev/full");
diff --git a/src/util/test_common_allocation.c b/src/util/test_common_allocation.c
index a24af7124..50f259257 100644
--- a/src/util/test_common_allocation.c
+++ b/src/util/test_common_allocation.c
@@ -33,6 +33,7 @@ check (void)
  char *ptrs[MAX_TESTVAL];
  unsigned int **a2;
  char ***a3;
+  char *tmp;
  int i;
  int j;
  int k;
@@ -55,9 +56,9 @@ check (void)
    GNUNET_free (ptrs[i]);
  }
-  /* GNUNET_free_non_null test */
+  /* GNUNET_free test */
-  GNUNET_free_non_null (NULL);
+  tmp = GNUNET_malloc (4);
-  GNUNET_free_non_null (GNUNET_malloc (4));
+  GNUNET_free (tmp);
  /* GNUNET_strdup tests */
  ptrs[0] = GNUNET_strdup ("bar");
diff --git a/src/util/test_common_logging_runtime_loglevels.c b/src/util/test_common_logging_runtime_loglevels.c
index e6d83d52c..79cf9d53a 100644
--- a/src/util/test_common_logging_runtime_loglevels.c
+++ b/src/util/test_common_logging_runtime_loglevels.c
@@ -207,7 +207,7 @@ read_output_line (int phase_from1, int phase_to1, int phase_from2,
 */
 #define LOG_MAX_LINE_LENGTH (17)
-#define LOG_BUFFER_SIZE LOG_MAX_NUM_LINES * LOG_MAX_LINE_LENGTH
+#define LOG_BUFFER_SIZE LOG_MAX_NUM_LINES *LOG_MAX_LINE_LENGTH
 static char buf[LOG_BUFFER_SIZE];
@@ -347,8 +347,7 @@ runone ()
 {
  const struct GNUNET_DISK_FileHandle *stdout_read_handle;
-  pipe_stdout = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_NO,
+  pipe_stdout = GNUNET_DISK_pipe (GNUNET_DISK_PF_BLOCKING_RW);
-                                  GNUNET_YES);
  if (pipe_stdout == NULL)
  {
@@ -403,7 +402,7 @@ runone ()
    break;
  }
-  proc = GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+  proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                  NULL, pipe_stdout, NULL,
                                  "./test_common_logging_dummy",
                                  "test_common_logging_dummy", NULL);
diff --git a/src/util/test_configuration.c b/src/util/test_configuration.c
index 6227a28db..59b1b2291 100644
--- a/src/util/test_configuration.c
+++ b/src/util/test_configuration.c
@@ -128,7 +128,7 @@ diffsCallBack (void *cls, const char *section, const char *option,
      }
      else
        cbData->status = 1;
-      GNUNET_free_non_null (diffValue);
+      GNUNET_free (diffValue);
      break;
    }
diff --git a/src/util/test_container_meta_data.c b/src/util/test_container_meta_data.c
index d768f3699..db413f313 100644
--- a/src/util/test_container_meta_data.c
+++ b/src/util/test_container_meta_data.c
@@ -113,7 +113,7 @@ testMeta (int i)
      GNUNET_CONTAINER_meta_data_serialize (m, &sval, size,
                                            GNUNET_CONTAINER_META_DATA_SERIALIZE_FULL))
  {
-    GNUNET_free_non_null (sval);
+    GNUNET_free (sval);
    ABORT (m);
  }
  GNUNET_CONTAINER_meta_data_destroy (m);
diff --git a/src/util/test_container_multihashmap.c b/src/util/test_container_multihashmap.c
index bd9e7af31..f46b9f56e 100644
--- a/src/util/test_container_multihashmap.c
+++ b/src/util/test_container_multihashmap.c
@@ -31,7 +31,7 @@
                  if (m != NULL) GNUNET_CONTAINER_multihashmap_destroy (m); \
                  if (NULL != \
                      iter) \
-                    GNUNET_CONTAINER_multihashmap_iterator_destroy (iter); \
+                  GNUNET_CONTAINER_multihashmap_iterator_destroy (iter); \
                  return 1; }
 #define CHECK(c) { if (! (c)) ABORT (); }
diff --git a/src/util/test_container_multipeermap.c b/src/util/test_container_multipeermap.c
index 9aeead56c..cb6fc30d2 100644
--- a/src/util/test_container_multipeermap.c
+++ b/src/util/test_container_multipeermap.c
@@ -31,7 +31,7 @@
                  if (NULL != m) GNUNET_CONTAINER_multipeermap_destroy (m); \
                  if (NULL != \
                      iter) \
-                    GNUNET_CONTAINER_multipeermap_iterator_destroy (iter); \
+                  GNUNET_CONTAINER_multipeermap_iterator_destroy (iter); \
                  return 1; }
 #define CHECK(c) { if (! (c)) ABORT (); }
diff --git a/src/util/test_crypto_symmetric.c b/src/util/test_crypto_symmetric.c
index 9f6cd5ed0..5012c7f5b 100644
--- a/src/util/test_crypto_symmetric.c
+++ b/src/util/test_crypto_symmetric.c
@@ -147,7 +147,7 @@ verifyCrypto ()
    ret = 1;
  }
 error:
-  GNUNET_free_non_null (res);
+  GNUNET_free (res);
  return ret;
 }
diff --git a/src/util/test_os_start_process.c b/src/util/test_os_start_process.c
index 2bdca5c9d..6d4a131bb 100644
--- a/src/util/test_os_start_process.c
+++ b/src/util/test_os_start_process.c
@@ -138,7 +138,7 @@ run_task (void *cls)
  }
  proc =
-    GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_ERR,
+    GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ERR,
                             hello_pipe_stdin, hello_pipe_stdout, NULL,
                             fn,
                             "test_gnunet_echo_hello", "-", NULL);
@@ -212,7 +212,8 @@ check_kill ()
  }
  fn = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver");
  proc =
-    GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ERR,
+    GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ERR
+                             | GNUNET_OS_USE_PIPE_CONTROL,
                             hello_pipe_stdin,
                             hello_pipe_stdout,
                             NULL,
@@ -256,7 +257,8 @@ check_instant_kill ()
  }
  fn = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver");
  proc =
-    GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ERR,
+    GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ERR
+                             | GNUNET_OS_USE_PIPE_CONTROL,
                             hello_pipe_stdin, hello_pipe_stdout, NULL,
                             fn,
                             "gnunet-service-resolver", "-", NULL);
diff --git a/src/util/test_resolver_api.c b/src/util/test_resolver_api.c
index 13fda53bf..eefb20890 100644
--- a/src/util/test_resolver_api.c
+++ b/src/util/test_resolver_api.c
@@ -215,7 +215,7 @@ run (void *cls, char *const *args, const char *cfgfile,
  own_fqdn = GNUNET_RESOLVER_local_fqdn_get ();
  /* can't really check, only thing we can safely
     compare against is our own identical logic... */
-  GNUNET_free_non_null (own_fqdn);
+  GNUNET_free (own_fqdn);
  /*
   * Testing non-local DNS resolution
@@ -348,8 +348,8 @@ main (int argc, char *argv[])
                    "WARNING",
                    NULL);
  fn = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver");
-  proc = GNUNET_OS_start_process (GNUNET_YES,
+  proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR
-                                  GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+                                  | GNUNET_OS_USE_PIPE_CONTROL,
                                  NULL, NULL, NULL,
                                  fn,
                                  "gnunet-service-resolver",
diff --git a/src/util/test_scheduler.c b/src/util/test_scheduler.c
index 471ca64e5..0e2e7f760 100644
--- a/src/util/test_scheduler.c
+++ b/src/util/test_scheduler.c
@@ -133,7 +133,7 @@ task4 (void *cls)
  GNUNET_assert (4 == *ok);
  (*ok) = 6;
-  p = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, GNUNET_NO, GNUNET_NO);
+  p = GNUNET_DISK_pipe (GNUNET_DISK_PF_NONE);
  GNUNET_assert (NULL != p);
  fds[0] = GNUNET_DISK_pipe_handle (p, GNUNET_DISK_PIPE_END_READ);
  fds[1] = GNUNET_DISK_pipe_handle (p, GNUNET_DISK_PIPE_END_WRITE);