koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use designated initializers for yajl_callbacks struct

Browse Source
This commit is contained in:
Alexander Kedrik
2014-01-01 20:19:55 +04:00
committed by Michael Stapelberg
parent f1560e5eb6
commit 705b43294a
11 changed files with 58 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
i3bar/src/child.c
View File

@ -35,7 +35,6 @@ ev_io *stdin_io;
ev_child *child_sig;
/* JSON parser for stdin */
yajl_callbacks callbacks;
yajl_handle parser;
/* JSON generator for stdout */
@ -458,15 +457,16 @@ void start_child(char *command) {
return;
/* Allocate a yajl parser which will be used to parse stdin. */
memset(&callbacks, '\0', sizeof(yajl_callbacks));
callbacks.yajl_map_key = stdin_map_key;
callbacks.yajl_boolean = stdin_boolean;
callbacks.yajl_string = stdin_string;
callbacks.yajl_integer = stdin_integer;
callbacks.yajl_start_array = stdin_start_array;
callbacks.yajl_end_array = stdin_end_array;
callbacks.yajl_start_map = stdin_start_map;
callbacks.yajl_end_map = stdin_end_map;
yajl_callbacks callbacks = {
.yajl_boolean = stdin_boolean,
.yajl_integer = stdin_integer,
.yajl_string = stdin_string,
.yajl_start_map = stdin_start_map,
.yajl_map_key = stdin_map_key,
.yajl_end_map = stdin_end_map,
.yajl_start_array = stdin_start_array,
.yajl_end_array = stdin_end_array,
};
#if YAJL_MAJOR < 2
yajl_parser_config parse_conf = { 0, 0 };