diff options
| author | Christian Grothoff <christian@grothoff.org> | 2017-03-03 20:30:21 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2017-03-03 20:30:21 +0100 |
| commit | b4387ea7b3ae177b06827bbad397887f5556957f (patch) | |
| tree | ab644638406447487ed26bc7476d90b39c504339 /src/backend/taler-merchant-httpd_history.c | |
| parent | 7e1981f355f0ef3d3068f0e011c1973f10e0fd45 (diff) | |
| download | merchant-b4387ea7b3ae177b06827bbad397887f5556957f.tar.gz merchant-b4387ea7b3ae177b06827bbad397887f5556957f.tar.bz2 merchant-b4387ea7b3ae177b06827bbad397887f5556957f.zip | |
fix compiler warnings, fix memory leak, properly format date in log message
Diffstat (limited to 'src/backend/taler-merchant-httpd_history.c')
| -rw-r--r-- | src/backend/taler-merchant-httpd_history.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/backend/taler-merchant-httpd_history.c b/src/backend/taler-merchant-httpd_history.c index da742f19..1d59dc3d 100644 --- a/src/backend/taler-merchant-httpd_history.c +++ b/src/backend/taler-merchant-httpd_history.c @@ -64,10 +64,8 @@ pd_cb (void *cls, json_t *amount; json_t *timestamp; json_t *instance; - json_t *proposal_data_copy; - proposal_data_copy = json_copy (proposal_data); - GNUNET_assert (-1 != json_unpack (proposal_data_copy, + GNUNET_assert (-1 != json_unpack ((json_t *) proposal_data, "{s:o, s:o, s:{s:o}}", "amount", &amount, "timestamp", ×tamp, @@ -87,7 +85,7 @@ pd_cb (void *cls, "instance", json_string_value (instance)))); GNUNET_break (0 == json_array_append_new (response, entry)); - + } // FIXME to zero after returned. @@ -119,7 +117,7 @@ MH_handler_history (struct TMH_RequestHandler *rh, unsigned int ret; unsigned long long seconds; struct MerchantInstance *mi; - + response = json_array (); /*FIXME who decrefs this?*/ str = MHD_lookup_connection_value (connection, MHD_GET_ARGUMENT_KIND, @@ -131,7 +129,7 @@ MH_handler_history (struct TMH_RequestHandler *rh, if (1 != sscanf (str, "%llu", &seconds)) return TMH_RESPONSE_reply_arg_invalid (connection, TALER_EC_PARAMETER_MALFORMED, - "date"); + "date"); } date.abs_value_us = seconds * 1000LL * 1000LL; @@ -156,7 +154,7 @@ MH_handler_history (struct TMH_RequestHandler *rh, start = 0; delta = 20; - + str = MHD_lookup_connection_value (connection, MHD_GET_ARGUMENT_KIND, "start"); @@ -166,7 +164,7 @@ MH_handler_history (struct TMH_RequestHandler *rh, start < 0) return TMH_RESPONSE_reply_arg_invalid (connection, TALER_EC_PARAMETER_MALFORMED, - "start"); + "start"); } str = MHD_lookup_connection_value (connection, @@ -179,11 +177,11 @@ MH_handler_history (struct TMH_RequestHandler *rh, delta < 0) return TMH_RESPONSE_reply_arg_invalid (connection, TALER_EC_PARAMETER_MALFORMED, - "delta"); + "delta"); } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Querying history back to %llu\n", - date.abs_value_us); + "Querying history back to %s\n", + GNUNET_STRINGS_absolute_time_to_string (date)); ret = db->find_proposal_data_by_date (db->cls, date, |