nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

i3bar: Split JSON line logic to read_json_input

This commit is contained in:
Quentin Glidic 2012-09-03 09:52:17 +02:00 committed by Michael Stapelberg
parent 103b1a3f3a
commit f691927aa7
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
i3bar/src/child.c
View File

@ -203,6 +203,18 @@ static void read_flat_input(char *buffer, int length) {
first->full_text = i3string_from_utf8(buffer); first->full_text = i3string_from_utf8(buffer);
} }
static void read_json_input(unsigned char *input, int length) {
yajl_status status = yajl_parse(parser, input, length);
#if YAJL_MAJOR >= 2
if (status != yajl_status_ok) {
#else
if (status != yajl_status_ok && status != yajl_status_insufficient_data) {
#endif
fprintf(stderr, "[i3bar] Could not parse JSON input (code %d): %.*s\n",
status, length, input);
}
}
/* /*
* Callbalk for stdin. We read a line from stdin and store the result * Callbalk for stdin. We read a line from stdin and store the result
* in statusline * in statusline
@ -233,15 +245,7 @@ void stdin_io_cb(struct ev_loop *loop, ev_io *watcher, int revents) {
first_line = false; first_line = false;
} }
if (!plaintext) { if (!plaintext) {
yajl_status status = yajl_parse(parser, json_input, rec); read_json_input(json_input, rec);
#if YAJL_MAJOR >= 2
if (status != yajl_status_ok) {
#else
if (status != yajl_status_ok && status != yajl_status_insufficient_data) {
#endif
fprintf(stderr, "[i3bar] Could not parse JSON input (code %d): %.*s\n",
status, rec, json_input);
}
} else { } else {
read_flat_input((char*)buffer, rec); read_flat_input((char*)buffer, rec);
} }