From ed5b98a2c2308fbd44b906a30286d2689fd304dd Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 5 Jul 2020 16:58:43 +0200 Subject: GNUNET_free_non_null is gone, use GNUNET_free --- src/testing/testing_api_cmd_bank_history_credit.c | 2 +- src/testing/testing_api_cmd_bank_history_debit.c | 2 +- src/testing/testing_api_cmd_batch.c | 2 +- src/testing/testing_api_cmd_exec_auditor-sign.c | 2 +- src/testing/testing_api_cmd_refresh.c | 8 ++++---- src/testing/testing_api_cmd_revoke.c | 2 +- src/testing/testing_api_cmd_serialize_keys.c | 2 +- src/testing/testing_api_cmd_withdraw.c | 2 +- src/testing/testing_api_loop.c | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src/testing') 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; offtotal; 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; -- cgit v1.2.3