diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-10-20 21:23:14 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-10-20 21:23:20 +0200 |
commit | 1de87fc27f26ce5e1d54526ae66d45f9e35b13ac (patch) | |
tree | cc9a6dc2b59c1615d5742f75d6c2ad16a170451b /src/lib/merchant_api_history.c | |
parent | b9b230e7079bb9e1eb937ef07e1b6b7408176f3d (diff) |
have merchant C API also return taler error codes (at least those from the merchant for now)
Diffstat (limited to 'src/lib/merchant_api_history.c')
-rw-r--r-- | src/lib/merchant_api_history.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/lib/merchant_api_history.c b/src/lib/merchant_api_history.c index 8cce49ed..bf7505f4 100644 --- a/src/lib/merchant_api_history.c +++ b/src/lib/merchant_api_history.c @@ -81,7 +81,7 @@ TALER_MERCHANT_history_cancel (struct TALER_MERCHANT_HistoryOperation *ho) /** * Function called when we're done processing the - * HTTP /track/transaction request. + * HTTP /history request. * * @param cls the `struct TALER_MERCHANT_TrackTransactionHandle` * @param response_code HTTP response code, 0 on error @@ -102,16 +102,18 @@ history_raw_cb (void *cls, break; case MHD_HTTP_OK: ho->cb (ho->cb_cls, - response_code, + MHD_HTTP_OK, + TALER_EC_NONE, json); return; break; case MHD_HTTP_INTERNAL_SERVER_ERROR: - GNUNET_log (GNUNET_ERROR_TYPE_INFO, "history URI not found\n"); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "/history URI not found\n"); break; - case MHD_HTTP_BAD_REQUEST: - GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Wrong parameter passed in URL\n"); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Wrong parameter passed in URL\n"); break; default: /* unexpected response code */ @@ -124,10 +126,12 @@ history_raw_cb (void *cls, } ho->cb (ho->cb_cls, response_code, + TALER_JSON_get_error_code (json), json); TALER_MERCHANT_history_cancel (ho); } + /** * Issue a /history request to the backend. * @@ -135,7 +139,7 @@ history_raw_cb (void *cls, * @param backend_uri base URL of the merchant backend * @param date only transactions younger than/equals to date will be returned * @param history_cb callback which will work the response gotten from the backend - * @param history_cb_cls closure to pass to history_cb + * @param history_cb_cls closure to pass to @a history_cb * @return handle for this operation, NULL upon errors */ struct TALER_MERCHANT_HistoryOperation * |