diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-10-05 15:42:08 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-10-05 15:42:08 +0200 |
commit | b46fe9aa21d0bd3624284be00f72f1de0d510b67 (patch) | |
tree | 368b65ff113b8ead3572adb816fb716317611179 | |
parent | 52bbfe926be03f66d57d15743e9914bc4e201c8c (diff) | |
download | exchange-b46fe9aa21d0bd3624284be00f72f1de0d510b67.tar.gz exchange-b46fe9aa21d0bd3624284be00f72f1de0d510b67.zip |
reindenting with uncrustify
-rw-r--r-- | src/bank-lib/bank_api_history.c | 21 | ||||
-rw-r--r-- | src/bank-lib/test_bank_api_new.c | 113 | ||||
-rw-r--r-- | src/bank-lib/test_bank_api_twisted.c | 11 | ||||
-rw-r--r-- | src/exchange/taler-exchange-httpd_keystate.c | 2 | ||||
-rw-r--r-- | src/exchange/taler-exchange-httpd_refresh_link.c | 2 | ||||
-rw-r--r-- | src/exchange/taler-exchange-httpd_refresh_melt.c | 2 | ||||
-rw-r--r-- | src/exchange/taler-exchange-httpd_refresh_reveal.c | 2 | ||||
-rw-r--r-- | src/exchangedb/exchangedb_auditorkeys.c | 2 | ||||
-rw-r--r-- | src/exchangedb/exchangedb_denomkeys.c | 2 | ||||
-rw-r--r-- | src/exchangedb/plugin_exchangedb_postgres.c | 2 | ||||
-rw-r--r-- | src/exchangedb/test_exchangedb.c | 12 | ||||
-rw-r--r-- | src/exchangedb/test_exchangedb_auditors.c | 2 | ||||
-rw-r--r-- | src/exchangedb/test_exchangedb_denomkeys.c | 2 | ||||
-rw-r--r-- | src/exchangedb/test_exchangedb_signkeys.c | 2 | ||||
-rw-r--r-- | src/lib/exchange_api_handle.c | 4 | ||||
-rw-r--r-- | src/util/amount.c | 2 |
16 files changed, 80 insertions, 103 deletions
diff --git a/src/bank-lib/bank_api_history.c b/src/bank-lib/bank_api_history.c index 88effc44a..a29598a30 100644 --- a/src/bank-lib/bank_api_history.c +++ b/src/bank-lib/bank_api_history.c | |||
@@ -369,17 +369,16 @@ conv_cancel (enum TALER_BANK_Direction direction) | |||
369 | * called. | 369 | * called. |
370 | */ | 370 | */ |
371 | struct TALER_BANK_HistoryHandle * | 371 | struct TALER_BANK_HistoryHandle * |
372 | TALER_BANK_history_range | 372 | TALER_BANK_history_range (struct GNUNET_CURL_Context *ctx, |
373 | (struct GNUNET_CURL_Context *ctx, | 373 | const char *bank_base_url, |
374 | const char *bank_base_url, | 374 | const struct TALER_BANK_AuthenticationData *auth, |
375 | const struct TALER_BANK_AuthenticationData *auth, | 375 | uint64_t account_number, |
376 | uint64_t account_number, | 376 | enum TALER_BANK_Direction direction, |
377 | enum TALER_BANK_Direction direction, | 377 | unsigned int ascending, |
378 | unsigned int ascending, | 378 | struct GNUNET_TIME_Absolute start_date, |
379 | struct GNUNET_TIME_Absolute start_date, | 379 | struct GNUNET_TIME_Absolute end_date, |
380 | struct GNUNET_TIME_Absolute end_date, | 380 | TALER_BANK_HistoryResultCallback hres_cb, |
381 | TALER_BANK_HistoryResultCallback hres_cb, | 381 | void *hres_cb_cls) |
382 | void *hres_cb_cls) | ||
383 | { | 382 | { |
384 | struct TALER_BANK_HistoryHandle *hh; | 383 | struct TALER_BANK_HistoryHandle *hh; |
385 | char *url; | 384 | char *url; |
diff --git a/src/bank-lib/test_bank_api_new.c b/src/bank-lib/test_bank_api_new.c index 5c7920b76..31602a1ee 100644 --- a/src/bank-lib/test_bank_api_new.c +++ b/src/bank-lib/test_bank_api_new.c | |||
@@ -57,6 +57,26 @@ static struct GNUNET_OS_Process *bankd; | |||
57 | static int WITH_FAKEBANK; | 57 | static int WITH_FAKEBANK; |
58 | 58 | ||
59 | /** | 59 | /** |
60 | * Transfer @a amount from @a src account to @a dst using | ||
61 | * @a subject and the @a label for the command. | ||
62 | */ | ||
63 | #define TRANSFER(label,amount,src,dst,subject) \ | ||
64 | TALER_TESTING_cmd_fakebank_transfer_with_subject (label, \ | ||
65 | amount, \ | ||
66 | bank_url, \ | ||
67 | src, \ | ||
68 | dst, \ | ||
69 | AUTHS[src \ | ||
70 | - 1].details.basic. \ | ||
71 | username, \ | ||
72 | AUTHS[src \ | ||
73 | - 1].details.basic. \ | ||
74 | password, \ | ||
75 | subject, \ | ||
76 | "http://exchange.net/") | ||
77 | |||
78 | |||
79 | /** | ||
60 | * Main function that will tell the interpreter what commands to | 80 | * Main function that will tell the interpreter what commands to |
61 | * run. | 81 | * run. |
62 | * | 82 | * |
@@ -70,9 +90,7 @@ run (void *cls, | |||
70 | "Bank serves at `%s'\n", | 90 | "Bank serves at `%s'\n", |
71 | bank_url); | 91 | bank_url); |
72 | extern struct TALER_BANK_AuthenticationData AUTHS[]; | 92 | extern struct TALER_BANK_AuthenticationData AUTHS[]; |
73 | |||
74 | struct TALER_TESTING_Command commands[] = { | 93 | struct TALER_TESTING_Command commands[] = { |
75 | |||
76 | TALER_TESTING_cmd_bank_history ("history-0", | 94 | TALER_TESTING_cmd_bank_history ("history-0", |
77 | bank_url, | 95 | bank_url, |
78 | BANK_ACCOUNT_NUMBER, | 96 | BANK_ACCOUNT_NUMBER, |
@@ -80,20 +98,13 @@ run (void *cls, | |||
80 | GNUNET_YES, | 98 | GNUNET_YES, |
81 | NULL, | 99 | NULL, |
82 | 1), | 100 | 1), |
83 | |||
84 | /* WARNING: old API has expected http response code among | 101 | /* WARNING: old API has expected http response code among |
85 | * the parameters, although it was always set as '200 OK' */ | 102 | * the parameters, although it was always set as '200 OK' */ |
86 | TALER_TESTING_cmd_fakebank_transfer_with_subject | 103 | TRANSFER ("debit-1", |
87 | ("debit-1", | 104 | "KUDOS:5.01", |
88 | "KUDOS:5.01", | 105 | EXCHANGE_ACCOUNT_NUMBER, |
89 | bank_url, | 106 | BANK_ACCOUNT_NUMBER, |
90 | EXCHANGE_ACCOUNT_NUMBER, | 107 | "subject 1"), |
91 | BANK_ACCOUNT_NUMBER, | ||
92 | AUTHS[EXCHANGE_ACCOUNT_NUMBER - 1].details.basic.username, | ||
93 | AUTHS[EXCHANGE_ACCOUNT_NUMBER - 1].details.basic.password, | ||
94 | "subject 1", | ||
95 | "http://exchange.com/"), | ||
96 | |||
97 | TALER_TESTING_cmd_bank_history ("history-1c", | 108 | TALER_TESTING_cmd_bank_history ("history-1c", |
98 | bank_url, | 109 | bank_url, |
99 | BANK_ACCOUNT_NUMBER, | 110 | BANK_ACCOUNT_NUMBER, |
@@ -101,7 +112,6 @@ run (void *cls, | |||
101 | GNUNET_YES, | 112 | GNUNET_YES, |
102 | NULL, | 113 | NULL, |
103 | 5), | 114 | 5), |
104 | |||
105 | TALER_TESTING_cmd_bank_history ("history-1d", | 115 | TALER_TESTING_cmd_bank_history ("history-1d", |
106 | bank_url, | 116 | bank_url, |
107 | BANK_ACCOUNT_NUMBER, | 117 | BANK_ACCOUNT_NUMBER, |
@@ -109,29 +119,16 @@ run (void *cls, | |||
109 | GNUNET_YES, | 119 | GNUNET_YES, |
110 | NULL, | 120 | NULL, |
111 | 5), | 121 | 5), |
112 | 122 | TRANSFER ("debit-2", | |
113 | TALER_TESTING_cmd_fakebank_transfer_with_subject | 123 | "KUDOS:3.21", |
114 | ("debit-2", | 124 | EXCHANGE_ACCOUNT_NUMBER, |
115 | "KUDOS:3.21", | 125 | USER_ACCOUNT_NUMBER, |
116 | bank_url, | 126 | "subject 2"), |
117 | EXCHANGE_ACCOUNT_NUMBER, // debit account. | 127 | TRANSFER ("credit-2", |
118 | USER_ACCOUNT_NUMBER, | 128 | "KUDOS:3.22", |
119 | AUTHS[EXCHANGE_ACCOUNT_NUMBER - 1].details.basic.username, | 129 | USER_ACCOUNT_NUMBER, |
120 | AUTHS[EXCHANGE_ACCOUNT_NUMBER - 1].details.basic.password, | 130 | EXCHANGE_ACCOUNT_NUMBER, |
121 | "subject 2", | 131 | "credit 2"), |
122 | "http://exchange.org/"), | ||
123 | |||
124 | TALER_TESTING_cmd_fakebank_transfer_with_subject | ||
125 | ("credit-2", | ||
126 | "KUDOS:3.22", | ||
127 | bank_url, | ||
128 | USER_ACCOUNT_NUMBER, // debit account. | ||
129 | EXCHANGE_ACCOUNT_NUMBER, | ||
130 | AUTHS[USER_ACCOUNT_NUMBER - 1].details.basic.username, | ||
131 | AUTHS[USER_ACCOUNT_NUMBER - 1].details.basic.password, | ||
132 | "credit 2", | ||
133 | "http://exchange.org/"), | ||
134 | |||
135 | TALER_TESTING_cmd_bank_history ("history-2b", | 132 | TALER_TESTING_cmd_bank_history ("history-2b", |
136 | bank_url, | 133 | bank_url, |
137 | EXCHANGE_ACCOUNT_NUMBER, | 134 | EXCHANGE_ACCOUNT_NUMBER, |
@@ -139,7 +136,6 @@ run (void *cls, | |||
139 | GNUNET_YES, | 136 | GNUNET_YES, |
140 | NULL, | 137 | NULL, |
141 | 5), | 138 | 5), |
142 | |||
143 | TALER_TESTING_cmd_bank_history ("history-2bi", | 139 | TALER_TESTING_cmd_bank_history ("history-2bi", |
144 | bank_url, | 140 | bank_url, |
145 | EXCHANGE_ACCOUNT_NUMBER, | 141 | EXCHANGE_ACCOUNT_NUMBER, |
@@ -147,22 +143,14 @@ run (void *cls, | |||
147 | GNUNET_YES, | 143 | GNUNET_YES, |
148 | "debit-1", | 144 | "debit-1", |
149 | 5), | 145 | 5), |
150 | 146 | TRANSFER ("credit-for-reject-1", | |
151 | TALER_TESTING_cmd_fakebank_transfer_with_subject | 147 | "KUDOS:1.01", |
152 | ("credit-for-reject-1", | 148 | BANK_ACCOUNT_NUMBER, |
153 | "KUDOS:1.01", | 149 | EXCHANGE_ACCOUNT_NUMBER, |
154 | bank_url, | 150 | "subject 3"), |
155 | BANK_ACCOUNT_NUMBER, | ||
156 | EXCHANGE_ACCOUNT_NUMBER, | ||
157 | AUTHS[BANK_ACCOUNT_NUMBER - 1].details.basic.username, | ||
158 | AUTHS[BANK_ACCOUNT_NUMBER - 1].details.basic.password, | ||
159 | "subject 3", | ||
160 | "http://exchange.net/"), | ||
161 | |||
162 | TALER_TESTING_cmd_bank_reject ("reject-1", | 151 | TALER_TESTING_cmd_bank_reject ("reject-1", |
163 | bank_url, | 152 | bank_url, |
164 | "credit-for-reject-1"), | 153 | "credit-for-reject-1"), |
165 | |||
166 | TALER_TESTING_cmd_bank_history ("history-r1", | 154 | TALER_TESTING_cmd_bank_history ("history-r1", |
167 | bank_url, | 155 | bank_url, |
168 | BANK_ACCOUNT_NUMBER, | 156 | BANK_ACCOUNT_NUMBER, |
@@ -170,7 +158,6 @@ run (void *cls, | |||
170 | GNUNET_YES, | 158 | GNUNET_YES, |
171 | NULL, | 159 | NULL, |
172 | 5), | 160 | 5), |
173 | |||
174 | TALER_TESTING_cmd_bank_history ("history-r1c", | 161 | TALER_TESTING_cmd_bank_history ("history-r1c", |
175 | bank_url, | 162 | bank_url, |
176 | BANK_ACCOUNT_NUMBER, | 163 | BANK_ACCOUNT_NUMBER, |
@@ -179,11 +166,6 @@ run (void *cls, | |||
179 | GNUNET_YES, | 166 | GNUNET_YES, |
180 | NULL, | 167 | NULL, |
181 | 5), | 168 | 5), |
182 | |||
183 | /** | ||
184 | * End the suite. Fixme: better to have a label for this | ||
185 | * too, as it shows a "(null)" token on logs. | ||
186 | */ | ||
187 | TALER_TESTING_cmd_end () | 169 | TALER_TESTING_cmd_end () |
188 | }; | 170 | }; |
189 | 171 | ||
@@ -213,9 +195,8 @@ main (int argc, | |||
213 | if (GNUNET_YES == WITH_FAKEBANK) | 195 | if (GNUNET_YES == WITH_FAKEBANK) |
214 | { | 196 | { |
215 | TALER_LOG_DEBUG ("Running against the Fakebank.\n"); | 197 | TALER_LOG_DEBUG ("Running against the Fakebank.\n"); |
216 | if (NULL == (bank_url = TALER_TESTING_prepare_fakebank | 198 | if (NULL == (bank_url = TALER_TESTING_prepare_fakebank (CONFIG_FILE, |
217 | (CONFIG_FILE, | 199 | "account-1"))) |
218 | "account-1"))) | ||
219 | { | 200 | { |
220 | GNUNET_break (0); | 201 | GNUNET_break (0); |
221 | return 77; | 202 | return 77; |
@@ -224,16 +205,14 @@ main (int argc, | |||
224 | else | 205 | else |
225 | { | 206 | { |
226 | TALER_LOG_DEBUG ("Running against the Pybank.\n"); | 207 | TALER_LOG_DEBUG ("Running against the Pybank.\n"); |
227 | if (NULL == (bank_url = TALER_TESTING_prepare_bank | 208 | if (NULL == (bank_url = TALER_TESTING_prepare_bank (CONFIG_FILE))) |
228 | (CONFIG_FILE))) | ||
229 | { | 209 | { |
230 | GNUNET_break (0); | 210 | GNUNET_break (0); |
231 | return 77; | 211 | return 77; |
232 | } | 212 | } |
233 | 213 | ||
234 | if (NULL == (bankd = TALER_TESTING_run_bank | 214 | if (NULL == (bankd = TALER_TESTING_run_bank (CONFIG_FILE, |
235 | (CONFIG_FILE, | 215 | bank_url))) |
236 | bank_url))) | ||
237 | { | 216 | { |
238 | GNUNET_break (0); | 217 | GNUNET_break (0); |
239 | return 77; | 218 | return 77; |
@@ -254,7 +233,7 @@ main (int argc, | |||
254 | GNUNET_OS_process_destroy (bankd); | 233 | GNUNET_OS_process_destroy (bankd); |
255 | GNUNET_free (bank_url); | 234 | GNUNET_free (bank_url); |
256 | } | 235 | } |
257 | 236 | ||
258 | return rv; | 237 | return rv; |
259 | } | 238 | } |
260 | 239 | ||
diff --git a/src/bank-lib/test_bank_api_twisted.c b/src/bank-lib/test_bank_api_twisted.c index e971584f6..49ce94164 100644 --- a/src/bank-lib/test_bank_api_twisted.c +++ b/src/bank-lib/test_bank_api_twisted.c | |||
@@ -161,8 +161,8 @@ main (int argc, | |||
161 | { | 161 | { |
162 | TALER_LOG_DEBUG ("Running against the Fakebank.\n"); | 162 | TALER_LOG_DEBUG ("Running against the Fakebank.\n"); |
163 | if (NULL == (bank_url = TALER_TESTING_prepare_fakebank | 163 | if (NULL == (bank_url = TALER_TESTING_prepare_fakebank |
164 | (CONFIG_FILE, | 164 | (CONFIG_FILE, |
165 | "account-1"))) | 165 | "account-1"))) |
166 | { | 166 | { |
167 | GNUNET_break (0); | 167 | GNUNET_break (0); |
168 | GNUNET_free (twister_url); | 168 | GNUNET_free (twister_url); |
@@ -173,16 +173,15 @@ main (int argc, | |||
173 | { | 173 | { |
174 | TALER_LOG_DEBUG ("Running against the Pybank.\n"); | 174 | TALER_LOG_DEBUG ("Running against the Pybank.\n"); |
175 | if (NULL == (bank_url = TALER_TESTING_prepare_bank | 175 | if (NULL == (bank_url = TALER_TESTING_prepare_bank |
176 | (CONFIG_FILE))) | 176 | (CONFIG_FILE))) |
177 | { | 177 | { |
178 | GNUNET_break (0); | 178 | GNUNET_break (0); |
179 | GNUNET_free (twister_url); | 179 | GNUNET_free (twister_url); |
180 | return 77; | 180 | return 77; |
181 | } | 181 | } |
182 | 182 | ||
183 | if (NULL == (bankd = TALER_TESTING_run_bank | 183 | if (NULL == (bankd = TALER_TESTING_run_bank (CONFIG_FILE, |
184 | (CONFIG_FILE, | 184 | bank_url))) |
185 | bank_url))) | ||
186 | { | 185 | { |
187 | GNUNET_break (0); | 186 | GNUNET_break (0); |
188 | GNUNET_free (twister_url); | 187 | GNUNET_free (twister_url); |
diff --git a/src/exchange/taler-exchange-httpd_keystate.c b/src/exchange/taler-exchange-httpd_keystate.c index 3c4e0e2a3..4962d4f46 100644 --- a/src/exchange/taler-exchange-httpd_keystate.c +++ b/src/exchange/taler-exchange-httpd_keystate.c | |||
@@ -2150,7 +2150,7 @@ TEH_KS_loop (void) | |||
2150 | ret = GNUNET_SYSERR; | 2150 | ret = GNUNET_SYSERR; |
2151 | break; | 2151 | break; |
2152 | } | 2152 | } |
2153 | read_again: | 2153 | read_again: |
2154 | errno = 0; | 2154 | errno = 0; |
2155 | res = read (reload_pipe[0], | 2155 | res = read (reload_pipe[0], |
2156 | &c, | 2156 | &c, |
diff --git a/src/exchange/taler-exchange-httpd_refresh_link.c b/src/exchange/taler-exchange-httpd_refresh_link.c index e5a332308..d29d4e642 100644 --- a/src/exchange/taler-exchange-httpd_refresh_link.c +++ b/src/exchange/taler-exchange-httpd_refresh_link.c | |||
@@ -115,7 +115,7 @@ handle_link_data (void *cls, | |||
115 | root)) | 115 | root)) |
116 | goto fail; | 116 | goto fail; |
117 | return; | 117 | return; |
118 | fail: | 118 | fail: |
119 | ctx->ec = TALER_EC_JSON_ALLOCATION_FAILURE; | 119 | ctx->ec = TALER_EC_JSON_ALLOCATION_FAILURE; |
120 | json_decref (ctx->mlist); | 120 | json_decref (ctx->mlist); |
121 | ctx->mlist = NULL; | 121 | ctx->mlist = NULL; |
diff --git a/src/exchange/taler-exchange-httpd_refresh_melt.c b/src/exchange/taler-exchange-httpd_refresh_melt.c index 702857b8c..76f0fac72 100644 --- a/src/exchange/taler-exchange-httpd_refresh_melt.c +++ b/src/exchange/taler-exchange-httpd_refresh_melt.c | |||
@@ -597,7 +597,7 @@ TEH_REFRESH_handler_refresh_melt (struct TEH_RequestHandler *rh, | |||
597 | &rmc); | 597 | &rmc); |
598 | 598 | ||
599 | 599 | ||
600 | cleanup: | 600 | cleanup: |
601 | if (NULL != key_state) | 601 | if (NULL != key_state) |
602 | { | 602 | { |
603 | TEH_KS_release (key_state); | 603 | TEH_KS_release (key_state); |
diff --git a/src/exchange/taler-exchange-httpd_refresh_reveal.c b/src/exchange/taler-exchange-httpd_refresh_reveal.c index 8746ba5d0..29f0738ad 100644 --- a/src/exchange/taler-exchange-httpd_refresh_reveal.c +++ b/src/exchange/taler-exchange-httpd_refresh_reveal.c | |||
@@ -816,7 +816,7 @@ handle_refresh_reveal_json (struct MHD_Connection *connection, | |||
816 | } /* end for (retries...) */ | 816 | } /* end for (retries...) */ |
817 | GNUNET_break (MHD_NO != res); | 817 | GNUNET_break (MHD_NO != res); |
818 | 818 | ||
819 | cleanup: | 819 | cleanup: |
820 | GNUNET_break (MHD_NO != res); | 820 | GNUNET_break (MHD_NO != res); |
821 | /* free resources */ | 821 | /* free resources */ |
822 | if (NULL != rctx->ev_sigs) | 822 | if (NULL != rctx->ev_sigs) |
diff --git a/src/exchangedb/exchangedb_auditorkeys.c b/src/exchangedb/exchangedb_auditorkeys.c index 6546c1a3f..bfe406d6d 100644 --- a/src/exchangedb/exchangedb_auditorkeys.c +++ b/src/exchangedb/exchangedb_auditorkeys.c | |||
@@ -294,7 +294,7 @@ TALER_EXCHANGEDB_auditor_write (const char *filename, | |||
294 | auditor_url, | 294 | auditor_url, |
295 | wsize)) | 295 | wsize)) |
296 | ret = GNUNET_OK; | 296 | ret = GNUNET_OK; |
297 | cleanup: | 297 | cleanup: |
298 | eno = errno; | 298 | eno = errno; |
299 | if (NULL != fh) | 299 | if (NULL != fh) |
300 | (void) GNUNET_DISK_file_close (fh); | 300 | (void) GNUNET_DISK_file_close (fh); |
diff --git a/src/exchangedb/exchangedb_denomkeys.c b/src/exchangedb/exchangedb_denomkeys.c index fad15cd54..0584c2c6d 100644 --- a/src/exchangedb/exchangedb_denomkeys.c +++ b/src/exchangedb/exchangedb_denomkeys.c | |||
@@ -227,7 +227,7 @@ TALER_EXCHANGEDB_denomination_key_write (const char *filename, | |||
227 | if (wrote != priv_enc_size) | 227 | if (wrote != priv_enc_size) |
228 | goto cleanup; | 228 | goto cleanup; |
229 | ret = GNUNET_OK; | 229 | ret = GNUNET_OK; |
230 | cleanup: | 230 | cleanup: |
231 | GNUNET_free_non_null (priv_enc); | 231 | GNUNET_free_non_null (priv_enc); |
232 | if (NULL != fh) | 232 | if (NULL != fh) |
233 | (void) GNUNET_DISK_file_close (fh); | 233 | (void) GNUNET_DISK_file_close (fh); |
diff --git a/src/exchangedb/plugin_exchangedb_postgres.c b/src/exchangedb/plugin_exchangedb_postgres.c index 17894281b..724f8022f 100644 --- a/src/exchangedb/plugin_exchangedb_postgres.c +++ b/src/exchangedb/plugin_exchangedb_postgres.c | |||
@@ -4103,7 +4103,7 @@ postgres_get_refresh_reveal (void *cls, | |||
4103 | &tp); | 4103 | &tp); |
4104 | GNUNET_PQ_cleanup_result (rs); | 4104 | GNUNET_PQ_cleanup_result (rs); |
4105 | 4105 | ||
4106 | cleanup: | 4106 | cleanup: |
4107 | for (unsigned int i = 0; i < grctx.rrcs_len; i++) | 4107 | for (unsigned int i = 0; i < grctx.rrcs_len; i++) |
4108 | { | 4108 | { |
4109 | struct TALER_EXCHANGEDB_RefreshRevealedCoin *rrc = &grctx.rrcs[i]; | 4109 | struct TALER_EXCHANGEDB_RefreshRevealedCoin *rrc = &grctx.rrcs[i]; |
diff --git a/src/exchangedb/test_exchangedb.c b/src/exchangedb/test_exchangedb.c index 6c48f3a19..b093df4be 100644 --- a/src/exchangedb/test_exchangedb.c +++ b/src/exchangedb/test_exchangedb.c | |||
@@ -136,7 +136,7 @@ test_wire_prepare (struct TALER_EXCHANGEDB_Session *session) | |||
136 | &dead_prepare_cb, | 136 | &dead_prepare_cb, |
137 | NULL)); | 137 | NULL)); |
138 | return GNUNET_OK; | 138 | return GNUNET_OK; |
139 | drop: | 139 | drop: |
140 | return GNUNET_SYSERR; | 140 | return GNUNET_SYSERR; |
141 | } | 141 | } |
142 | 142 | ||
@@ -171,7 +171,7 @@ check_reserve (struct TALER_EXCHANGEDB_Session *session, | |||
171 | FAILIF (0 != strcmp (currency, reserve.balance.currency)); | 171 | FAILIF (0 != strcmp (currency, reserve.balance.currency)); |
172 | 172 | ||
173 | return GNUNET_OK; | 173 | return GNUNET_OK; |
174 | drop: | 174 | drop: |
175 | return GNUNET_SYSERR; | 175 | return GNUNET_SYSERR; |
176 | } | 176 | } |
177 | 177 | ||
@@ -668,7 +668,7 @@ test_melting (struct TALER_EXCHANGEDB_Session *session) | |||
668 | 668 | ||
669 | 669 | ||
670 | ret = GNUNET_OK; | 670 | ret = GNUNET_OK; |
671 | drop: | 671 | drop: |
672 | if (NULL != revealed_coins) | 672 | if (NULL != revealed_coins) |
673 | { | 673 | { |
674 | for (unsigned int cnt = 0; cnt < MELT_NEW_COINS; cnt++) | 674 | for (unsigned int cnt = 0; cnt < MELT_NEW_COINS; cnt++) |
@@ -1306,7 +1306,7 @@ test_wire_out (struct TALER_EXCHANGEDB_Session *session, | |||
1306 | FAILIF (1 != auditor_row_cnt); | 1306 | FAILIF (1 != auditor_row_cnt); |
1307 | 1307 | ||
1308 | return GNUNET_OK; | 1308 | return GNUNET_OK; |
1309 | drop: | 1309 | drop: |
1310 | return GNUNET_SYSERR; | 1310 | return GNUNET_SYSERR; |
1311 | } | 1311 | } |
1312 | 1312 | ||
@@ -1340,7 +1340,7 @@ payback_cb (void *cls, | |||
1340 | FAILIF (0 != GNUNET_memcmp (cb, | 1340 | FAILIF (0 != GNUNET_memcmp (cb, |
1341 | coin_blind)); | 1341 | coin_blind)); |
1342 | return GNUNET_OK; | 1342 | return GNUNET_OK; |
1343 | drop: | 1343 | drop: |
1344 | return GNUNET_SYSERR; | 1344 | return GNUNET_SYSERR; |
1345 | } | 1345 | } |
1346 | 1346 | ||
@@ -2190,7 +2190,7 @@ run (void *cls) | |||
2190 | 2190 | ||
2191 | result = 0; | 2191 | result = 0; |
2192 | 2192 | ||
2193 | drop: | 2193 | drop: |
2194 | if ( (0 != result) && | 2194 | if ( (0 != result) && |
2195 | (NULL != session) ) | 2195 | (NULL != session) ) |
2196 | plugin->rollback (plugin->cls, | 2196 | plugin->rollback (plugin->cls, |
diff --git a/src/exchangedb/test_exchangedb_auditors.c b/src/exchangedb/test_exchangedb_auditors.c index ecbb68547..e0af3f157 100644 --- a/src/exchangedb/test_exchangedb_auditors.c +++ b/src/exchangedb/test_exchangedb_auditors.c | |||
@@ -155,7 +155,7 @@ main (int argc, | |||
155 | &auditor_cb, | 155 | &auditor_cb, |
156 | NULL)); | 156 | NULL)); |
157 | ret = 0; | 157 | ret = 0; |
158 | EXITIF_exit: | 158 | EXITIF_exit: |
159 | if (NULL != tmpdir) | 159 | if (NULL != tmpdir) |
160 | { | 160 | { |
161 | (void) GNUNET_DISK_directory_remove (tmpdir); | 161 | (void) GNUNET_DISK_directory_remove (tmpdir); |
diff --git a/src/exchangedb/test_exchangedb_denomkeys.c b/src/exchangedb/test_exchangedb_denomkeys.c index 1bb283bb0..55a3f08f8 100644 --- a/src/exchangedb/test_exchangedb_denomkeys.c +++ b/src/exchangedb/test_exchangedb_denomkeys.c | |||
@@ -193,7 +193,7 @@ main (int argc, | |||
193 | enc_size)); | 193 | enc_size)); |
194 | ret = 0; | 194 | ret = 0; |
195 | 195 | ||
196 | EXITIF_exit: | 196 | EXITIF_exit: |
197 | GNUNET_free_non_null (enc); | 197 | GNUNET_free_non_null (enc); |
198 | GNUNET_free_non_null (tmpfile); | 198 | GNUNET_free_non_null (tmpfile); |
199 | if (NULL != tmpdir) | 199 | if (NULL != tmpdir) |
diff --git a/src/exchangedb/test_exchangedb_signkeys.c b/src/exchangedb/test_exchangedb_signkeys.c index 99d65e26f..d4dc152cd 100644 --- a/src/exchangedb/test_exchangedb_signkeys.c +++ b/src/exchangedb/test_exchangedb_signkeys.c | |||
@@ -86,7 +86,7 @@ main (int argc, | |||
86 | &ski_iter, | 86 | &ski_iter, |
87 | &ski)); | 87 | &ski)); |
88 | ret = 0; | 88 | ret = 0; |
89 | EXITIF_exit: | 89 | EXITIF_exit: |
90 | if (NULL != tmpfile) | 90 | if (NULL != tmpfile) |
91 | { | 91 | { |
92 | (void) GNUNET_DISK_directory_remove (tmpfile); | 92 | (void) GNUNET_DISK_directory_remove (tmpfile); |
diff --git a/src/lib/exchange_api_handle.c b/src/lib/exchange_api_handle.c index 461569a9c..db20f4381 100644 --- a/src/lib/exchange_api_handle.c +++ b/src/lib/exchange_api_handle.c | |||
@@ -519,7 +519,7 @@ parse_json_denomkey (struct TALER_EXCHANGE_DenomPublicKey *denom_key, | |||
519 | sizeof (struct GNUNET_HashCode)); | 519 | sizeof (struct GNUNET_HashCode)); |
520 | return GNUNET_OK; | 520 | return GNUNET_OK; |
521 | 521 | ||
522 | EXITIF_exit: | 522 | EXITIF_exit: |
523 | GNUNET_JSON_parse_free (spec); | 523 | GNUNET_JSON_parse_free (spec); |
524 | return GNUNET_SYSERR; | 524 | return GNUNET_SYSERR; |
525 | } | 525 | } |
@@ -1061,7 +1061,7 @@ decode_keys_json (const json_t *resp_obj, | |||
1061 | &pub.eddsa_pub)); | 1061 | &pub.eddsa_pub)); |
1062 | } | 1062 | } |
1063 | return GNUNET_OK; | 1063 | return GNUNET_OK; |
1064 | EXITIF_exit: | 1064 | EXITIF_exit: |
1065 | 1065 | ||
1066 | *vc = TALER_EXCHANGE_VC_PROTOCOL_ERROR; | 1066 | *vc = TALER_EXCHANGE_VC_PROTOCOL_ERROR; |
1067 | if (NULL != hash_context) | 1067 | if (NULL != hash_context) |
diff --git a/src/util/amount.c b/src/util/amount.c index 8e801267f..21410c769 100644 --- a/src/util/amount.c +++ b/src/util/amount.c | |||
@@ -164,7 +164,7 @@ TALER_string_to_amount (const char *str, | |||
164 | } | 164 | } |
165 | return GNUNET_OK; | 165 | return GNUNET_OK; |
166 | 166 | ||
167 | fail: | 167 | fail: |
168 | /* set currency to 'invalid' to prevent accidental use */ | 168 | /* set currency to 'invalid' to prevent accidental use */ |
169 | memset (denom->currency, | 169 | memset (denom->currency, |
170 | 0, | 170 | 0, |