From 4c184f7e685817b565013c3afb2a5c30ecf10161 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 21 Jul 2021 15:29:48 +0200 Subject: -fix bugs, FTBFS --- ...er-merchant-httpd_private-delete-instances-ID.c | 23 +++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'src/backend/taler-merchant-httpd_private-delete-instances-ID.c') diff --git a/src/backend/taler-merchant-httpd_private-delete-instances-ID.c b/src/backend/taler-merchant-httpd_private-delete-instances-ID.c index 919c21c9..0de88164 100644 --- a/src/backend/taler-merchant-httpd_private-delete-instances-ID.c +++ b/src/backend/taler-merchant-httpd_private-delete-instances-ID.c @@ -34,16 +34,19 @@ static MHD_RESULT delete_instances_ID (struct TMH_MerchantInstance *mi, struct MHD_Connection *connection) { - const char *purge; + const char *purge_s; + bool purge; enum GNUNET_DB_QueryStatus qs; GNUNET_assert (NULL != mi); - purge = MHD_lookup_connection_value (connection, - MHD_GET_ARGUMENT_KIND, - "purge"); - if ( (NULL != purge) && - (0 == strcmp (purge, - "yes")) ) + purge_s = MHD_lookup_connection_value (connection, + MHD_GET_ARGUMENT_KIND, + "purge"); + if (NULL == purge_s) + purge_s = "no"; + purge = (0 == strcmp (purge_s, + "yes")); + if (purge) qs = TMH_db->purge_instance (TMH_db->cls, mi->settings.id); else @@ -66,13 +69,11 @@ delete_instances_ID (struct TMH_MerchantInstance *mi, return TALER_MHD_reply_with_error (connection, MHD_HTTP_NOT_FOUND, TALER_EC_MERCHANT_GENERIC_INSTANCE_UNKNOWN, - ( (NULL != purge) && - (0 == strcmp (purge, - "yes")) ) + purge ? "Instance unknown" : "Private key unknown"); case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT: - if (NULL != purge) + if (purge) TMH_instance_decref (mi); else mi->deleted = true; -- cgit v1.2.3