diff options
| author | Marcello Stanisci <stanisci.m@gmail.com> | 2018-10-22 16:59:09 +0200 |
|---|---|---|
| committer | Marcello Stanisci <stanisci.m@gmail.com> | 2018-10-22 16:59:09 +0200 |
| commit | 60c533562cdac20a7343daef654144f161f348eb (patch) | |
| tree | c546a31d8a4348e48b573c2fc94ecd702f862b9b /src/bank-lib/bank_api_admin.c | |
| parent | e83964badb5c266992f5b1312b31aa6a14d392e5 (diff) | |
Fix compiler warnings.
This reverts changes made in b0d00823eb96de733510354. The warnings
are fixed by changing the functions signatures, instead of casting
their pointers.
Diffstat (limited to 'src/bank-lib/bank_api_admin.c')
| -rw-r--r-- | src/bank-lib/bank_api_admin.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/bank-lib/bank_api_admin.c b/src/bank-lib/bank_api_admin.c index a18b95c3f..3a1ec4efa 100644 --- a/src/bank-lib/bank_api_admin.c +++ b/src/bank-lib/bank_api_admin.c @@ -70,16 +70,17 @@ struct TALER_BANK_AdminAddIncomingHandle * * @param cls the `struct TALER_BANK_AdminAddIncomingHandle` * @param response_code HTTP response code, 0 on error - * @param json parsed JSON result, NULL on error + * @param response parsed JSON result, NULL on error */ static void handle_admin_add_incoming_finished (void *cls, long response_code, - const json_t *json) + const void *response) { struct TALER_BANK_AdminAddIncomingHandle *aai = cls; uint64_t row_id = UINT64_MAX; enum TALER_ErrorCode ec; + const json_t *j = response; aai->job = NULL; switch (response_code) @@ -96,7 +97,7 @@ handle_admin_add_incoming_finished (void *cls, }; if (GNUNET_OK != - GNUNET_JSON_parse (json, + GNUNET_JSON_parse (j, spec, NULL, NULL)) { @@ -111,27 +112,27 @@ handle_admin_add_incoming_finished (void *cls, case MHD_HTTP_BAD_REQUEST: /* This should never happen, either us or the bank is buggy (or API version conflict); just pass JSON reply to the application */ - ec = TALER_BANK_parse_ec_ (json); + ec = TALER_BANK_parse_ec_ (j); break; case MHD_HTTP_FORBIDDEN: /* Access denied */ - ec = TALER_BANK_parse_ec_ (json); + ec = TALER_BANK_parse_ec_ (j); break; case MHD_HTTP_UNAUTHORIZED: /* Nothing really to verify, bank says one of the signatures is invalid; as we checked them, this should never happen, we should pass the JSON reply to the application */ - ec = TALER_BANK_parse_ec_ (json); + ec = TALER_BANK_parse_ec_ (j); break; case MHD_HTTP_NOT_FOUND: /* Nothing really to verify, this should never happen, we should pass the JSON reply to the application */ - ec = TALER_BANK_parse_ec_ (json); + ec = TALER_BANK_parse_ec_ (j); break; case MHD_HTTP_INTERNAL_SERVER_ERROR: /* Server had an internal issue; we should retry, but this API leaves this to the application */ - ec = TALER_BANK_parse_ec_ (json); + ec = TALER_BANK_parse_ec_ (j); break; default: /* unexpected response code */ @@ -139,7 +140,7 @@ handle_admin_add_incoming_finished (void *cls, "Unexpected response code %u\n", (unsigned int) response_code); GNUNET_break (0); - ec = TALER_BANK_parse_ec_ (json); + ec = TALER_BANK_parse_ec_ (j); response_code = 0; break; } @@ -147,7 +148,7 @@ handle_admin_add_incoming_finished (void *cls, response_code, ec, row_id, - json); + j); TALER_BANK_admin_add_incoming_cancel (aai); } @@ -247,7 +248,7 @@ TALER_BANK_admin_add_incoming (struct GNUNET_CURL_Context *ctx, aai->job = GNUNET_CURL_job_add (ctx, eh, GNUNET_NO, - (GC_JCC) &handle_admin_add_incoming_finished, + &handle_admin_add_incoming_finished, aai); return aai; } |