taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor auditor/taler-auditor.c for GNUNET_memcmp

Browse Source
This commit is contained in:
ng0 2019-04-08 13:24:51 +00:00
parent 602093e98c
commit 0b8a87126b
No known key found for this signature in database
GPG Key ID: E22F9BBFEE348588
1 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/auditor/taler-auditor.c
View File

@ -1975,12 +1975,10 @@ check_transaction_history (const struct TALER_CoinSpendPublicKeyP *coin_pub,
} }
/* Check if this deposit is within the remit of the aggregation /* Check if this deposit is within the remit of the aggregation
we are investigating, if so, include it in the totals. */ we are investigating, if so, include it in the totals. */
if ( (0 == memcmp (merchant_pub, if ( (0 == GNUNET_memcmp (merchant_pub,
&tl->details.deposit->merchant_pub, &tl->details.deposit->merchant_pub)) &&
sizeof (struct TALER_MerchantPublicKeyP))) && (0 == GNUNET_memcmp (h_contract_terms,
(0 == memcmp (h_contract_terms, &tl->details.deposit->h_contract_terms)) )
&tl->details.deposit->h_contract_terms,
sizeof (struct GNUNET_HashCode))) )
{ {
struct TALER_Amount amount_without_fee; struct TALER_Amount amount_without_fee;
@ -2063,12 +2061,10 @@ check_transaction_history (const struct TALER_CoinSpendPublicKeyP *coin_pub,
} }
/* Check if this refund is within the remit of the aggregation /* Check if this refund is within the remit of the aggregation
we are investigating, if so, include it in the totals. */ we are investigating, if so, include it in the totals. */
if ( (0 == memcmp (merchant_pub, if ( (0 == GNUNET_memcmp (merchant_pub,
&tl->details.refund->merchant_pub, &tl->details.refund->merchant_pub)) &&
sizeof (struct TALER_MerchantPublicKeyP))) && (0 == GNUNET_memcmp (h_contract_terms,
(0 == memcmp (h_contract_terms, &tl->details.refund->h_contract_terms)) )
&tl->details.refund->h_contract_terms,
sizeof (struct GNUNET_HashCode))) )
{ {
if (GNUNET_OK != if (GNUNET_OK !=
TALER_amount_add (&merchant_loss, TALER_amount_add (&merchant_loss,
@ -2223,9 +2219,8 @@ wire_transfer_information_cb (void *cls,
return; return;
} }
if (0 != if (0 !=
memcmp (&hw, GNUNET_memcmp (&hw,
h_wire, h_wire))
sizeof (struct GNUNET_HashCode)))
{ {
wcc->qs = GNUNET_DB_STATUS_HARD_ERROR; wcc->qs = GNUNET_DB_STATUS_HARD_ERROR;
report_row_inconsistency ("aggregation", report_row_inconsistency ("aggregation",
@ -2320,18 +2315,16 @@ wire_transfer_information_cb (void *cls,
tl); tl);
/* Check other details of wire transfer match */ /* Check other details of wire transfer match */
if (0 != memcmp (h_wire, if (0 != GNUNET_memcmp (h_wire,
&wcc->h_wire, &wcc->h_wire))
sizeof (struct GNUNET_HashCode)))
{ {
wcc->qs = GNUNET_DB_STATUS_HARD_ERROR; wcc->qs = GNUNET_DB_STATUS_HARD_ERROR;
report_row_inconsistency ("aggregation", report_row_inconsistency ("aggregation",
rowid, rowid,
"wire method of aggregate do not match wire transfer"); "wire method of aggregate do not match wire transfer");
} }
if (0 != memcmp (h_wire, if (0 != GNUNET_memcmp (h_wire,
&wcc->h_wire, &wcc->h_wire))
sizeof (struct GNUNET_HashCode)))
{ {
wcc->qs = GNUNET_DB_STATUS_HARD_ERROR; wcc->qs = GNUNET_DB_STATUS_HARD_ERROR;
report_row_inconsistency ("aggregation", report_row_inconsistency ("aggregation",
@ -4393,9 +4386,8 @@ test_master_present (void *cls,
int *found = cls; int *found = cls;
(void) exchange_url; (void) exchange_url;
if (0 == memcmp (mpub, if (0 == GNUNET_memcmp (mpub,
&master_pub, &master_pub))
sizeof (master_pub)))
*found = GNUNET_YES; *found = GNUNET_YES;
} }
@ -4423,9 +4415,8 @@ run (void *cls,
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Launching auditor\n"); "Launching auditor\n");
cfg = c; cfg = c;
if (0 == memcmp (&zeromp, if (0 == GNUNET_memcmp (&zeromp,
&master_pub, &master_pub))
sizeof (struct TALER_MasterPublicKeyP)))
{ {
/* -m option not given, try configuration */ /* -m option not given, try configuration */
char *master_public_key_str; char *master_public_key_str;