diff options
| author | Gian Demarmels <gian@demarmels.org> | 2022-02-04 16:50:32 +0100 |
|---|---|---|
| committer | Gian Demarmels <gian@demarmels.org> | 2022-02-04 16:50:32 +0100 |
| commit | a67786078bb3617ea8d4d308b21781fd0a1c2258 (patch) | |
| tree | 67d476fe3e096001997f6de77d1db92bcd643bbb /src/bank-lib/fakebank.c | |
| parent | 8674f32aec8113ced6b2c2be625728b31158fff8 (diff) | |
| download | exchange-a67786078bb3617ea8d4d308b21781fd0a1c2258.tar.gz exchange-a67786078bb3617ea8d4d308b21781fd0a1c2258.tar.bz2 exchange-a67786078bb3617ea8d4d308b21781fd0a1c2258.zip | |
resolves merge conflicts
Diffstat (limited to 'src/bank-lib/fakebank.c')
| -rw-r--r-- | src/bank-lib/fakebank.c | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/src/bank-lib/fakebank.c b/src/bank-lib/fakebank.c index 11993e558..ab1d73b4a 100644 --- a/src/bank-lib/fakebank.c +++ b/src/bank-lib/fakebank.c @@ -1386,19 +1386,19 @@ handle_admin_add_incoming (struct TALER_FAKEBANK_Handle *h, &json); switch (pr) { - case GNUNET_JSON_PR_OUT_OF_MEMORY: - GNUNET_break (0); - return MHD_NO; - case GNUNET_JSON_PR_CONTINUE: - return MHD_YES; - case GNUNET_JSON_PR_REQUEST_TOO_LARGE: - GNUNET_break (0); - return MHD_NO; - case GNUNET_JSON_PR_JSON_INVALID: - GNUNET_break (0); - return MHD_NO; - case GNUNET_JSON_PR_SUCCESS: - break; + case GNUNET_JSON_PR_OUT_OF_MEMORY: + GNUNET_break (0); + return MHD_NO; + case GNUNET_JSON_PR_CONTINUE: + return MHD_YES; + case GNUNET_JSON_PR_REQUEST_TOO_LARGE: + GNUNET_break (0); + return MHD_NO; + case GNUNET_JSON_PR_JSON_INVALID: + GNUNET_break (0); + return MHD_NO; + case GNUNET_JSON_PR_SUCCESS: + break; } { const char *debit_account; @@ -1510,19 +1510,19 @@ handle_transfer (struct TALER_FAKEBANK_Handle *h, &json); switch (pr) { - case GNUNET_JSON_PR_OUT_OF_MEMORY: - GNUNET_break (0); - return MHD_NO; - case GNUNET_JSON_PR_CONTINUE: - return MHD_YES; - case GNUNET_JSON_PR_REQUEST_TOO_LARGE: - GNUNET_break (0); - return MHD_NO; - case GNUNET_JSON_PR_JSON_INVALID: - GNUNET_break (0); - return MHD_NO; - case GNUNET_JSON_PR_SUCCESS: - break; + case GNUNET_JSON_PR_OUT_OF_MEMORY: + GNUNET_break (0); + return MHD_NO; + case GNUNET_JSON_PR_CONTINUE: + return MHD_YES; + case GNUNET_JSON_PR_REQUEST_TOO_LARGE: + GNUNET_break (0); + return MHD_NO; + case GNUNET_JSON_PR_JSON_INVALID: + GNUNET_break (0); + return MHD_NO; + case GNUNET_JSON_PR_SUCCESS: + break; } { struct GNUNET_HashCode uuid; |