summaryrefslogtreecommitdiff
path: root/src/testing
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-07-05 20:48:08 +0200
committerChristian Grothoff <christian@grothoff.org>2020-07-05 20:48:08 +0200
commitf82923526d6f7f688677b15f416a3b41f9feff2b (patch)
tree0828efc987e87f9a21b366fca79ccbc228e7e50f /src/testing
parentdf3b47466499d0d937f3d53b259ae8efc8961aa8 (diff)
downloadmerchant-f82923526d6f7f688677b15f416a3b41f9feff2b.tar.gz
merchant-f82923526d6f7f688677b15f416a3b41f9feff2b.tar.bz2
merchant-f82923526d6f7f688677b15f416a3b41f9feff2b.zip
GNUNET_free_non_null -> GNUNET_free rename
Diffstat (limited to 'src/testing')
-rw-r--r--src/testing/testing_api_cmd_post_orders.c4
-rw-r--r--src/testing/testing_api_cmd_post_transfers.c5
-rw-r--r--src/testing/testing_api_cmd_tip_pickup.c6
3 files changed, 7 insertions, 8 deletions
diff --git a/src/testing/testing_api_cmd_post_orders.c b/src/testing/testing_api_cmd_post_orders.c
index 8e1cc3fc..0a1db61d 100644
--- a/src/testing/testing_api_cmd_post_orders.c
+++ b/src/testing/testing_api_cmd_post_orders.c
@@ -239,7 +239,7 @@ order_cb (void *cls,
hr->ec,
TALER_TESTING_interpreter_get_current_label (ps->is),
s);
- GNUNET_free_non_null (s);
+ GNUNET_free (s);
/**
* Not failing, as test cases are _supposed_
* to create non 200 OK situations.
@@ -352,7 +352,7 @@ orders_cleanup (void *cls,
}
json_decref (ps->contract_terms);
- GNUNET_free_non_null ((void *) ps->order_id);
+ GNUNET_free_nz ((void *) ps->order_id);
GNUNET_free (ps);
}
diff --git a/src/testing/testing_api_cmd_post_transfers.c b/src/testing/testing_api_cmd_post_transfers.c
index 100ea32d..53d4911d 100644
--- a/src/testing/testing_api_cmd_post_transfers.c
+++ b/src/testing/testing_api_cmd_post_transfers.c
@@ -277,8 +277,7 @@ transfers_cb (void *cls,
TALER_TESTING_interpreter_fail (pts->is);
return;
}
- */
- break;
+ */break;
}
default:
GNUNET_break (0);
@@ -446,7 +445,7 @@ post_transfers_cleanup (void *cls,
GNUNET_array_grow (pts->deposits,
pts->deposits_length,
0);
- GNUNET_free_non_null (pts->exchange_url);
+ GNUNET_free (pts->exchange_url);
GNUNET_free (pts);
}
diff --git a/src/testing/testing_api_cmd_tip_pickup.c b/src/testing/testing_api_cmd_tip_pickup.c
index 833ab6bc..8f2dacf4 100644
--- a/src/testing/testing_api_cmd_tip_pickup.c
+++ b/src/testing/testing_api_cmd_tip_pickup.c
@@ -307,9 +307,9 @@ tip_pickup_cleanup (void *cls,
{
struct TipPickupState *tps = cls;
- GNUNET_free_non_null (tps->amounts_obj);
- GNUNET_free_non_null (tps->dks);
- GNUNET_free_non_null (tps->psa);
+ GNUNET_free (tps->amounts_obj);
+ GNUNET_free (tps->dks);
+ GNUNET_free (tps->psa);
if (NULL != tps->sigs)
{
for (unsigned int i = 0; i<tps->num_coins; i++)