From: Philipp Stephani <p.stephani2@gmail.com>
To: emacs-devel@gnu.org
Cc: Philipp Stephani <phst@google.com>
Subject: [PATCH 1/2] Use Jansson's error code support if available
Date: Tue, 19 Dec 2017 00:17:29 +0100 [thread overview]
Message-ID: <20171218231730.38840-1-phst@google.com> (raw)
* src/json.c (json_parse_error): Use Jansson's error code support if
available.
---
src/json.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/json.c b/src/json.c
index 29e4400fc9..b996cad5a6 100644
--- a/src/json.c
+++ b/src/json.c
@@ -249,15 +249,24 @@ static _Noreturn void
json_parse_error (const json_error_t *error)
{
Lisp_Object symbol;
- /* FIXME: Upstream Jansson should have a way to return error codes
- without parsing the error messages. See
- https://github.com/akheron/jansson/issues/352. */
+#if JANSSON_VERSION_HEX >= 0x020B00
+ switch (json_error_code (error))
+ {
+ case json_error_premature_end_of_input:
+ symbol = Qjson_end_of_file;
+ case json_error_end_of_input_expected:
+ symbol = Qjson_trailing_content;
+ default:
+ symbol = Qjson_parse_error;
+ }
+#else
if (json_has_suffix (error->text, "expected near end of file"))
symbol = Qjson_end_of_file;
else if (json_has_prefix (error->text, "end of file expected"))
symbol = Qjson_trailing_content;
else
symbol = Qjson_parse_error;
+#endif
xsignal (symbol,
list5 (json_build_string (error->text),
json_build_string (error->source), make_natnum (error->line),
--
2.15.1
next reply other threads:[~2017-12-18 23:17 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-18 23:17 Philipp Stephani [this message]
2017-12-18 23:17 ` [PATCH 2/2] JSON serialization: reject duplicate keys in hashtables Philipp Stephani
2017-12-24 12:53 ` Philipp Stephani
2017-12-19 17:11 ` [PATCH 1/2] Use Jansson's error code support if available Eli Zaretskii
2017-12-19 17:35 ` Philipp Stephani
2017-12-19 19:54 ` Eli Zaretskii
2017-12-19 21:49 ` Philipp Stephani
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171218231730.38840-1-phst@google.com \
--to=p.stephani2@gmail.com \
--cc=emacs-devel@gnu.org \
--cc=phst@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.