From e428783e2e0295186dc4eae273df8a3f8b75df60 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sun, 5 Jul 2020 16:56:41 +0200
Subject: GNUNET_free_non_null is gone, use GNUNET_free

---
 src/exchange/taler-exchange-httpd.c                  | 8 ++++----
 src/exchange/taler-exchange-httpd_refreshes_reveal.c | 4 ++--
 src/exchange/taler-exchange-httpd_transfers_get.c    | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/exchange')

diff --git a/src/exchange/taler-exchange-httpd.c b/src/exchange/taler-exchange-httpd.c
index a8e29d300..339303d53 100644
--- a/src/exchange/taler-exchange-httpd.c
+++ b/src/exchange/taler-exchange-httpd.c
@@ -1249,8 +1249,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 ();
@@ -1261,10 +1261,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;
 }
 
-- 
cgit v1.2.3