stylefixes

4 files changed, 71 insertions, 91 deletions

diff --git a/src/auditor/taler-helper-auditor-aggregation.c b/src/auditor/taler-helper-auditor-aggregation.c
index cac357d5c..5b07a1fd2 100644
--- a/src/auditor/taler-helper-auditor-aggregation.c
+++ b/src/auditor/taler-helper-auditor-aggregation.c
@@ -131,13 +131,12 @@ static struct TALER_Amount total_bad_sig_loss;
  *           profitable for the exchange, and 0 if it is unclear
  */
 static void
-report_amount_arithmetic_inconsistency (const char *operation,
-                                        uint64_t rowid,
-                                        const struct
-                                        TALER_Amount *exchange,
-                                        const struct
-                                        TALER_Amount *auditor,
-                                        int profitable)
+report_amount_arithmetic_inconsistency (
+  const char *operation,
+  uint64_t rowid,
+  const struct TALER_Amount *exchange,
+  const struct TALER_Amount *auditor,
+  int profitable)
 {
   struct TALER_Amount delta;
   struct TALER_Amount *target;
@@ -194,15 +193,12 @@ report_amount_arithmetic_inconsistency (const char *operation,
  *           profitable for the exchange, and 0 if it is unclear
  */
 static void
-report_coin_arithmetic_inconsistency (const char *operation,
-                                      const struct
-                                      TALER_CoinSpendPublicKeyP *
-                                      coin_pub,
-                                      const struct
-                                      TALER_Amount *exchange,
-                                      const struct
-                                      TALER_Amount *auditor,
-                                      int profitable)
+report_coin_arithmetic_inconsistency (
+  const char *operation,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct TALER_Amount *exchange,
+  const struct TALER_Amount *auditor,
+  int profitable)
 {
   struct TALER_Amount delta;
   struct TALER_Amount *target;
@@ -384,25 +380,14 @@ struct WireCheckContext
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 static int
-check_transaction_history_for_deposit (const struct
-                                       TALER_CoinSpendPublicKeyP *
-                                       coin_pub,
-                                       const struct
-                                       GNUNET_HashCode *
-                                       h_contract_terms,
-                                       const struct
-                                       TALER_MerchantPublicKeyP *
-                                       merchant_pub,
-                                       const struct
-                                       TALER_DenominationKeyValidityPS
-                                       *issue,
-                                       const struct
-                                       TALER_EXCHANGEDB_TransactionList
-                                       *tl_head,
-                                       struct TALER_Amount *
-                                       merchant_gain,
-                                       struct TALER_Amount *
-                                       deposit_gain)
+check_transaction_history_for_deposit (
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct GNUNET_HashCode *h_contract_terms,
+  const struct TALER_MerchantPublicKeyP *merchant_pub,
+  const struct TALER_DenominationKeyValidityPS *issue,
+  const struct TALER_EXCHANGEDB_TransactionList *tl_head,
+  struct TALER_Amount *merchant_gain,
+  struct TALER_Amount *deposit_gain)
 {
   struct TALER_Amount expenditures;
   struct TALER_Amount refunds;
@@ -1272,14 +1257,13 @@ analyze_aggregations (void *cls)
   if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qsp)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
-                _ (
-                  "First analysis using this auditor, starting audit from scratch\n"));
+                "First analysis using this auditor, starting audit from scratch\n");
   }
   else
   {
     ppa_start = ppa;
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                _ ("Resuming aggregation audit at %llu\n"),
+                "Resuming aggregation audit at %llu\n",
                 (unsigned long long) ppa.last_wire_out_serial_id);
   }
 
@@ -1373,20 +1357,20 @@ analyze_aggregations (void *cls)
  *
  * @param cls closure
  * @param args remaining command-line arguments
- * @param TALER_ARL_cfgfile name of the configuration file used (for saving, can be NULL!)
+ * @param cfgfile name of the configuration file used (for saving, can be NULL!)
  * @param c configuration
  */
 static void
 run (void *cls,
      char *const *args,
-     const char *TALER_ARL_cfgfile,
+     const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *c)
 {
   json_t *report;
 
   (void) cls;
   (void) args;
-  (void) TALER_ARL_cfgfile;
+  (void) cfgfile;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Launching auditor\n");
   if (GNUNET_OK !=
diff --git a/src/auditor/taler-helper-auditor-coins.c b/src/auditor/taler-helper-auditor-coins.c
index 66c2b68a4..f35aa0fcf 100644
--- a/src/auditor/taler-helper-auditor-coins.c
+++ b/src/auditor/taler-helper-auditor-coins.c
@@ -2116,20 +2116,20 @@ analyze_coins (void *cls)
  *
  * @param cls closure
  * @param args remaining command-line arguments
- * @param TALER_ARL_cfgfile name of the configuration file used (for saving, can be NULL!)
+ * @param cfgfile name of the configuration file used (for saving, can be NULL!)
  * @param c configuration
  */
 static void
 run (void *cls,
      char *const *args,
-     const char *TALER_ARL_cfgfile,
+     const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *c)
 {
   json_t *report;
 
   (void) cls;
   (void) args;
-  (void) TALER_ARL_cfgfile;
+  (void) cfgfile;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Launching auditor\n");
   if (GNUNET_OK !=
diff --git a/src/auditor/taler-helper-auditor-reserves.c b/src/auditor/taler-helper-auditor-reserves.c
index 11d2f5648..5becaf2d8 100644
--- a/src/auditor/taler-helper-auditor-reserves.c
+++ b/src/auditor/taler-helper-auditor-reserves.c
@@ -160,13 +160,12 @@ static struct TALER_Amount total_bad_sig_loss;
  *           profitable for the exchange, and 0 if it is unclear
  */
 static void
-report_amount_arithmetic_inconsistency (const char *operation,
-                                        uint64_t rowid,
-                                        const struct
-                                        TALER_Amount *exchange,
-                                        const struct
-                                        TALER_Amount *auditor,
-                                        int profitable)
+report_amount_arithmetic_inconsistency (
+  const char *operation,
+  uint64_t rowid,
+  const struct TALER_Amount *exchange,
+  const struct TALER_Amount *auditor,
+  int profitable)
 {
   struct TALER_Amount delta;
   struct TALER_Amount *target;
@@ -649,16 +648,16 @@ handle_reserve_out (void *cls,
  * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop
  */
 static int
-handle_recoup_by_reserve (void *cls,
-                          uint64_t rowid,
-                          struct GNUNET_TIME_Absolute timestamp,
-                          const struct TALER_Amount *amount,
-                          const struct TALER_ReservePublicKeyP *reserve_pub,
-                          const struct TALER_CoinPublicInfo *coin,
-                          const struct TALER_DenominationPublicKey *denom_pub,
-                          const struct TALER_CoinSpendSignatureP *coin_sig,
-                          const struct
-                          TALER_DenominationBlindingKeyP *coin_blind)
+handle_recoup_by_reserve (
+  void *cls,
+  uint64_t rowid,
+  struct GNUNET_TIME_Absolute timestamp,
+  const struct TALER_Amount *amount,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  const struct TALER_CoinPublicInfo *coin,
+  const struct TALER_DenominationPublicKey *denom_pub,
+  const struct TALER_CoinSpendSignatureP *coin_sig,
+  const struct TALER_DenominationBlindingKeyP *coin_blind)
 {
   struct ReserveContext *rc = cls;
   struct GNUNET_HashCode key;
@@ -885,15 +884,15 @@ get_closing_fee (const char *receiver_account,
  * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop
  */
 static int
-handle_reserve_closed (void *cls,
-                       uint64_t rowid,
-                       struct GNUNET_TIME_Absolute execution_date,
-                       const struct TALER_Amount *amount_with_fee,
-                       const struct TALER_Amount *closing_fee,
-                       const struct TALER_ReservePublicKeyP *reserve_pub,
-                       const char *receiver_account,
-                       const struct
-                       TALER_WireTransferIdentifierRawP *transfer_details)
+handle_reserve_closed (
+  void *cls,
+  uint64_t rowid,
+  struct GNUNET_TIME_Absolute execution_date,
+  const struct TALER_Amount *amount_with_fee,
+  const struct TALER_Amount *closing_fee,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  const char *receiver_account,
+  const struct TALER_WireTransferIdentifierRawP *transfer_details)
 {
   struct ReserveContext *rc = cls;
   struct GNUNET_HashCode key;
@@ -1295,14 +1294,13 @@ analyze_reserves (void *cls)
   if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qsp)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
-                _ (
-                  "First analysis using this auditor, starting audit from scratch\n"));
+                "First analysis using this auditor, starting audit from scratch\n");
   }
   else
   {
     ppr_start = ppr;
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                _ ("Resuming reserve audit at %llu/%llu/%llu/%llu\n"),
+                "Resuming reserve audit at %llu/%llu/%llu/%llu\n",
                 (unsigned long long) ppr.last_reserve_in_serial_id,
                 (unsigned long long) ppr.last_reserve_out_serial_id,
                 (unsigned long long) ppr.last_reserve_recoup_serial_id,
@@ -1420,7 +1418,7 @@ analyze_reserves (void *cls)
     return qs;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              _ ("Concluded reserve audit step at %llu/%llu/%llu/%llu\n"),
+              "Concluded reserve audit step at %llu/%llu/%llu/%llu\n",
               (unsigned long long) ppr.last_reserve_in_serial_id,
               (unsigned long long) ppr.last_reserve_out_serial_id,
               (unsigned long long) ppr.last_reserve_recoup_serial_id,
@@ -1434,18 +1432,18 @@ analyze_reserves (void *cls)
  *
  * @param cls closure
  * @param args remaining command-line arguments
- * @param TALER_ARL_cfgfile name of the configuration file used (for saving, can be NULL!)
+ * @param cfgfile name of the configuration file used (for saving, can be NULL!)
  * @param c configuration
  */
 static void
 run (void *cls,
      char *const *args,
-     const char *TALER_ARL_cfgfile,
+     const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *c)
 {
   (void) cls;
   (void) args;
-  (void) TALER_ARL_cfgfile;
+  (void) cfgfile;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Launching auditor\n");
   if (GNUNET_OK !=
@@ -1501,22 +1499,20 @@ run (void *cls,
   GNUNET_assert (NULL !=
                  (report_row_inconsistencies = json_array ()));
   GNUNET_assert (NULL !=
-                 (denomination_key_validity_withdraw_inconsistencies =
-                    json_array ()));
+                 (denomination_key_validity_withdraw_inconsistencies
+                    = json_array ()));
   GNUNET_assert (NULL !=
                  (report_reserve_balance_summary_wrong_inconsistencies
-                    =
-                      json_array ()));
+                    = json_array ()));
   GNUNET_assert (NULL !=
                  (report_reserve_balance_insufficient_inconsistencies
-                    =
-                      json_array ()));
+                    = json_array ()));
   GNUNET_assert (NULL !=
-                 (report_reserve_not_closed_inconsistencies =
-                    json_array ()));
+                 (report_reserve_not_closed_inconsistencies
+                    = json_array ()));
   GNUNET_assert (NULL !=
-                 (report_amount_arithmetic_inconsistencies =
-                    json_array ()));
+                 (report_amount_arithmetic_inconsistencies
+                    = json_array ()));
   GNUNET_assert (NULL !=
                  (report_bad_sig_losses = json_array ()));
   if (GNUNET_OK !=
diff --git a/src/auditor/taler-helper-auditor-wire.c b/src/auditor/taler-helper-auditor-wire.c
index acda4f2ff..66d8b8ac5 100644
--- a/src/auditor/taler-helper-auditor-wire.c
+++ b/src/auditor/taler-helper-auditor-wire.c
@@ -2084,20 +2084,20 @@ process_account_cb (void *cls,
  *
  * @param cls closure
  * @param args remaining command-line arguments
- * @param TALER_ARL_cfgfile name of the configuration file used (for saving, can be NULL!)
+ * @param cfgfile name of the configuration file used (for saving, can be NULL!)
  * @param c configuration
  */
 static void
 run (void *cls,
      char *const *args,
-     const char *TALER_ARL_cfgfile,
+     const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *c)
 {
   (void) cls;
   (void) args;
-  (void) TALER_ARL_cfgfile;
+  (void) cfgfile;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Launching auditor\n");
+              "Launching wire auditor\n");
   if (GNUNET_OK !=
       TALER_ARL_init (c))
   {