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

clean up /wire logic

Browse Source
This commit is contained in:
Christian Grothoff 2020-03-15 22:28:13 +01:00
parent efdc91ead4
commit 7993c9b2fd
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/exchange/taler-exchange-httpd_wire.c
View File

@ -47,11 +47,17 @@ fees_to_json (struct TALER_EXCHANGEDB_AggregateFees *af)
json_t *a; json_t *a;
a = json_array (); a = json_array ();
if (NULL == a)
{
GNUNET_break (0); /* out of memory? */
return NULL;
}
while (NULL != af) while (NULL != af)
{ {
if ( (GNUNET_NO == GNUNET_TIME_round_abs (&af->start_date)) || if ( (GNUNET_NO == GNUNET_TIME_round_abs (&af->start_date)) ||
(GNUNET_NO == GNUNET_TIME_round_abs (&af->end_date)) ) (GNUNET_NO == GNUNET_TIME_round_abs (&af->end_date)) )
{ {
GNUNET_break (0); /* bad timestamps, should not happen */
json_decref (a); json_decref (a);
return NULL; return NULL;
} }
@ -72,7 +78,7 @@ fees_to_json (struct TALER_EXCHANGEDB_AggregateFees *af)
"sig", GNUNET_JSON_from_data_auto ( "sig", GNUNET_JSON_from_data_auto (
&af->master_sig)))) &af->master_sig))))
{ {
GNUNET_break (0); GNUNET_break (0); /* out of memory? */
json_decref (a); json_decref (a);
return NULL; return NULL;
} }
@ -109,8 +115,9 @@ TEH_WIRE_get_fees (const char *method)
if (NULL == af) if (NULL == af)
{ {
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Failed to find current wire transfer fees for `%s'\n", "Failed to find current wire transfer fees for `%s' at time %s\n",
method); method,
GNUNET_STRINGS_absolute_time_to_string (now));
return NULL; return NULL;
} }
j = fees_to_json (af); j = fees_to_json (af);