gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-merchant] 277/277: GNUNET_free_non_null -> GNUNET_free rename


From: gnunet
Subject: [taler-merchant] 277/277: GNUNET_free_non_null -> GNUNET_free rename
Date: Sun, 05 Jul 2020 20:53:10 +0200

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository merchant.

commit f82923526d6f7f688677b15f416a3b41f9feff2b
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun Jul 5 20:48:08 2020 +0200

    GNUNET_free_non_null -> GNUNET_free rename
---
 src/backend/taler-merchant-httpd.c                       | 2 +-
 src/backend/taler-merchant-httpd_auditors.c              | 2 +-
 src/backend/taler-merchant-httpd_exchanges.c             | 2 +-
 src/backend/taler-merchant-httpd_get-orders-ID.c         | 4 ++--
 src/backend/taler-merchant-httpd_post-orders-ID-abort.c  | 4 ++--
 src/backend/taler-merchant-httpd_post-orders-ID-pay.c    | 8 ++++----
 src/backend/taler-merchant-httpd_private-post-reserves.c | 2 +-
 src/backenddb/plugin_merchantdb_postgres.c               | 2 +-
 src/testing/testing_api_cmd_post_orders.c                | 4 ++--
 src/testing/testing_api_cmd_post_transfers.c             | 5 ++---
 src/testing/testing_api_cmd_tip_pickup.c                 | 6 +++---
 11 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/backend/taler-merchant-httpd.c 
b/src/backend/taler-merchant-httpd.c
index b60eec4..cbc7774 100644
--- a/src/backend/taler-merchant-httpd.c
+++ b/src/backend/taler-merchant-httpd.c
@@ -532,7 +532,7 @@ handle_mhd_completion_callback (void *cls,
   if (NULL != hc->cc)
     hc->cc (hc->ctx);
   TALER_MHD_parse_post_cleanup_callback (hc->json_parse_context);
-  GNUNET_free_non_null (hc->infix);
+  GNUNET_free (hc->infix);
   if (NULL != hc->request_body)
     json_decref (hc->request_body);
   if (NULL != hc->instance)
diff --git a/src/backend/taler-merchant-httpd_auditors.c 
b/src/backend/taler-merchant-httpd_auditors.c
index 05690a9..9237f92 100644
--- a/src/backend/taler-merchant-httpd_auditors.c
+++ b/src/backend/taler-merchant-httpd_auditors.c
@@ -273,7 +273,7 @@ TMH_AUDITORS_done ()
     GNUNET_free (auditors[i].name);
     GNUNET_free (auditors[i].url);
   }
-  GNUNET_free_non_null (auditors);
+  GNUNET_free (auditors);
   auditors = NULL;
   nauditors = 0;
 }
diff --git a/src/backend/taler-merchant-httpd_exchanges.c 
b/src/backend/taler-merchant-httpd_exchanges.c
index c6e7ca7..46d241a 100644
--- a/src/backend/taler-merchant-httpd_exchanges.c
+++ b/src/backend/taler-merchant-httpd_exchanges.c
@@ -1102,7 +1102,7 @@ TMH_EXCHANGES_find_exchange_cancel (struct 
TMH_EXCHANGES_FindOperation *fo)
   GNUNET_CONTAINER_DLL_remove (exchange->fo_head,
                                exchange->fo_tail,
                                fo);
-  GNUNET_free_non_null (fo->wire_method);
+  GNUNET_free (fo->wire_method);
   GNUNET_free (fo);
 }
 
diff --git a/src/backend/taler-merchant-httpd_get-orders-ID.c 
b/src/backend/taler-merchant-httpd_get-orders-ID.c
index f0585eb..826c530 100644
--- a/src/backend/taler-merchant-httpd_get-orders-ID.c
+++ b/src/backend/taler-merchant-httpd_get-orders-ID.c
@@ -858,11 +858,11 @@ TMH_get_orders_ID (const struct TMH_RequestHandler *rh,
 
       ret = send_pay_request (god,
                               already_paid_order_id);
-      GNUNET_free_non_null (already_paid_order_id);
+      GNUNET_free (already_paid_order_id);
       return ret;
     }
     GNUNET_break (1 == qs);
-    GNUNET_free_non_null (already_paid_order_id);
+    GNUNET_free (already_paid_order_id);
   }
   else
   {
diff --git a/src/backend/taler-merchant-httpd_post-orders-ID-abort.c 
b/src/backend/taler-merchant-httpd_post-orders-ID-abort.c
index 940db37..8c09213 100644
--- a/src/backend/taler-merchant-httpd_post-orders-ID-abort.c
+++ b/src/backend/taler-merchant-httpd_post-orders-ID-abort.c
@@ -402,9 +402,9 @@ abort_context_cleanup (void *cls)
       json_decref (rdi->exchange_reply);
       rdi->exchange_reply = NULL;
     }
-    GNUNET_free_non_null (rdi->exchange_url);
+    GNUNET_free (rdi->exchange_url);
   }
-  GNUNET_free_non_null (ac->rd);
+  GNUNET_free (ac->rd);
   if (NULL != ac->fo)
   {
     TMH_EXCHANGES_find_exchange_cancel (ac->fo);
diff --git a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c 
b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
index 37d98b8..cf607fc 100644
--- a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
+++ b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
@@ -491,9 +491,9 @@ pay_context_cleanup (void *cls)
       GNUNET_CRYPTO_rsa_signature_free (dc->ub_sig.rsa_signature);
       dc->ub_sig.rsa_signature = NULL;
     }
-    GNUNET_free_non_null (dc->exchange_url);
+    GNUNET_free (dc->exchange_url);
   }
-  GNUNET_free_non_null (pc->dc);
+  GNUNET_free (pc->dc);
   if (NULL != pc->fo)
   {
     TMH_EXCHANGES_find_exchange_cancel (pc->fo);
@@ -504,8 +504,8 @@ pay_context_cleanup (void *cls)
     MHD_destroy_response (pc->response);
     pc->response = NULL;
   }
-  GNUNET_free_non_null (pc->order_id);
-  GNUNET_free_non_null (pc->session_id);
+  GNUNET_free (pc->order_id);
+  GNUNET_free (pc->session_id);
   GNUNET_CONTAINER_DLL_remove (pc_head,
                                pc_tail,
                                pc);
diff --git a/src/backend/taler-merchant-httpd_private-post-reserves.c 
b/src/backend/taler-merchant-httpd_private-post-reserves.c
index 5a691f4..3e72650 100644
--- a/src/backend/taler-merchant-httpd_private-post-reserves.c
+++ b/src/backend/taler-merchant-httpd_private-post-reserves.c
@@ -157,7 +157,7 @@ reserve_context_cleanup (void *cls)
     rc->fo = NULL;
   }
   GNUNET_assert (! rc->suspended);
-  GNUNET_free_non_null (rc->payto_uri);
+  GNUNET_free (rc->payto_uri);
   GNUNET_free (rc);
 }
 
diff --git a/src/backenddb/plugin_merchantdb_postgres.c 
b/src/backenddb/plugin_merchantdb_postgres.c
index 88944c9..1360d90 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -4806,7 +4806,7 @@ postgres_lookup_reserve (void *cls,
         ltc.tips);
   }
   for (unsigned int i = 0; i<ltc.tips_length; i++)
-    GNUNET_free_non_null (ltc.tips[i].reason);
+    GNUNET_free (ltc.tips[i].reason);
   GNUNET_array_grow (ltc.tips,
                      ltc.tips_length,
                      0);
diff --git a/src/testing/testing_api_cmd_post_orders.c 
b/src/testing/testing_api_cmd_post_orders.c
index 8e1cc3f..0a1db61 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 100ea32..53d4911 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 833ab6b..8f2dacf 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++)

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]