diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-01-16 15:07:53 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-01-16 15:07:53 +0100 |
commit | 17865db5fc19e768200fabee5aa173106d96507b (patch) | |
tree | 44758771c8dde1c487f581811daf76f1e0425b9c | |
parent | 7fe250407c440e59bece248747ffe8b29a8833b3 (diff) | |
download | exchange-17865db5fc19e768200fabee5aa173106d96507b.tar.gz exchange-17865db5fc19e768200fabee5aa173106d96507b.zip |
fixing JSON syntax, adding missing commas, adding spaces for consistency
-rw-r--r-- | src/mint/taler-mint-httpd_parsing.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/mint/taler-mint-httpd_parsing.c b/src/mint/taler-mint-httpd_parsing.c index 7d3f3b5e6..550a89224 100644 --- a/src/mint/taler-mint-httpd_parsing.c +++ b/src/mint/taler-mint-httpd_parsing.c | |||
@@ -285,7 +285,7 @@ GNUNET_MINT_parse_navigate_json (struct MHD_Connection *connection, | |||
285 | 285 | ||
286 | path = json_array (); | 286 | path = json_array (); |
287 | va_start (argp, root); | 287 | va_start (argp, root); |
288 | ret = 2; | 288 | ret = 2; /* just not any of the valid return values */ |
289 | while (2 == ret) | 289 | while (2 == ret) |
290 | { | 290 | { |
291 | enum TALER_MINT_JsonNavigationCommand command | 291 | enum TALER_MINT_JsonNavigationCommand command |
@@ -307,9 +307,11 @@ GNUNET_MINT_parse_navigate_json (struct MHD_Connection *connection, | |||
307 | ret = (MHD_YES == | 307 | ret = (MHD_YES == |
308 | TALER_MINT_reply_json_pack (connection, | 308 | TALER_MINT_reply_json_pack (connection, |
309 | MHD_HTTP_BAD_REQUEST, | 309 | MHD_HTTP_BAD_REQUEST, |
310 | "{s:s,s:o}", | 310 | "{s:s, s:s, s:o}", |
311 | "error", | 311 | "error", |
312 | "missing field in JSON", | 312 | "missing field in JSON", |
313 | "field", | ||
314 | fname, | ||
313 | "path", | 315 | "path", |
314 | path)) | 316 | path)) |
315 | ? GNUNET_NO : GNUNET_SYSERR; | 317 | ? GNUNET_NO : GNUNET_SYSERR; |
@@ -367,7 +369,7 @@ GNUNET_MINT_parse_navigate_json (struct MHD_Connection *connection, | |||
367 | ret = (MHD_YES == | 369 | ret = (MHD_YES == |
368 | TALER_MINT_reply_json_pack (connection, | 370 | TALER_MINT_reply_json_pack (connection, |
369 | MHD_HTTP_BAD_REQUEST, | 371 | MHD_HTTP_BAD_REQUEST, |
370 | "{s:s,s:o}", | 372 | "{s:s, s:o}", |
371 | "error", | 373 | "error", |
372 | "malformed binary data in JSON", | 374 | "malformed binary data in JSON", |
373 | "path", | 375 | "path", |
@@ -432,7 +434,7 @@ GNUNET_MINT_parse_navigate_json (struct MHD_Connection *connection, | |||
432 | ret = (MHD_YES == | 434 | ret = (MHD_YES == |
433 | TALER_MINT_reply_json_pack (connection, | 435 | TALER_MINT_reply_json_pack (connection, |
434 | MHD_HTTP_BAD_REQUEST, | 436 | MHD_HTTP_BAD_REQUEST, |
435 | "{s:s, s:i, s:i s:o}", | 437 | "{s:s, s:i, s:i, s:o}", |
436 | "error", "wrong JSON field type", | 438 | "error", "wrong JSON field type", |
437 | "type_expected", typ, | 439 | "type_expected", typ, |
438 | "type_actual", json_typeof (root), | 440 | "type_actual", json_typeof (root), |