GNUNET_free_non_null -> GNUNET_free

18 files changed, 60 insertions, 59 deletions

diff --git a/src/testbed/gnunet-helper-testbed.c b/src/testbed/gnunet-helper-testbed.c
index 4c1637db6..24c212d6b 100644
--- a/src/testbed/gnunet-helper-testbed.c
+++ b/src/testbed/gnunet-helper-testbed.c
@@ -405,7 +405,7 @@ tokenizer_cb (void *cls, const struct GNUNET_MessageHeader *message)
     GNUNET_free (evstr);
     evstr = NULL;
   }
-  GNUNET_free_non_null (hostname);
+  GNUNET_free (hostname);
   hostname = NULL;
   GNUNET_assert (NULL != test_system);
   GNUNET_assert (GNUNET_OK ==
diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c
index 21a9d0a51..3ef99ae25 100644
--- a/src/testbed/gnunet-service-testbed.c
+++ b/src/testbed/gnunet-service-testbed.c
@@ -550,8 +550,8 @@ handle_add_host (void *cls,
   GNUNET_strlcpy (hostname, ptr, hostname_length + 1);
   if (NULL == (host_cfg = GNUNET_TESTBED_extract_config_ (&msg->header)))
   {
-    GNUNET_free_non_null (username);
-    GNUNET_free_non_null (hostname);
+    GNUNET_free (username);
+    GNUNET_free (hostname);
     GNUNET_break_op (0);
     GNUNET_SERVICE_client_drop (client);
     return;
@@ -570,7 +570,7 @@ handle_add_host (void *cls,
                                              username,
                                              host_cfg,
                                              ntohs (msg->ssh_port));
-  GNUNET_free_non_null (username);
+  GNUNET_free (username);
   GNUNET_free (hostname);
   GNUNET_CONFIGURATION_destroy (host_cfg);
   if (NULL == host)
@@ -757,17 +757,17 @@ shutdown_task (void *cls)
   for (id = 0; id < GST_host_list_size; id++)
     if (NULL != GST_host_list[id])
       GNUNET_TESTBED_host_destroy (GST_host_list[id]);
-  GNUNET_free_non_null (GST_host_list);
+  GNUNET_free (GST_host_list);
   if (NULL != GST_context)
   {
-    GNUNET_free_non_null (GST_context->master_ip);
+    GNUNET_free (GST_context->master_ip);
     if (NULL != GST_context->system)
       GNUNET_TESTING_system_destroy (GST_context->system,
                                      GNUNET_YES);
     GNUNET_free (GST_context);
     GST_context = NULL;
   }
-  GNUNET_free_non_null (hostname);
+  GNUNET_free (hostname);
   /* Free hello cache */
   GST_cache_clear ();
   GST_connection_pool_destroy ();
diff --git a/src/testbed/gnunet-service-testbed_cache.c b/src/testbed/gnunet-service-testbed_cache.c
index f87f39067..5e74b865a 100644
--- a/src/testbed/gnunet-service-testbed_cache.c
+++ b/src/testbed/gnunet-service-testbed_cache.c
@@ -120,7 +120,7 @@ static void
 free_entry (struct CacheEntry *entry)
 {
   GNUNET_CONTAINER_DLL_remove (cache_head, cache_tail, entry);
-  GNUNET_free_non_null (entry->hello);
+  GNUNET_free (entry->hello);
   GNUNET_free (entry);
 }
 
@@ -261,7 +261,7 @@ GST_cache_add_hello (const unsigned int peer_id,
   entry = cache_lookup (peer_id);
   if (NULL == entry)
     entry = add_entry (peer_id);
-  GNUNET_free_non_null (entry->hello);
+  GNUNET_free (entry->hello);
   entry->hello = GNUNET_copy_message (hello);
 }
 
diff --git a/src/testbed/gnunet-service-testbed_connectionpool.c b/src/testbed/gnunet-service-testbed_connectionpool.c
index 7f9c9fd57..7318971b3 100644
--- a/src/testbed/gnunet-service-testbed_connectionpool.c
+++ b/src/testbed/gnunet-service-testbed_connectionpool.c
@@ -687,7 +687,7 @@ oprelease_get_handle_core (void *cls)
     return;
   GNUNET_CORE_disconnect (entry->handle_core);
   entry->handle_core = NULL;
-  GNUNET_free_non_null (entry->peer_identity);
+  GNUNET_free (entry->peer_identity);
   entry->peer_identity = NULL;
 }
 
diff --git a/src/testbed/gnunet-service-testbed_cpustatus.c b/src/testbed/gnunet-service-testbed_cpustatus.c
index 2d490ba8c..70b865c73 100644
--- a/src/testbed/gnunet-service-testbed_cpustatus.c
+++ b/src/testbed/gnunet-service-testbed_cpustatus.c
@@ -649,7 +649,7 @@ GST_stats_destroy ()
     proc_stat = NULL;
   }
 #elif OSX
-  GNUNET_free_non_null (prev_cpu_load);
+  GNUNET_free (prev_cpu_load);
 #endif
   if (NULL != sample_load_task_id)
   {
diff --git a/src/testbed/gnunet-service-testbed_links.c b/src/testbed/gnunet-service-testbed_links.c
index ee00e4be0..fb25d7bcb 100644
--- a/src/testbed/gnunet-service-testbed_links.c
+++ b/src/testbed/gnunet-service-testbed_links.c
@@ -401,7 +401,7 @@ GST_route_list_clear ()
   for (id = 0; id < route_list_size; id++)
     if (NULL != route_list[id])
       GNUNET_free (route_list[id]);
-  GNUNET_free_non_null (route_list);
+  GNUNET_free (route_list);
   route_list = NULL;
 }
 
@@ -508,7 +508,7 @@ GST_slave_list_clear ()
       continue;
     destroy_slave (slave);
   }
-  GNUNET_free_non_null (GST_slave_list);
+  GNUNET_free (GST_slave_list);
   GST_slave_list = NULL;
 }
 
@@ -1104,7 +1104,7 @@ GST_neighbour_list_clean ()
     GNUNET_free (n);
     neighbour_list[id] = NULL;
   }
-  GNUNET_free_non_null (neighbour_list);
+  GNUNET_free (neighbour_list);
 }
 
 
diff --git a/src/testbed/gnunet-service-testbed_oc.c b/src/testbed/gnunet-service-testbed_oc.c
index 262fcfc00..3d13ac8cc 100644
--- a/src/testbed/gnunet-service-testbed_oc.c
+++ b/src/testbed/gnunet-service-testbed_oc.c
@@ -360,7 +360,7 @@ GST_cleanup_focc (struct ForwardedOverlayConnectContext *focc)
   GNUNET_CONTAINER_DLL_remove (rhc->focc_dll_head,
                                rhc->focc_dll_tail,
                                focc);
-  GNUNET_free_non_null (focc->orig_msg);
+  GNUNET_free (focc->orig_msg);
   GNUNET_free (focc);
 }
 
@@ -536,8 +536,8 @@ cleanup_occ (struct OverlayConnectContext *occ)
 
   LOG_DEBUG ("0x%llx: Cleaning up occ\n",
              occ->op_id);
-  GNUNET_free_non_null (occ->emsg);
-  GNUNET_free_non_null (occ->hello);
+  GNUNET_free (occ->emsg);
+  GNUNET_free (occ->hello);
   if (NULL != occ->send_hello_task)
     GNUNET_SCHEDULER_cancel (occ->send_hello_task);
   if (NULL != occ->cleanup_task)
@@ -727,7 +727,7 @@ overlay_connect_notify (void *cls,
     cleanup_occ_rp2c (&occ->p2ctx.remote);
     break;
   }
-  GNUNET_free_non_null (occ->emsg);
+  GNUNET_free (occ->emsg);
   occ->emsg = NULL;
   send_overlay_connect_success_msg (occ);
   occ->cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup_occ,
@@ -758,7 +758,7 @@ occ_cache_get_handle_ats_occ_cb (void *cls,
 
   GNUNET_assert (OCC_TYPE_LOCAL == occ->type);
   GNUNET_assert (NULL != occ->timeout_task);
-  GNUNET_free_non_null (occ->emsg);
+  GNUNET_free (occ->emsg);
   if (NULL == ac)
   {
     GNUNET_asprintf (&occ->emsg,
@@ -842,7 +842,7 @@ occ_hello_sent_cb (void *cls)
   lp2c->ohh = NULL;
 
   GNUNET_assert (NULL == occ->send_hello_task);
-  GNUNET_free_non_null (occ->emsg);
+  GNUNET_free (occ->emsg);
 
   GNUNET_asprintf (&occ->emsg,
                    "0x%llx: Timeout while acquiring ATS of %s from cache",
@@ -1092,7 +1092,7 @@ hello_update_cb (void *cls,
   GST_connection_pool_get_handle_done (occ->cgh_p1th);
   occ->cgh_p1th = NULL;
   occ->p1th_ = NULL;
-  GNUNET_free_non_null (occ->emsg);
+  GNUNET_free (occ->emsg);
   occ->emsg = NULL;
   p2_transport_connect (occ);
 }
@@ -1118,7 +1118,7 @@ p1_transport_connect_cache_callback (void *cls,
 {
   struct OverlayConnectContext *occ = cls;
 
-  GNUNET_free_non_null (occ->emsg);
+  GNUNET_free (occ->emsg);
   occ->emsg = NULL;
   if (NULL == th)
   {
@@ -1166,7 +1166,7 @@ occ_cache_get_handle_core_cb (void *cls,
   const struct GNUNET_MessageHeader *hello;
 
   GNUNET_assert (NULL != occ->timeout_task);
-  GNUNET_free_non_null (occ->emsg);
+  GNUNET_free (occ->emsg);
   if ((NULL == ch) || (NULL == my_identity))
   {
     GNUNET_asprintf (&occ->emsg,
@@ -1249,7 +1249,7 @@ overlay_connect_get_config (void *cls,
   cmsg =
     (const struct GNUNET_TESTBED_PeerConfigurationInformationMessage *) msg;
   occ->other_peer_identity = cmsg->peer_identity;
-  GNUNET_free_non_null (occ->emsg);
+  GNUNET_free (occ->emsg);
   GNUNET_asprintf (&occ->emsg,
                    "0x%llx: Timeout while connecting to CORE of peer with "
                    "id: %u",
@@ -1508,7 +1508,7 @@ p2_controller_connect_cb (void *cls,
                                            &cmsg.header,
                                            &overlay_connect_get_config,
                                            occ);
-  GNUNET_free_non_null (occ->emsg);
+  GNUNET_free (occ->emsg);
   GNUNET_asprintf (&occ->emsg,
                    "0x%llx: Timeout while getting peer identity of peer "
                    "with id: %u",
@@ -1674,7 +1674,7 @@ cleanup_rocc (struct RemoteOverlayConnectCtx *rocc)
   if ((GNUNET_YES == rocc->peer->destroy_flag) &&
       (0 == rocc->peer->reference_cnt))
     GST_destroy_peer (rocc->peer);
-  GNUNET_free_non_null (rocc->hello);
+  GNUNET_free (rocc->hello);
   GNUNET_CONTAINER_DLL_remove (roccq_head,
                                roccq_tail,
                                rocc);
diff --git a/src/testbed/gnunet-service-testbed_peers.c b/src/testbed/gnunet-service-testbed_peers.c
index d3d597d4f..0184635fa 100644
--- a/src/testbed/gnunet-service-testbed_peers.c
+++ b/src/testbed/gnunet-service-testbed_peers.c
@@ -1084,7 +1084,7 @@ handle_peer_reconfigure (void *cls,
     GST_send_operation_success_msg (client,
                                     op_id);
     GNUNET_SERVICE_client_continue (client);
-    GNUNET_free_non_null (emsg);
+    GNUNET_free (emsg);
     return;
   }
   prc = GNUNET_new (struct PeerReconfigureContext);
@@ -1264,7 +1264,7 @@ ret:
   else
     GST_send_operation_success_msg (mctx->client,
                                     mctx->op_id);
-  GNUNET_free_non_null (emsg);
+  GNUNET_free (emsg);
   cleanup_mctx (mctx);
 }
 
@@ -1459,7 +1459,7 @@ GST_destroy_peers ()
     }
     GNUNET_free (peer);
   }
-  GNUNET_free_non_null (GST_peer_list);
+  GNUNET_free (GST_peer_list);
   GST_peer_list = NULL;
   GST_peer_list_size = 0;
 }
diff --git a/src/testbed/gnunet_testbed_mpi_spawn.c b/src/testbed/gnunet_testbed_mpi_spawn.c
index 8b67523a1..353cc2881 100644
--- a/src/testbed/gnunet_testbed_mpi_spawn.c
+++ b/src/testbed/gnunet_testbed_mpi_spawn.c
@@ -321,7 +321,7 @@ main (int argc, char *argv[])
   GNUNET_SIGNAL_handler_uninstall (shc_chld);
   shc_chld = NULL;
   GNUNET_DISK_pipe_close (sigpipe);
-  GNUNET_free_non_null (fn);
+  GNUNET_free (fn);
   if (GNUNET_OK != ret)
     return ret;
   return 0;
diff --git a/src/testbed/test_gnunet_helper_testbed.c b/src/testbed/test_gnunet_helper_testbed.c
index 7c4d4bad5..d4eec0269 100644
--- a/src/testbed/test_gnunet_helper_testbed.c
+++ b/src/testbed/test_gnunet_helper_testbed.c
@@ -88,7 +88,7 @@ do_shutdown (void *cls)
     GNUNET_SCHEDULER_cancel (abort_task);
   if (NULL != helper)
     GNUNET_HELPER_stop (helper, GNUNET_NO);
-  GNUNET_free_non_null (msg);
+  GNUNET_free (msg);
   if (NULL != cfg)
     GNUNET_CONFIGURATION_destroy (cfg);
 }
diff --git a/src/testbed/test_testbed_api_statistics.c b/src/testbed/test_testbed_api_statistics.c
index 2d0e2d6b8..dc305d008 100644
--- a/src/testbed/test_testbed_api_statistics.c
+++ b/src/testbed/test_testbed_api_statistics.c
@@ -198,7 +198,7 @@ main (int argc, char **argv)
                                   NUM_PEERS,
                                   1LL, NULL, NULL,
                                   &test_master, NULL);
-  GNUNET_free_non_null (seen_peers);
+  GNUNET_free (seen_peers);
   if (GNUNET_OK != result)
     return 1;
   return 0;
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c
index 9fe5bccdc..697783d96 100644
--- a/src/testbed/testbed_api.c
+++ b/src/testbed/testbed_api.c
@@ -1178,7 +1178,7 @@ handle_link_controllers_result (
     LOG_DEBUG ("Not calling callback\n");
   if (NULL != cfg)
     GNUNET_CONFIGURATION_destroy (cfg);
-  GNUNET_free_non_null (emsg);
+  GNUNET_free (emsg);
 }
 
 
@@ -1314,7 +1314,7 @@ handle_barrier_status (void *cls,
     return; /* just initialised; skip cleanup */
 
 cleanup:
-  GNUNET_free_non_null (emsg);
+  GNUNET_free (emsg);
   /**
    * Do not remove the barrier if we did not echo the status back; this is
    * required at the chained testbed controller setup to ensure the only the
@@ -1459,7 +1459,7 @@ oprelease_link_controllers (void *cls)
   case OPC_STATE_FINISHED:
     break;
   }
-  GNUNET_free_non_null (data);
+  GNUNET_free (data);
   GNUNET_free (opc);
 }
 
diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c
index 95463e44d..f7352250d 100644
--- a/src/testbed/testbed_api_hosts.c
+++ b/src/testbed/testbed_api_hosts.c
@@ -506,7 +506,7 @@ GNUNET_TESTBED_hosts_load_from_file (
       else
         (void) GNUNET_TESTBED_host_create (hostname, username, cfg, port);
       count++;
-      GNUNET_free_non_null (username);
+      GNUNET_free (username);
       GNUNET_free (hostname);
       buf = &data[offset + 1];
     }
@@ -611,26 +611,27 @@ GNUNET_TESTBED_hosts_load_from_loadleveler (
 void
 GNUNET_TESTBED_host_destroy (struct GNUNET_TESTBED_Host *host)
 {
-  struct RegisteredController *rc;
-  uint32_t id;
-
   GNUNET_assert (host->id < host_list_size);
   GNUNET_assert (host_list[host->id] == host);
   host_list[host->id] = NULL;
   /* clear registered controllers list */
-  for (rc = host->rc_head; NULL != rc; rc = host->rc_head)
+  for (struct RegisteredController *rc = host->rc_head;
+       NULL != rc;
+       rc = host->rc_head)
   {
     GNUNET_CONTAINER_DLL_remove (host->rc_head, host->rc_tail, rc);
     GNUNET_free (rc);
   }
-  GNUNET_free_non_null ((char *) host->username);
-  GNUNET_free_non_null ((char *) host->hostname);
+  GNUNET_free_nz ((char *) host->username);
+  GNUNET_free_nz ((char *) host->hostname);
   GNUNET_TESTBED_operation_queue_destroy_ (
     host->opq_parallel_overlay_connect_operations);
   GNUNET_CONFIGURATION_destroy (host->cfg);
   GNUNET_free (host);
   while (host_list_size >= HOST_LIST_GROW_STEP)
   {
+    uint32_t id;
+
     for (id = host_list_size - 1; id > host_list_size - HOST_LIST_GROW_STEP;
          id--)
       if (NULL != host_list[id])
@@ -1223,7 +1224,7 @@ GNUNET_TESTBED_controller_destroy_ (struct GNUNET_TESTBED_ControllerProc *cproc)
     free_argv (cproc->helper_argv);
   cproc->host->controller_started = GNUNET_NO;
   cproc->host->locked = GNUNET_NO;
-  GNUNET_free_non_null (cproc->msg);
+  GNUNET_free (cproc->msg);
   GNUNET_free (cproc);
 }
 
diff --git a/src/testbed/testbed_api_operations.c b/src/testbed/testbed_api_operations.c
index a406c0e0b..ae85e0842 100644
--- a/src/testbed/testbed_api_operations.c
+++ b/src/testbed/testbed_api_operations.c
@@ -696,7 +696,7 @@ decide_capacity (struct OperationQueue *opq,
   }
 
 ret:
-  GNUNET_free_non_null (evict_entries);
+  GNUNET_free (evict_entries);
   if (NULL != ops_)
     *ops_ = ops;
   else
@@ -771,7 +771,7 @@ check_readiness (struct GNUNET_TESTBED_Operation *op)
     if (GNUNET_NO == decide_capacity (op->queues[i], op->qentries[i],
                                       &ops, &n_ops))
     {
-      GNUNET_free_non_null (evict_ops);
+      GNUNET_free (evict_ops);
       return GNUNET_NO;
     }
     if (NULL == ops)
@@ -842,7 +842,7 @@ cleanup_tslots (struct OperationQueue *queue)
       continue;
     GNUNET_CONTAINER_DLL_remove (op->tslots_head, op->tslots_tail, tslot);
   }
-  GNUNET_free_non_null (fctx->tslots_freeptr);
+  GNUNET_free (fctx->tslots_freeptr);
   fctx->tslots_freeptr = NULL;
   fctx->alloc_head = NULL;
   fctx->alloc_tail = NULL;
@@ -1337,7 +1337,7 @@ GNUNET_TESTBED_operation_release_ (struct GNUNET_TESTBED_Operation *op)
     }
     GNUNET_free (entry);
   }
-  GNUNET_free_non_null (op->qentries);
+  GNUNET_free (op->qentries);
   GNUNET_free (op->queues);
   GNUNET_free (op->nres);
   if (NULL != op->release)
@@ -1376,7 +1376,7 @@ GNUNET_TESTBED_operations_fini ()
       warn = 1;
     queue_destroy (queue);
   }
-  GNUNET_free_non_null (expired_opqs);
+  GNUNET_free (expired_opqs);
   n_expired_opqs = 0;
   if (warn)
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
diff --git a/src/testbed/testbed_api_peers.c b/src/testbed/testbed_api_peers.c
index 7bd895871..99d30e85b 100644
--- a/src/testbed/testbed_api_peers.c
+++ b/src/testbed/testbed_api_peers.c
@@ -952,7 +952,7 @@ oprelease_manage_service (void *cls)
   case OPC_STATE_FINISHED:
     break;
   }
-  GNUNET_free_non_null (data);
+  GNUNET_free (data);
   GNUNET_free (opc);
 }
 
diff --git a/src/testbed/testbed_api_statistics.c b/src/testbed/testbed_api_statistics.c
index 4858208cc..7fe47d2a0 100644
--- a/src/testbed/testbed_api_statistics.c
+++ b/src/testbed/testbed_api_statistics.c
@@ -378,8 +378,8 @@ oprelease_get_stats (void *cls)
     }
     GNUNET_free (sc->ops);
   }
-  GNUNET_free_non_null (sc->subsystem);
-  GNUNET_free_non_null (sc->name);
+  GNUNET_free (sc->subsystem);
+  GNUNET_free (sc->name);
   GNUNET_free (sc);
   if (GNUNET_YES ==
       GNUNET_TESTBED_operation_queue_destroy_empty_ (no_wait_queue))
diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c
index 7be8054ca..7ae30e0c6 100644
--- a/src/testbed/testbed_api_testbed.c
+++ b/src/testbed/testbed_api_testbed.c
@@ -472,11 +472,11 @@ cleanup (struct GNUNET_TESTBED_RunHandle *rc)
     GNUNET_TESTBED_host_destroy (rc->h);
   for (hid = 0; hid < rc->num_hosts; hid++)
     GNUNET_TESTBED_host_destroy (rc->hosts[hid]);
-  GNUNET_free_non_null (rc->hosts);
+  GNUNET_free (rc->hosts);
   if (NULL != rc->cfg)
     GNUNET_CONFIGURATION_destroy (rc->cfg);
-  GNUNET_free_non_null (rc->topo_file);
-  GNUNET_free_non_null (rc->trusted_ip);
+  GNUNET_free (rc->topo_file);
+  GNUNET_free (rc->trusted_ip);
   GNUNET_free (rc);
 }
 
@@ -863,7 +863,7 @@ event_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
   case RC_PEERS_CREATED:
   case RC_READY:
     rc->state = RC_PEERS_SHUTDOWN;
-    GNUNET_free_non_null (rc->peers);
+    GNUNET_free (rc->peers);
     rc->peers = NULL;
     DEBUG ("Peers shut down in %s\n", prof_time (rc));
     GNUNET_SCHEDULER_shutdown ();
diff --git a/src/testbed/testbed_api_topology.c b/src/testbed/testbed_api_topology.c
index 9ffe7f47d..1d765af92 100644
--- a/src/testbed/testbed_api_topology.c
+++ b/src/testbed/testbed_api_topology.c
@@ -1183,7 +1183,7 @@ _exit:
         struct TopologyContextOverlay *overlay;
 
         overlay = &tc->u.overlay;
-        GNUNET_free_non_null (overlay->link_array);
+        GNUNET_free (overlay->link_array);
         overlay->link_array = NULL;
       }
       break;
@@ -1193,7 +1193,7 @@ _exit:
         struct TopologyContextUnderlay *underlay;
 
         underlay = &tc->u.underlay;
-        GNUNET_free_non_null (underlay->link_array);
+        GNUNET_free (underlay->link_array);
         underlay->link_array = NULL;
       }
       break;
@@ -1428,7 +1428,7 @@ GNUNET_TESTBED_overlay_configure_topology_va (void *op_cls,
     default:
       GNUNET_break (0);         /* Should not use any other option apart from
                                  * the ones handled here */
-      GNUNET_free_non_null (overlay->link_array);
+      GNUNET_free (overlay->link_array);
       GNUNET_free (tc);
       return NULL;
     }
@@ -1653,7 +1653,7 @@ GNUNET_TESTBED_underlay_construct_ (int num_peers,
       break;
     }
   }
-  GNUNET_free_non_null (underlay->link_array);
+  GNUNET_free (underlay->link_array);
   return ret;
 }