6 files changed, 12 insertions, 12 deletions
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 5bd674b2d..69db09a53 100644
--- a/src/exchangedb/plugin_exchangedb_postgres.c
+++ b/src/exchangedb/plugin_exchangedb_postgres.c
@@ -3782,9 +3782,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 eea484e94..11183c704 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)