more small bugfixes

This commit is contained in:
Christian Grothoff 2015-07-04 21:34:50 +02:00
parent 49da00cc2b
commit 915270d77a
5 changed files with 26 additions and 12 deletions

View File

@ -115,9 +115,7 @@ handle_admin_add_incoming_finished (void *cls,
json_error_t error; json_error_t error;
json_t *json; json_t *json;
fprintf (stderr, aai->job = NULL;
"FINISHED AAI request\n");
json = NULL; json = NULL;
if (0 == aai->eno) if (0 == aai->eno)
{ {
@ -326,7 +324,11 @@ TALER_MINT_admin_add_incoming (struct TALER_MINT_Handle *mint,
void void
TALER_MINT_admin_add_incoming_cancel (struct TALER_MINT_AdminAddIncomingHandle *aai) TALER_MINT_admin_add_incoming_cancel (struct TALER_MINT_AdminAddIncomingHandle *aai)
{ {
MAC_job_cancel (aai->job); if (NULL != aai->job)
{
MAC_job_cancel (aai->job);
aai->job = NULL;
}
curl_slist_free_all (aai->headers); curl_slist_free_all (aai->headers);
GNUNET_free (aai->url); GNUNET_free (aai->url);
GNUNET_free (aai->json_enc); GNUNET_free (aai->json_enc);

View File

@ -316,6 +316,7 @@ handle_deposit_finished (void *cls,
json_error_t error; json_error_t error;
json_t *json; json_t *json;
dh->job = NULL;
json = NULL; json = NULL;
if (0 == dh->eno) if (0 == dh->eno)
{ {
@ -709,7 +710,11 @@ TALER_MINT_deposit (struct TALER_MINT_Handle *mint,
void void
TALER_MINT_deposit_cancel (struct TALER_MINT_DepositHandle *deposit) TALER_MINT_deposit_cancel (struct TALER_MINT_DepositHandle *deposit)
{ {
MAC_job_cancel (deposit->job); if (NULL != deposit->job)
{
MAC_job_cancel (deposit->job);
deposit->job = NULL;
}
curl_slist_free_all (deposit->headers); curl_slist_free_all (deposit->headers);
GNUNET_free (deposit->url); GNUNET_free (deposit->url);
GNUNET_free (deposit->json_enc); GNUNET_free (deposit->json_enc);

View File

@ -297,6 +297,7 @@ handle_withdraw_status_finished (void *cls,
json_error_t error; json_error_t error;
json_t *json; json_t *json;
wsh->job = NULL;
json = NULL; json = NULL;
if (0 == wsh->eno) if (0 == wsh->eno)
{ {
@ -540,7 +541,11 @@ TALER_MINT_withdraw_status (struct TALER_MINT_Handle *mint,
void void
TALER_MINT_withdraw_status_cancel (struct TALER_MINT_WithdrawStatusHandle *wsh) TALER_MINT_withdraw_status_cancel (struct TALER_MINT_WithdrawStatusHandle *wsh)
{ {
MAC_job_cancel (wsh->job); if (NULL != wsh->job)
{
MAC_job_cancel (wsh->job);
wsh->job = NULL;
}
GNUNET_free (wsh->url); GNUNET_free (wsh->url);
GNUNET_free (wsh); GNUNET_free (wsh);
} }
@ -793,6 +798,7 @@ handle_withdraw_sign_finished (void *cls,
json_error_t error; json_error_t error;
json_t *json; json_t *json;
wsh->job = NULL;
json = NULL; json = NULL;
if (0 == wsh->eno) if (0 == wsh->eno)
{ {
@ -1067,7 +1073,11 @@ TALER_MINT_withdraw_sign (struct TALER_MINT_Handle *mint,
void void
TALER_MINT_withdraw_sign_cancel (struct TALER_MINT_WithdrawSignHandle *sign) TALER_MINT_withdraw_sign_cancel (struct TALER_MINT_WithdrawSignHandle *sign)
{ {
MAC_job_cancel (sign->job); if (NULL != sign->job)
{
MAC_job_cancel (sign->job);
sign->job = NULL;
}
curl_slist_free_all (sign->headers); curl_slist_free_all (sign->headers);
GNUNET_free (sign->url); GNUNET_free (sign->url);
GNUNET_free (sign->json_enc); GNUNET_free (sign->json_enc);

View File

@ -382,7 +382,6 @@ interpreter_run (void *cls,
{ {
case OC_END: case OC_END:
result = GNUNET_OK; result = GNUNET_OK;
GNUNET_free (is);
GNUNET_SCHEDULER_shutdown (); GNUNET_SCHEDULER_shutdown ();
return; return;
case OC_ADMIN_ADD_INCOMING: case OC_ADMIN_ADD_INCOMING:
@ -441,9 +440,11 @@ interpreter_run (void *cls,
return; return;
case OC_WITHDRAW_SIGN: case OC_WITHDRAW_SIGN:
GNUNET_break (0); // to be implemented! GNUNET_break (0); // to be implemented!
is->ip++;
break; break;
case OC_DEPOSIT: case OC_DEPOSIT:
GNUNET_break (0); // to be implemented! GNUNET_break (0); // to be implemented!
is->ip++;
break; break;
default: default:
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, GNUNET_log (GNUNET_ERROR_TYPE_ERROR,

View File

@ -60,10 +60,6 @@ TMH_RESPONSE_reply_json (struct MHD_Connection *connection,
ret = MHD_queue_response (connection, ret = MHD_queue_response (connection,
response_code, response_code,
resp); resp);
fprintf (stderr,
"Queued response %u (%d)\n",
response_code,
ret);
MHD_destroy_response (resp); MHD_destroy_response (resp);
return ret; return ret;
} }