From ae3e850c946947cead6b9330f7c8e9764bd5f934 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 15 Mar 2017 12:01:06 +0100 Subject: update getopt config parsing style to match 'getopt' GNUnet branch API change --- src/util/amount.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'src/util/amount.c') diff --git a/src/util/amount.c b/src/util/amount.c index 7684ddf32..44eefe6a6 100644 --- a/src/util/amount.c +++ b/src/util/amount.c @@ -252,16 +252,15 @@ invalidate (struct TALER_Amount *a) /** - * Test if @a a is valid + * Test if the given amount is valid. * - * @param a amount to test - * @return #GNUNET_YES if valid, - * #GNUNET_NO if invalid + * @param amount amount to check + * @return #GNUNET_OK if @a amount is valid */ -static int -test_valid (const struct TALER_Amount *a) +int +TALER_amount_is_valid (const struct TALER_Amount *amount) { - return ('\0' != a->currency[0]); + return ('\0' != amount->currency[0]); } @@ -292,8 +291,8 @@ int TALER_amount_cmp_currency (const struct TALER_Amount *a1, const struct TALER_Amount *a2) { - if ( (GNUNET_NO == test_valid (a1)) || - (GNUNET_NO == test_valid (a2)) ) + if ( (GNUNET_NO == TALER_amount_is_valid (a1)) || + (GNUNET_NO == TALER_amount_is_valid (a2)) ) return GNUNET_SYSERR; if (0 == strcasecmp (a1->currency, a2->currency)) @@ -499,7 +498,7 @@ TALER_amount_normalize (struct TALER_Amount *amount) { int ret; - if (GNUNET_YES != test_valid (amount)) + if (GNUNET_YES != TALER_amount_is_valid (amount)) return GNUNET_SYSERR; ret = GNUNET_NO; while ( (amount->value != UINT64_MAX) && @@ -535,7 +534,7 @@ TALER_amount_to_string (const struct TALER_Amount *amount) unsigned int i; struct TALER_Amount norm; - if (GNUNET_YES != test_valid (amount)) + if (GNUNET_YES != TALER_amount_is_valid (amount)) return NULL; norm = *amount; GNUNET_break (GNUNET_SYSERR != -- cgit v1.2.3