GNUNET_free_non_null is gone, use GNUNET_free

30 files changed, 52 insertions, 52 deletions

diff --git a/src/auditor/taler-auditor-exchange.c b/src/auditor/taler-auditor-exchange.c
index 41df335b3..2091031cb 100644
--- a/src/auditor/taler-auditor-exchange.c
+++ b/src/auditor/taler-auditor-exchange.c
@@ -111,10 +111,10 @@ main (int argc,
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Malformed configuration file `%s', exit ...\n",
                 cfgfile);
-    GNUNET_free_non_null (cfgfile);
+    GNUNET_free (cfgfile);
     return 1;
   }
-  GNUNET_free_non_null (cfgfile);
+  GNUNET_free (cfgfile);
 
   if (! remove_flag)
   {
diff --git a/src/auditor/taler-auditor-httpd.c b/src/auditor/taler-auditor-httpd.c
index d326f0f62..d1e3c2de5 100644
--- a/src/auditor/taler-auditor-httpd.c
+++ b/src/auditor/taler-auditor-httpd.c
@@ -579,10 +579,10 @@ main (int argc,
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Malformed configuration file `%s', exiting ...\n",
                 cfgfile);
-    GNUNET_free_non_null (cfgfile);
+    GNUNET_free (cfgfile);
     return 1;
   }
-  GNUNET_free_non_null (cfgfile);
+  GNUNET_free (cfgfile);
 
   if (GNUNET_OK !=
       auditor_serve_process_config ())
diff --git a/src/auditor/taler-auditor-sign.c b/src/auditor/taler-auditor-sign.c
index 7dd7605fb..af6cec2c4 100644
--- a/src/auditor/taler-auditor-sign.c
+++ b/src/auditor/taler-auditor-sign.c
@@ -213,10 +213,10 @@ main (int argc,
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Malformed configuration file `%s', exiting ...\n",
                 cfgfile);
-    GNUNET_free_non_null (cfgfile);
+    GNUNET_free (cfgfile);
     return 1;
   }
-  GNUNET_free_non_null (cfgfile);
+  GNUNET_free (cfgfile);
   if ( (NULL == auditor_key_file) &&
        (GNUNET_OK !=
         GNUNET_CONFIGURATION_get_value_filename (cfg,
diff --git a/src/auditor/taler-helper-auditor-coins.c b/src/auditor/taler-helper-auditor-coins.c
index 158baa8b3..1a03ac72d 100644
--- a/src/auditor/taler-helper-auditor-coins.c
+++ b/src/auditor/taler-helper-auditor-coins.c
@@ -1351,7 +1351,7 @@ refresh_session_cb (void *cls,
 
     if (GNUNET_OK != reveal_ctx.err)
     {
-      GNUNET_free_non_null (reveal_ctx.new_issues);
+      GNUNET_free (reveal_ctx.new_issues);
       return (GNUNET_SYSERR == reveal_ctx.err) ? GNUNET_SYSERR : GNUNET_OK;
     }
 
@@ -1458,7 +1458,7 @@ refresh_session_cb (void *cls,
                               &value);
       }
     }
-    GNUNET_free_non_null (reveal_ctx.new_issues);
+    GNUNET_free (reveal_ctx.new_issues);
   }
 
   /* update old coin's denomination balance */
diff --git a/src/auditor/taler-helper-auditor-reserves.c b/src/auditor/taler-helper-auditor-reserves.c
index 3460515a2..0b140e740 100644
--- a/src/auditor/taler-helper-auditor-reserves.c
+++ b/src/auditor/taler-helper-auditor-reserves.c
@@ -1269,7 +1269,7 @@ verify_reserve_balance (void *cls,
                  GNUNET_CONTAINER_multihashmap_remove (rc->reserves,
                                                        key,
                                                        rs));
-  GNUNET_free_non_null (rs->sender_account);
+  GNUNET_free (rs->sender_account);
   GNUNET_free (rs);
   return ret;
 }
diff --git a/src/bank-lib/fakebank.c b/src/bank-lib/fakebank.c
index 6df6cdfad..699acb51b 100644
--- a/src/bank-lib/fakebank.c
+++ b/src/bank-lib/fakebank.c
@@ -1314,7 +1314,7 @@ handle_mhd_request (void *cls,
                upload_data,
                upload_data_size,
                con_cls);
-  GNUNET_free_non_null (account);
+  GNUNET_free (account);
   return ret;
 }
 
diff --git a/src/benchmark/taler-exchange-benchmark.c b/src/benchmark/taler-exchange-benchmark.c
index 57fde4306..7054e01e2 100644
--- a/src/benchmark/taler-exchange-benchmark.c
+++ b/src/benchmark/taler-exchange-benchmark.c
@@ -993,7 +993,7 @@ main (int argc,
                                    argc,
                                    argv)))
   {
-    GNUNET_free_non_null (cfg_filename);
+    GNUNET_free (cfg_filename);
     return BAD_CLI_ARG;
   }
   GNUNET_log_setup ("taler-exchange-benchmark",
@@ -1010,7 +1010,7 @@ main (int argc,
   else
   {
     TALER_LOG_ERROR ("Unknown mode given: '%s'\n", mode_str);
-    GNUNET_free_non_null (cfg_filename);
+    GNUNET_free (cfg_filename);
     return BAD_CONFIG_FILE;
   }
   if (NULL == cfg_filename)
diff --git a/src/curl/curl.c b/src/curl/curl.c
index dd1194906..9e9de6810 100644
--- a/src/curl/curl.c
+++ b/src/curl/curl.c
@@ -111,6 +111,6 @@ TALER_curl_easy_post_finished (struct TALER_CURL_PostContext *ctx)
 {
   curl_slist_free_all (ctx->headers);
   ctx->headers = NULL;
-  GNUNET_free_non_null (ctx->json_enc);
+  GNUNET_free (ctx->json_enc);
   ctx->json_enc = NULL;
 }
diff --git a/src/exchange/taler-exchange-httpd.c b/src/exchange/taler-exchange-httpd.c
index df01b01be..c614b711e 100644
--- a/src/exchange/taler-exchange-httpd.c
+++ b/src/exchange/taler-exchange-httpd.c
@@ -1300,8 +1300,8 @@ main (int argc,
                  GNUNET_log_setup ("taler-exchange-httpd",
                                    (NULL == loglev) ? "INFO" : loglev,
                                    logfile));
-  GNUNET_free_non_null (loglev);
-  GNUNET_free_non_null (logfile);
+  GNUNET_free (loglev);
+  GNUNET_free (logfile);
   if (NULL == cfgfile)
     cfgfile = GNUNET_strdup (GNUNET_OS_project_data_get ()->user_config_file);
   TEH_cfg = GNUNET_CONFIGURATION_create ();
@@ -1312,10 +1312,10 @@ main (int argc,
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Malformed configuration file `%s', exit ...\n",
                 cfgfile);
-    GNUNET_free_non_null (cfgfile);
+    GNUNET_free (cfgfile);
     return 1;
   }
-  GNUNET_free_non_null (cfgfile);
+  GNUNET_free (cfgfile);
   if (GNUNET_OK !=
       exchange_serve_process_config ())
     return 1;
diff --git a/src/exchange/taler-exchange-httpd_refreshes_reveal.c b/src/exchange/taler-exchange-httpd_refreshes_reveal.c
index a9c998af0..e752ce969 100644
--- a/src/exchange/taler-exchange-httpd_refreshes_reveal.c
+++ b/src/exchange/taler-exchange-httpd_refreshes_reveal.c
@@ -608,7 +608,7 @@ resolve_refreshes_reveal_denominations (struct TEH_KS_StateHandle *key_state,
     if (GNUNET_OK != res)
     {
       for (unsigned int j = 0; j<i; j++)
-        GNUNET_free_non_null (rcds[j].coin_ev);
+        GNUNET_free (rcds[j].coin_ev);
       return (GNUNET_NO == res) ? MHD_YES : MHD_NO;
     }
     rcd->dk = &dkis[i]->denom_pub;
@@ -792,7 +792,7 @@ cleanup:
     rctx->ev_sigs = NULL; /* just to be safe... */
   }
   for (unsigned int i = 0; i<num_fresh_coins; i++)
-    GNUNET_free_non_null (rcds[i].coin_ev);
+    GNUNET_free (rcds[i].coin_ev);
   return ret;
 }
 
diff --git a/src/exchange/taler-exchange-httpd_transfers_get.c b/src/exchange/taler-exchange-httpd_transfers_get.c
index a5b212446..30018a497 100644
--- a/src/exchange/taler-exchange-httpd_transfers_get.c
+++ b/src/exchange/taler-exchange-httpd_transfers_get.c
@@ -395,7 +395,7 @@ free_ctx (struct WtidTransactionContext *ctx)
                                  wdd);
     GNUNET_free (wdd);
   }
-  GNUNET_free_non_null (ctx->wire_method);
+  GNUNET_free (ctx->wire_method);
   ctx->wire_method = NULL;
 }
 
diff --git a/src/exchangedb/exchangedb_accounts.c b/src/exchangedb/exchangedb_accounts.c
index b66b1bcc1..986d4ae2d 100644
--- a/src/exchangedb/exchangedb_accounts.c
+++ b/src/exchangedb/exchangedb_accounts.c
@@ -125,7 +125,7 @@ check_for_account (void *cls,
   }
   GNUNET_free (payto_uri);
   GNUNET_free (method);
-  GNUNET_free_non_null (wire_response_filename);
+  GNUNET_free (wire_response_filename);
 }
 
 
diff --git a/src/exchangedb/plugin_exchangedb_common.c b/src/exchangedb/plugin_exchangedb_common.c
index ce425f824..6db0c0e02 100644
--- a/src/exchangedb/plugin_exchangedb_common.c
+++ b/src/exchangedb/plugin_exchangedb_common.c
@@ -40,8 +40,8 @@ common_free_reserve_history (void *cls,
         struct TALER_EXCHANGEDB_BankTransfer *bt;
 
         bt = rh->details.bank;
-        GNUNET_free_non_null (bt->sender_account_details);
-        GNUNET_free_non_null (bt->wire_reference);
+        GNUNET_free (bt->sender_account_details);
+        GNUNET_free (bt->wire_reference);
         GNUNET_free (bt);
         break;
       }
@@ -68,7 +68,7 @@ common_free_reserve_history (void *cls,
         struct TALER_EXCHANGEDB_ClosingTransfer *closing;
 
         closing = rh->details.closing;
-        GNUNET_free_non_null (closing->receiver_account_details);
+        GNUNET_free (closing->receiver_account_details);
         GNUNET_free (closing);
         break;
       }
diff --git a/src/exchangedb/plugin_exchangedb_postgres.c b/src/exchangedb/plugin_exchangedb_postgres.c
index 641cbbef1..dede901f9 100644
--- a/src/exchangedb/plugin_exchangedb_postgres.c
+++ b/src/exchangedb/plugin_exchangedb_postgres.c
@@ -3830,9 +3830,9 @@ cleanup:
       GNUNET_CRYPTO_rsa_public_key_free (rrc->denom_pub.rsa_public_key);
     if (NULL != rrc->coin_sig.rsa_signature)
       GNUNET_CRYPTO_rsa_signature_free (rrc->coin_sig.rsa_signature);
-    GNUNET_free_non_null (rrc->coin_ev);
+    GNUNET_free (rrc->coin_ev);
   }
-  GNUNET_free_non_null (grctx.rrcs);
+  GNUNET_free (grctx.rrcs);
 
   return qs;
 }
diff --git a/src/exchangedb/test_exchangedb.c b/src/exchangedb/test_exchangedb.c
index fe3ed7854..043095e7b 100644
--- a/src/exchangedb/test_exchangedb.c
+++ b/src/exchangedb/test_exchangedb.c
@@ -706,12 +706,12 @@ drop:
   destroy_denom_key_pair (dkp);
   GNUNET_CRYPTO_rsa_signature_free (
     refresh_session.coin.denom_sig.rsa_signature);
-  GNUNET_free_non_null (new_denom_pubs);
+  GNUNET_free (new_denom_pubs);
   for (unsigned int cnt = 0;
        (NULL != new_dkp) && (cnt < MELT_NEW_COINS) && (NULL != new_dkp[cnt]);
        cnt++)
     destroy_denom_key_pair (new_dkp[cnt]);
-  GNUNET_free_non_null (new_dkp);
+  GNUNET_free (new_dkp);
   return ret;
 }
 
diff --git a/src/exchangedb/test_exchangedb_auditors.c b/src/exchangedb/test_exchangedb_auditors.c
index efd3ffe14..2af1776aa 100644
--- a/src/exchangedb/test_exchangedb_auditors.c
+++ b/src/exchangedb/test_exchangedb_auditors.c
@@ -164,6 +164,6 @@ EXITIF_exit:
   }
   if (NULL != cfg)
     GNUNET_CONFIGURATION_destroy (cfg);
-  GNUNET_free_non_null (tmpfile);
+  GNUNET_free (tmpfile);
   return ret;
 }
diff --git a/src/exchangedb/test_exchangedb_denomkeys.c b/src/exchangedb/test_exchangedb_denomkeys.c
index 1acb61dde..b28b2999b 100644
--- a/src/exchangedb/test_exchangedb_denomkeys.c
+++ b/src/exchangedb/test_exchangedb_denomkeys.c
@@ -194,14 +194,14 @@ main (int argc,
   ret = 0;
 
 EXITIF_exit:
-  GNUNET_free_non_null (enc);
-  GNUNET_free_non_null (tmpfile);
+  GNUNET_free (enc);
+  GNUNET_free (tmpfile);
   if (NULL != tmpdir)
   {
     (void) GNUNET_DISK_directory_remove (tmpdir);
     GNUNET_free (tmpdir);
   }
-  GNUNET_free_non_null (enc_read);
+  GNUNET_free (enc_read);
   if (NULL != dki.denom_priv.rsa_private_key)
     GNUNET_CRYPTO_rsa_private_key_free (dki.denom_priv.rsa_private_key);
   if (NULL != dki.denom_pub.rsa_public_key)
diff --git a/src/lib/auditor_api_handle.c b/src/lib/auditor_api_handle.c
index ccb7cc1eb..731dcf0c3 100644
--- a/src/lib/auditor_api_handle.c
+++ b/src/lib/auditor_api_handle.c
@@ -525,7 +525,7 @@ TALER_AUDITOR_disconnect (struct TALER_AUDITOR_Handle *auditor)
     free_version_request (auditor->vr);
     auditor->vr = NULL;
   }
-  GNUNET_free_non_null (auditor->version);
+  GNUNET_free (auditor->version);
   if (NULL != auditor->retry_task)
   {
     GNUNET_SCHEDULER_cancel (auditor->retry_task);
diff --git a/src/lib/exchange_api_common.c b/src/lib/exchange_api_common.c
index bf8eb5376..e7e87487b 100644
--- a/src/lib/exchange_api_common.c
+++ b/src/lib/exchange_api_common.c
@@ -425,8 +425,8 @@ TALER_EXCHANGE_free_reserve_history (
     switch (rhistory[i].type)
     {
     case TALER_EXCHANGE_RTT_CREDIT:
-      GNUNET_free_non_null (rhistory[i].details.in_details.wire_reference);
-      GNUNET_free_non_null (rhistory[i].details.in_details.sender_url);
+      GNUNET_free (rhistory[i].details.in_details.wire_reference);
+      GNUNET_free (rhistory[i].details.in_details.sender_url);
       break;
     case TALER_EXCHANGE_RTT_WITHDRAWAL:
       break;
diff --git a/src/lib/exchange_api_handle.c b/src/lib/exchange_api_handle.c
index c9c1b09bd..283f77043 100644
--- a/src/lib/exchange_api_handle.c
+++ b/src/lib/exchange_api_handle.c
@@ -1135,7 +1135,7 @@ free_key_data (struct TALER_EXCHANGE_Keys *key_data)
   GNUNET_array_grow (key_data->auditors,
                      key_data->auditors_size,
                      0);
-  GNUNET_free_non_null (key_data->version);
+  GNUNET_free (key_data->version);
   key_data->version = NULL;
 }
 
diff --git a/src/lib/exchange_api_refresh_common.c b/src/lib/exchange_api_refresh_common.c
index 9e9f6e0c0..8ac0bdfc9 100644
--- a/src/lib/exchange_api_refresh_common.c
+++ b/src/lib/exchange_api_refresh_common.c
@@ -61,7 +61,7 @@ TALER_EXCHANGE_free_melt_data_ (struct MeltData *md)
   }
 
   for (unsigned int i = 0; i<TALER_CNC_KAPPA; i++)
-    GNUNET_free_non_null (md->fresh_coins[i]);
+    GNUNET_free (md->fresh_coins[i]);
   /* Finally, clean up a bit... */
   GNUNET_CRYPTO_zero_keys (md,
                            sizeof (struct MeltData));
@@ -613,8 +613,8 @@ TALER_EXCHANGE_refresh_prepare (
   for (unsigned int i = 0; i < TALER_CNC_KAPPA; i++)
   {
     for (unsigned int j = 0; j < fresh_pks_len; j++)
-      GNUNET_free_non_null (rce[i].new_coins[j].coin_ev);
-    GNUNET_free_non_null (rce[i].new_coins);
+      GNUNET_free (rce[i].new_coins[j].coin_ev);
+    GNUNET_free (rce[i].new_coins);
   }
   TALER_EXCHANGE_free_melt_data_ (&md);
   return buf;
diff --git a/src/testing/testing_api_cmd_bank_history_credit.c b/src/testing/testing_api_cmd_bank_history_credit.c
index 0b71c7162..069f62cb0 100644
--- a/src/testing/testing_api_cmd_bank_history_credit.c
+++ b/src/testing/testing_api_cmd_bank_history_credit.c
@@ -549,7 +549,7 @@ history_cleanup (void *cls,
   GNUNET_free (hs->account_url);
   for (unsigned int off = 0; off<hs->total; off++)
     GNUNET_free (hs->h[off].url);
-  GNUNET_free_non_null (hs->h);
+  GNUNET_free (hs->h);
   GNUNET_free (hs);
 }
 
diff --git a/src/testing/testing_api_cmd_bank_history_debit.c b/src/testing/testing_api_cmd_bank_history_debit.c
index ebabf8d94..fcc78bfb7 100644
--- a/src/testing/testing_api_cmd_bank_history_debit.c
+++ b/src/testing/testing_api_cmd_bank_history_debit.c
@@ -552,7 +552,7 @@ history_cleanup (void *cls,
     GNUNET_free (hs->h[off].c_url);
     GNUNET_free (hs->h[off].d_url);
   }
-  GNUNET_free_non_null (hs->h);
+  GNUNET_free (hs->h);
   GNUNET_free (hs);
 }
 
diff --git a/src/testing/testing_api_cmd_batch.c b/src/testing/testing_api_cmd_batch.c
index d81a5c38d..ca23d7fd9 100644
--- a/src/testing/testing_api_cmd_batch.c
+++ b/src/testing/testing_api_cmd_batch.c
@@ -99,7 +99,7 @@ batch_cleanup (void *cls,
        i++)
     bs->batch[i].cleanup (bs->batch[i].cls,
                           &bs->batch[i]);
-  GNUNET_free_non_null (bs->batch);
+  GNUNET_free (bs->batch);
   GNUNET_free (bs);
 }
 
diff --git a/src/testing/testing_api_cmd_exec_auditor-sign.c b/src/testing/testing_api_cmd_exec_auditor-sign.c
index 4c88ccca0..82d7e6669 100644
--- a/src/testing/testing_api_cmd_exec_auditor-sign.c
+++ b/src/testing/testing_api_cmd_exec_auditor-sign.c
@@ -166,7 +166,7 @@ auditor_sign_cleanup (void *cls,
     GNUNET_OS_process_destroy (ass->auditor_sign_proc);
     ass->auditor_sign_proc = NULL;
   }
-  GNUNET_free_non_null (ass->signed_keys_out);
+  GNUNET_free (ass->signed_keys_out);
   GNUNET_free (ass);
 }
 
diff --git a/src/testing/testing_api_cmd_refresh.c b/src/testing/testing_api_cmd_refresh.c
index 92229cc72..9a13c1354 100644
--- a/src/testing/testing_api_cmd_refresh.c
+++ b/src/testing/testing_api_cmd_refresh.c
@@ -514,7 +514,7 @@ refresh_reveal_cleanup (void *cls,
   for (unsigned int j = 0; j < rrs->num_fresh_coins; j++)
     GNUNET_CRYPTO_rsa_signature_free (rrs->fresh_coins[j].sig.rsa_signature);
 
-  GNUNET_free_non_null (rrs->fresh_coins);
+  GNUNET_free (rrs->fresh_coins);
   rrs->fresh_coins = NULL;
   rrs->num_fresh_coins = 0;
   GNUNET_free (rrs);
@@ -1128,12 +1128,12 @@ melt_cleanup (void *cls,
     for (unsigned int i = 0; i < rms->num_fresh_coins; i++)
       GNUNET_CRYPTO_rsa_public_key_free (rms->fresh_pks[i].key.rsa_public_key);
   }
-  GNUNET_free_non_null (rms->fresh_pks);
+  GNUNET_free (rms->fresh_pks);
   rms->fresh_pks = NULL;
-  GNUNET_free_non_null (rms->refresh_data);
+  GNUNET_free (rms->refresh_data);
   rms->refresh_data = NULL;
   rms->refresh_data_length = 0;
-  GNUNET_free_non_null (rms->melt_fresh_amounts);
+  GNUNET_free (rms->melt_fresh_amounts);
   GNUNET_free (rms);
 }
 
diff --git a/src/testing/testing_api_cmd_revoke.c b/src/testing/testing_api_cmd_revoke.c
index 1006fbc34..d9320865a 100644
--- a/src/testing/testing_api_cmd_revoke.c
+++ b/src/testing/testing_api_cmd_revoke.c
@@ -85,7 +85,7 @@ revoke_cleanup (void *cls,
     GNUNET_OS_process_destroy (rs->revoke_proc);
     rs->revoke_proc = NULL;
   }
-  GNUNET_free_non_null (rs->dhks);
+  GNUNET_free (rs->dhks);
   GNUNET_free (rs);
 }
 
diff --git a/src/testing/testing_api_cmd_serialize_keys.c b/src/testing/testing_api_cmd_serialize_keys.c
index 8a723c5ba..aa39b8a37 100644
--- a/src/testing/testing_api_cmd_serialize_keys.c
+++ b/src/testing/testing_api_cmd_serialize_keys.c
@@ -117,7 +117,7 @@ serialize_keys_cleanup (void *cls,
   {
     json_decref (sks->keys);
   }
-  GNUNET_free_non_null (sks->exchange_url);
+  GNUNET_free (sks->exchange_url);
   GNUNET_free (sks);
 }
 
diff --git a/src/testing/testing_api_cmd_withdraw.c b/src/testing/testing_api_cmd_withdraw.c
index d863e406a..5db97cbff 100644
--- a/src/testing/testing_api_cmd_withdraw.c
+++ b/src/testing/testing_api_cmd_withdraw.c
@@ -387,7 +387,7 @@ withdraw_cleanup (void *cls,
     TALER_EXCHANGE_destroy_denomination_key (ws->pk);
     ws->pk = NULL;
   }
-  GNUNET_free_non_null (ws->exchange_url);
+  GNUNET_free (ws->exchange_url);
   GNUNET_free (ws);
 }
 
diff --git a/src/testing/testing_api_loop.c b/src/testing/testing_api_loop.c
index af4a63c6a..fceff4234 100644
--- a/src/testing/testing_api_loop.c
+++ b/src/testing/testing_api_loop.c
@@ -355,7 +355,7 @@ do_shutdown (void *cls)
     TALER_FAKEBANK_stop (is->fakebank);
     is->fakebank = NULL;
   }
-  GNUNET_free_non_null (is->commands);
+  GNUNET_free (is->commands);
 }
 
 
@@ -813,7 +813,7 @@ TALER_TESTING_setup (TALER_TESTING_Main main_cb,
                           &main_ctx);
   if (NULL != is.final_cleanup_cb)
     is.final_cleanup_cb (is.final_cleanup_cb_cls);
-  GNUNET_free_non_null (main_ctx.exchange_url);
+  GNUNET_free (main_ctx.exchange_url);
   GNUNET_SIGNAL_handler_uninstall (shc_chld);
   GNUNET_DISK_pipe_close (sigpipe);
   sigpipe = NULL;