diff options
author | Christian Grothoff <grothoff@gnunet.org> | 2022-07-08 14:20:42 +0200 |
---|---|---|
committer | Christian Grothoff <grothoff@gnunet.org> | 2022-07-08 14:20:42 +0200 |
commit | c25c6711c6f2df31fea213e6e6f5ac421b8cd6a1 (patch) | |
tree | e04df93eb9633102845a5c4342c254e0c52b3ec9 /src | |
parent | 0cbac2526ff2287e2cae6d541248393e67ea42f4 (diff) | |
download | merchant-c25c6711c6f2df31fea213e6e6f5ac421b8cd6a1.tar.gz merchant-c25c6711c6f2df31fea213e6e6f5ac421b8cd6a1.tar.bz2 merchant-c25c6711c6f2df31fea213e6e6f5ac421b8cd6a1.zip |
-change to date_s
Diffstat (limited to 'src')
-rw-r--r-- | src/backend/taler-merchant-httpd_private-get-orders.c | 15 | ||||
-rw-r--r-- | src/lib/merchant_api_get_orders.c | 13 | ||||
-rw-r--r-- | src/lib/merchant_api_get_reserves.c | 1 | ||||
-rw-r--r-- | src/lib/merchant_api_get_transfers.c | 1 |
4 files changed, 11 insertions, 19 deletions
diff --git a/src/backend/taler-merchant-httpd_private-get-orders.c b/src/backend/taler-merchant-httpd_private-get-orders.c index d9059702..c2a17530 100644 --- a/src/backend/taler-merchant-httpd_private-get-orders.c +++ b/src/backend/taler-merchant-httpd_private-get-orders.c @@ -686,14 +686,13 @@ TMH_private_get_orders (const struct TMH_RequestHandler *rh, } } } - // FIXME: use date_s, as we round to seconds anyway! { - const char *date_ms_str; + const char *date_s_str; - date_ms_str = MHD_lookup_connection_value (connection, + date_s_str = MHD_lookup_connection_value (connection, MHD_GET_ARGUMENT_KIND, - "date_ms"); - if (NULL == date_ms_str) + "date_s"); + if (NULL == date_s_str) { if (of.delta > 0) of.date = GNUNET_TIME_UNIT_ZERO_TS; @@ -706,7 +705,7 @@ TMH_private_get_orders (const struct TMH_RequestHandler *rh, unsigned long long ll; if (1 != - sscanf (date_ms_str, + sscanf (date_s_str, "%llu%c", &ll, &dummy)) @@ -719,14 +718,14 @@ TMH_private_get_orders (const struct TMH_RequestHandler *rh, } of.date = GNUNET_TIME_absolute_to_timestamp ( - GNUNET_TIME_absolute_from_ms (ll)); + GNUNET_TIME_absolute_from_s (ll)); if (GNUNET_TIME_absolute_is_never (of.date.abs_time)) { GNUNET_break_op (0); return TALER_MHD_reply_with_error (connection, MHD_HTTP_BAD_REQUEST, TALER_EC_GENERIC_PARAMETER_MALFORMED, - "date_ms"); + "date_s"); } } } diff --git a/src/lib/merchant_api_get_orders.c b/src/lib/merchant_api_get_orders.c index 817c9240..7f08acb6 100644 --- a/src/lib/merchant_api_get_orders.c +++ b/src/lib/merchant_api_get_orders.c @@ -273,7 +273,7 @@ TALER_MERCHANT_orders_get2 ( /* build ogh->url with the various optional arguments */ { - char dstr[30]; + char *dstr; bool have_date; bool have_srow; char cbuf[30]; @@ -292,13 +292,7 @@ TALER_MERCHANT_orders_get2 ( sizeof (cbuf), "%llu", (unsigned long long) start_row); - // FIXME: use date_s, no need for milliseconds! - GNUNET_snprintf (dstr, - sizeof (dstr), - "%llu", - (unsigned long long) (date.abs_time.abs_value_us - / GNUNET_TIME_UNIT_MILLISECONDS. - rel_value_us)); + dstr = GNUNET_strdup (GNUNET_TIME_timestamp2s (date)); if (delta > 0) { have_date = ! GNUNET_TIME_absolute_is_zero (date.abs_time); @@ -323,7 +317,7 @@ TALER_MERCHANT_orders_get2 ( (TALER_EXCHANGE_YNA_ALL != wired) ? TALER_yna_to_string (wired) : NULL, - "date_ms", + "date_s", (have_date) ? dstr : NULL, @@ -340,6 +334,7 @@ TALER_MERCHANT_orders_get2 ( ? tbuf : NULL, NULL); + GNUNET_free (dstr); } if (NULL == ogh->url) { diff --git a/src/lib/merchant_api_get_reserves.c b/src/lib/merchant_api_get_reserves.c index 24a527d6..570fc4e5 100644 --- a/src/lib/merchant_api_get_reserves.c +++ b/src/lib/merchant_api_get_reserves.c @@ -235,7 +235,6 @@ TALER_MERCHANT_reserves_get (struct GNUNET_CURL_Context *ctx, rgh->cb_cls = cb_cls; active_s = TALER_yna_to_string (active); failures_s = TALER_yna_to_string (failures); - // FIXME: use different format? after_s = GNUNET_strdup (GNUNET_TIME_timestamp2s (after)); rgh->url = TALER_url_join (backend_url, "private/reserves", diff --git a/src/lib/merchant_api_get_transfers.c b/src/lib/merchant_api_get_transfers.c index 8938c3d7..275990fc 100644 --- a/src/lib/merchant_api_get_transfers.c +++ b/src/lib/merchant_api_get_transfers.c @@ -260,7 +260,6 @@ TALER_MERCHANT_transfers_get ( sizeof (offset_s), "%lld", (unsigned long long) offset); - // FIXME: use other format? before_s = GNUNET_strdup (GNUNET_TIME_timestamp2s (before)); after_s = GNUNET_strdup (GNUNET_TIME_timestamp2s (after)); gth->url = TALER_url_join (backend_url, |