merchant

commit 472c97b31a02ccfa9da9b14a35653e9e6b2e511b
parent 726d1a72b7599a00b01210d30447c40655ad3139
Author: Christian Grothoff <christian@grothoff.org>
Date:   Tue, 29 Oct 2019 17:15:20 +0100

fix compiler warnings

Diffstat:
M
src/backend/taler-merchant-httpd.c
 | 
7
++++++-
M
src/backenddb/plugin_merchantdb_postgres.c
 | 
10
+++++-----

2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c
@@ -167,7 +167,7 @@ is_valid_correlation_id (const char *correlation_id)
 {
   if (strlen (correlation_id) >= 64)
     return GNUNET_NO;
-  for (int i = 0; i < strlen (correlation_id); i++)
+  for (size_t i = 0; i < strlen (correlation_id); i++)
     if (! (isalnum (correlation_id[i]) ||(correlation_id[i] == '-')))
       return GNUNET_NO;
   return GNUNET_YES;
@@ -1142,6 +1142,8 @@ url_handler (void *cls,
   int ret;
   struct TMH_RequestHandler *selected_handler = NULL;
 
+  (void) cls;
+  (void) version;
   if (NULL == hc)
   {
     GNUNET_async_scope_fresh (&aid);
@@ -1330,6 +1332,9 @@ run (void *cls,
 {
   int fh;
 
+  (void) cls;
+  (void) args;
+  (void) cfgfile;
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Starting taler-merchant-httpd\n");
 
diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c
@@ -1486,7 +1486,7 @@ find_transfers_cb (void *cls,
 {
   struct FindTransfersContext *ftc = cls;
 
-  for (unsigned int i = 0; i<PQntuples (result); i++)
+  for (unsigned int i = 0; i<num_results; i++)
   {
     struct TALER_CoinSpendPublicKeyP coin_pub;
     struct TALER_WireTransferIdentifierRawP wtid;
@@ -1613,7 +1613,7 @@ find_deposits_cb (void *cls,
   struct FindDepositsContext *fdc = cls;
   struct PostgresClosure *pg = fdc->pg;
 
-  for (unsigned int i = 0; i<PQntuples (result); i++)
+  for (unsigned int i = 0; i<num_results; i++)
   {
     struct GNUNET_HashCode h_contract_terms;
     struct TALER_CoinSpendPublicKeyP coin_pub;
@@ -2475,7 +2475,7 @@ postgres_enable_tip_reserve_TR (void *cls,
 
   retries = 0;
   check_connection (pg);
-RETRY:
+  RETRY:
   if (MAX_RETRIES < ++retries)
     return GNUNET_DB_STATUS_SOFT_ERROR;
   if (GNUNET_OK !=
@@ -2682,7 +2682,7 @@ postgres_authorize_tip_TR (void *cls,
 
   retries = 0;
   check_connection (pg);
-RETRY:
+  RETRY:
   if (MAX_RETRIES < ++retries)
     return TALER_EC_TIP_AUTHORIZE_DB_SOFT_ERROR;
   if (GNUNET_OK !=
@@ -2898,7 +2898,7 @@ postgres_pickup_tip_TR (void *cls,
 
   retries = 0;
   check_connection (pg);
-RETRY:
+  RETRY:
   if (MAX_RETRIES < ++retries)
     return TALER_EC_TIP_PICKUP_DB_ERROR_SOFT;
   if (GNUNET_OK !=