12 files changed, 57 insertions, 51 deletions

diff --git a/src/gns/gns_api.c b/src/gns/gns_api.c
index 0d99d822e..bf95bf340 100644
--- a/src/gns/gns_api.c
+++ b/src/gns/gns_api.c
@@ -427,4 +427,5 @@ GNUNET_GNS_lookup (struct GNUNET_GNS_Handle *handle,
                                     proc_cls);
 }
 
+
 /* end of gns_api.c */
diff --git a/src/gns/gns_tld_api.c b/src/gns/gns_tld_api.c
index 1db5baacb..3ebf07db6 100644
--- a/src/gns/gns_tld_api.c
+++ b/src/gns/gns_tld_api.c
@@ -340,7 +340,7 @@ GNUNET_GNS_lookup_with_tld_cancel (struct GNUNET_GNS_LookupWithTldRequest *ltr)
     GNUNET_GNS_lookup_cancel (ltr->lr);
     ltr->lr = NULL;
   }
-  GNUNET_free_non_null (ltr->longest_match);
+  GNUNET_free (ltr->longest_match);
   GNUNET_free (ltr->name);
   GNUNET_free (ltr);
   return ret;
diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c
index 74309f554..0a9b7c861 100644
--- a/src/gns/gnunet-dns2gns.c
+++ b/src/gns/gnunet-dns2gns.c
@@ -190,6 +190,7 @@ do_shutdown (void *cls)
   }
 }
 
+
 /**
  * Shuffle answers
  * Fisher-Yates (aka Knuth) Shuffle
@@ -216,6 +217,7 @@ shuffle_answers (struct Request *request)
   }
 }
 
+
 /**
  * Send the response for the given request and clean up.
  *
diff --git a/src/gns/gnunet-gns-import.c b/src/gns/gnunet-gns-import.c
index 2c7c56411..78db28cab 100644
--- a/src/gns/gnunet-gns-import.c
+++ b/src/gns/gnunet-gns-import.c
@@ -87,8 +87,7 @@ static int ret;
 
 
 static int
-run_process_and_wait (int pipe_control,
-                      enum GNUNET_OS_InheritStdioFlags std_inheritance,
+run_process_and_wait (enum GNUNET_OS_InheritStdioFlags std_inheritance,
                       struct GNUNET_DISK_PipeHandle *pipe_stdin,
                       struct GNUNET_DISK_PipeHandle *pipe_stdout,
                       enum GNUNET_OS_ProcessStatusType *st,
@@ -120,7 +119,7 @@ run_process_and_wait (int pipe_control,
   va_end (apc2);
   if (arglen > 0)
     argp[-1] = '\0';
-  p = GNUNET_OS_start_process_va (pipe_control, std_inheritance,
+  p = GNUNET_OS_start_process_va (std_inheritance,
                                   pipe_stdin,
                                   pipe_stdout,
                                   NULL,
@@ -222,7 +221,7 @@ zone_iteration_error (void *cls)
 
   if (! found_private_rec)
   {
-    if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+    if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                    NULL, NULL, &st, &code,
                                    "gnunet-namestore",
                                    "gnunet-namestore", "-z", "master-zone",
@@ -236,7 +235,7 @@ zone_iteration_error (void *cls)
   }
   if (! found_pin_rec)
   {
-    if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+    if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                    NULL, NULL, &st, &code,
                                    "gnunet-namestore",
                                    "gnunet-namestore", "-z", "master-zone",
@@ -346,9 +345,9 @@ get_ego (void *cls,
 static void
 shutdown_task (void *cls)
 {
-  GNUNET_free_non_null (master_zone_pkey);
+  GNUNET_free (master_zone_pkey);
   master_zone_pkey = NULL;
-  GNUNET_free_non_null (private_zone_pkey);
+  GNUNET_free (private_zone_pkey);
   private_zone_pkey = NULL;
   if (NULL != list_it)
   {
@@ -385,7 +384,8 @@ run (void *cls, char *const *args, const char *cfgfile,
 
   cfg = c;
 
-  if (0 != run_process_and_wait (GNUNET_NO, 0, NULL, NULL, &st, &code,
+  if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_NONE,
+                                 NULL, NULL, &st, &code,
                                  "gnunet-arm",
                                  "gnunet-arm", "-I", NULL))
   {
@@ -395,60 +395,60 @@ run (void *cls, char *const *args, const char *cfgfile,
     return;
   }
 
-  if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+  if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                  NULL, NULL, &st, &code,
                                  "gnunet-identity",
                                  "gnunet-identity", "-C", "master-zone", NULL))
     return;
 
-  if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+  if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                  NULL, NULL, &st, &code,
                                  "gnunet-identity",
                                  "gnunet-identity", "-C", "private-zone", NULL))
     return;
 
-  if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+  if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                  NULL, NULL, &st, &code,
                                  "gnunet-identity",
                                  "gnunet-identity", "-C", "sks-zone", NULL))
     return;
 
-  if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+  if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                  NULL, NULL, &st, &code,
                                  "gnunet-identity",
                                  "gnunet-identity", "-e", "master-zone", "-s",
                                  "gns-master", NULL))
     return;
 
-  if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+  if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                  NULL, NULL, &st, &code,
                                  "gnunet-identity",
                                  "gnunet-identity", "-e", "master-zone", "-s",
                                  "namestore", NULL))
     return;
 
-  if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+  if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                  NULL, NULL, &st, &code,
                                  "gnunet-identity",
                                  "gnunet-identity", "-e", "master-zone", "-s",
                                  "gns-proxy", NULL))
     return;
 
-  if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+  if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                  NULL, NULL, &st, &code,
                                  "gnunet-identity",
                                  "gnunet-identity", "-e", "master-zone", "-s",
                                  "gns-intercept", NULL))
     return;
 
-  if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+  if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                  NULL, NULL, &st, &code,
                                  "gnunet-identity",
                                  "gnunet-identity", "-e", "private-zone", "-s",
                                  "gns-private", NULL))
     return;
 
-  if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+  if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                  NULL, NULL, &st, &code,
                                  "gnunet-identity",
                                  "gnunet-identity", "-e", "sks-zone", "-s",
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c
index eb6c6852e..d38204ef1 100644
--- a/src/gns/gnunet-gns-proxy.c
+++ b/src/gns/gnunet-gns-proxy.c
@@ -831,9 +831,9 @@ cleanup_s5r (struct Socks5Request *s5r)
   GNUNET_CONTAINER_DLL_remove (s5r_head,
                                s5r_tail,
                                s5r);
-  GNUNET_free_non_null (s5r->domain);
-  GNUNET_free_non_null (s5r->leho);
-  GNUNET_free_non_null (s5r->url);
+  GNUNET_free (s5r->domain);
+  GNUNET_free (s5r->leho);
+  GNUNET_free (s5r->url);
   for (unsigned int i = 0; i < s5r->num_danes; i++)
     GNUNET_free (s5r->dane_data[i]);
   GNUNET_free (s5r);
@@ -1311,8 +1311,8 @@ curl_check_hdr (void *buffer,
   }
 cleanup:
   GNUNET_free (ndup);
-  GNUNET_free_non_null (new_cookie_hdr);
-  GNUNET_free_non_null (new_location);
+  GNUNET_free (new_cookie_hdr);
+  GNUNET_free (new_location);
   return bytes;
 }
 
@@ -2446,14 +2446,14 @@ kill_httpd (struct MhdHttpList *hd)
   GNUNET_CONTAINER_DLL_remove (mhd_httpd_head,
                                mhd_httpd_tail,
                                hd);
-  GNUNET_free_non_null (hd->domain);
+  GNUNET_free (hd->domain);
   MHD_stop_daemon (hd->daemon);
   if (NULL != hd->httpd_task)
   {
     GNUNET_SCHEDULER_cancel (hd->httpd_task);
     hd->httpd_task = NULL;
   }
-  GNUNET_free_non_null (hd->proxy_cert);
+  GNUNET_free (hd->proxy_cert);
   if (hd == httpd)
     httpd = NULL;
   GNUNET_free (hd);
@@ -2657,7 +2657,7 @@ load_key_from_file (gnutls_x509_privkey_t key,
                 _ ("Unable to import private key from file `%s'\n"),
                 keyfile);
   }
-  GNUNET_free_non_null (key_data.data);
+  GNUNET_free (key_data.data);
   return (GNUTLS_E_SUCCESS != ret) ? GNUNET_SYSERR : GNUNET_OK;
 }
 
@@ -2689,7 +2689,7 @@ load_cert_from_file (gnutls_x509_crt_t crt,
                 _ ("Unable to import certificate from `%s'\n"),
                 certfile);
   }
-  GNUNET_free_non_null (cert_data.data);
+  GNUNET_free (cert_data.data);
   return (GNUTLS_E_SUCCESS != ret) ? GNUNET_SYSERR : GNUNET_OK;
 }
 
@@ -2921,7 +2921,7 @@ setup_data_transfer (struct Socks5Request *s5r)
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 _ ("Failed to pass client to MHD\n"));
     cleanup_s5r (s5r);
-    GNUNET_free_non_null (domain);
+    GNUNET_free (domain);
     return;
   }
   s5r->hd = hd;
@@ -2929,7 +2929,7 @@ setup_data_transfer (struct Socks5Request *s5r)
   s5r->timeout_task = GNUNET_SCHEDULER_add_delayed (HTTP_HANDSHAKE_TIMEOUT,
                                                     &timeout_s5r_handshake,
                                                     s5r);
-  GNUNET_free_non_null (domain);
+  GNUNET_free (domain);
 }
 
 
@@ -3145,7 +3145,7 @@ handle_gns_result (void *cls,
       break;
 
     case GNUNET_GNSRECORD_TYPE_LEHO:
-      GNUNET_free_non_null (s5r->leho);
+      GNUNET_free (s5r->leho);
       s5r->leho = GNUNET_strndup (r->data,
                                   r->data_size);
       break;
@@ -3732,10 +3732,10 @@ run (void *cls,
     gnutls_x509_crt_deinit (proxy_ca.cert);
     gnutls_x509_privkey_deinit (proxy_ca.key);
     gnutls_global_deinit ();
-    GNUNET_free_non_null (cafile_cfg);
+    GNUNET_free (cafile_cfg);
     return;
   }
-  GNUNET_free_non_null (cafile_cfg);
+  GNUNET_free (cafile_cfg);
   if (NULL == (gns_handle = GNUNET_GNS_connect (cfg)))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -3900,7 +3900,7 @@ main (int argc,
                          options,
                          &run, NULL)) ? 0 : 1;
   MHD_destroy_response (curl_failure_response);
-  GNUNET_free_non_null ((char *) argv);
+  GNUNET_free_nz ((char *) argv);
   return ret;
 }
 
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c
index 7d398c168..cb75b23c7 100644
--- a/src/gns/gnunet-service-gns_resolver.c
+++ b/src/gns/gnunet-service-gns_resolver.c
@@ -1675,7 +1675,7 @@ recursive_cname_resolution (struct GNS_ResolverHandle *rh,
       (off != rd->data_size))
   {
     GNUNET_break_op (0);  /* record not well-formed */
-    GNUNET_free_non_null (cname);
+    GNUNET_free (cname);
     fail_resolution (rh);
     return;
   }
@@ -1777,8 +1777,8 @@ recursive_gns2dns_resolution (struct GNS_ResolverHandle *rh,
         (off != rd[i].data_size))
     {
       GNUNET_break_op (0);
-      GNUNET_free_non_null (n);
-      GNUNET_free_non_null (ip);
+      GNUNET_free (n);
+      GNUNET_free (ip);
       continue;
     }
     /* resolve 'ip' to determine the IP(s) of the DNS
@@ -1983,7 +1983,7 @@ handle_gns_resolution_result (void *cls,
           (off != rd[0].data_size))
       {
         GNUNET_break_op (0);
-        GNUNET_free_non_null (cname);
+        GNUNET_free (cname);
         fail_resolution (rh);
         return;
       }
@@ -2137,7 +2137,7 @@ handle_gns_resolution_result (void *cls,
               rd_off++;
             }
           }
-          GNUNET_free_non_null (cname);
+          GNUNET_free (cname);
         }
         break;
 
@@ -2993,7 +2993,7 @@ GNS_resolver_lookup_cancel (struct GNS_ResolverHandle *rh)
                                  dr);
     GNUNET_free (dr);
   }
-  GNUNET_free_non_null (rh->leho);
+  GNUNET_free (rh->leho);
   GNUNET_free (rh->name);
   GNUNET_free (rh);
 }
diff --git a/src/gns/nss/nss_gns.c b/src/gns/nss/nss_gns.c
index 36799ba3a..77b4340ee 100644
--- a/src/gns/nss/nss_gns.c
+++ b/src/gns/nss/nss_gns.c
@@ -38,7 +38,7 @@
 /** macro to align idx to 32bit boundary */
 #define ALIGN(idx) do { \
     if (idx % sizeof(void*)) \
-      idx += (sizeof(void*) - idx % sizeof(void*)); /* Align on 32 bit boundary */ \
+    idx += (sizeof(void*) - idx % sizeof(void*));   /* Align on 32 bit boundary */ \
 } while (0)
 
 
diff --git a/src/gns/nss/nss_gns_query.c b/src/gns/nss/nss_gns_query.c
index 11e46ad7f..96e8e10da 100644
--- a/src/gns/nss/nss_gns_query.c
+++ b/src/gns/nss/nss_gns_query.c
@@ -150,7 +150,7 @@ query_gns:
     if (1 == retry)
       return -2; /* no go -> service unavailable */
     retry = 1;
-    system("gnunet-arm -s");
+    system ("gnunet-arm -s");
     goto query_gns; /* Try again */
   }
   if (3 == WEXITSTATUS (ret))
diff --git a/src/gns/plugin_gnsrecord_gns.c b/src/gns/plugin_gnsrecord_gns.c
index 370bf1da4..81f2b9eff 100644
--- a/src/gns/plugin_gnsrecord_gns.c
+++ b/src/gns/plugin_gnsrecord_gns.c
@@ -75,14 +75,14 @@ gns_value_to_string (void *cls,
       if (NULL == ns)
       {
         GNUNET_break_op (0);
-        GNUNET_free_non_null (ns);
+        GNUNET_free (ns);
         return NULL;
       }
       /* DNS server IP/name must be UTF-8 */
       ip = GNUNET_strdup (&((const char*) data)[off]);
       GNUNET_asprintf (&nstr, "%s@%s", ns, ip);
-      GNUNET_free_non_null (ns);
-      GNUNET_free_non_null (ip);
+      GNUNET_free (ns);
+      GNUNET_free (ip);
       return nstr;
     }
 
diff --git a/src/gns/plugin_rest_gns.c b/src/gns/plugin_rest_gns.c
index feb333350..37313c529 100644
--- a/src/gns/plugin_rest_gns.c
+++ b/src/gns/plugin_rest_gns.c
@@ -461,7 +461,7 @@ libgnunet_plugin_rest_gns_done (void *cls)
 
   plugin->cfg = NULL;
 
-  GNUNET_free_non_null (allow_methods);
+  GNUNET_free (allow_methods);
   GNUNET_free (api);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Gns REST plugin is finished\n");
   return NULL;
diff --git a/src/gns/test_gns_lookup.conf b/src/gns/test_gns_lookup.conf
index 130d190e7..db0b4bfbe 100644
--- a/src/gns/test_gns_lookup.conf
+++ b/src/gns/test_gns_lookup.conf
@@ -23,7 +23,8 @@ DNS_ROOT=PD67SGHF3E0447TU9HADIVU9OM7V4QHTOG0EBU69TFRI2LG63DR0
 #PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=/tmp/ns_log
 
 [revocation]
-WORKBITS = 1
+WORKBITS = 2
+EPOCH_DURATION = 365 d
 
 [dhtcache]
 QUOTA = 1 MB
diff --git a/src/gns/test_gns_proxy.c b/src/gns/test_gns_proxy.c
index 12f3f8625..13764d520 100644
--- a/src/gns/test_gns_proxy.c
+++ b/src/gns/test_gns_proxy.c
@@ -139,7 +139,7 @@ load_key_from_file (gnutls_x509_privkey_t key,
                 _ ("Unable to import private key from file `%s'\n"),
                 keyfile);
   }
-  GNUNET_free_non_null (key_data.data);
+  GNUNET_free (key_data.data);
   return (GNUTLS_E_SUCCESS != ret) ? GNUNET_SYSERR : GNUNET_OK;
 }
 
@@ -171,7 +171,7 @@ load_cert_from_file (gnutls_x509_crt_t crt,
                 _ ("Unable to import certificate from `%s'\n"),
                 certfile);
   }
-  GNUNET_free_non_null (cert_data.data);
+  GNUNET_free (cert_data.data);
   return (GNUTLS_E_SUCCESS != ret) ? GNUNET_SYSERR : GNUNET_OK;
 }
 
@@ -245,7 +245,7 @@ do_shutdown ()
     MHD_stop_daemon (mhd);
     mhd = NULL;
   }
-  GNUNET_free_non_null (url);
+  GNUNET_free (url);
 
   if (NULL != proxy_proc)
   {
@@ -528,6 +528,8 @@ run (void *cls,
 int
 main (int argc, char *const *argv)
 {
+  char *tmp_argv;
+
   struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_option_uint16 ('p',
                                  "port",
@@ -557,7 +559,7 @@ main (int argc, char *const *argv)
   }
   if (GNUNET_OK !=
       GNUNET_STRINGS_get_utf8_args (argc, argv,
-                                    &argc, &argv))
+                                    &argc, &tmp_argv))
     return 2;
   GNUNET_log_setup ("gnunet-gns-proxy-test",
                     "WARNING",
@@ -568,7 +570,7 @@ main (int argc, char *const *argv)
                                        options,
                                        &run, NULL))
     return 1;
-  GNUNET_free_non_null ((char *) argv);
+  GNUNET_free (tmp_argv);
   return global_ret;
 }