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 81fd4ec71c
commit de3901bb29
11 changed files with 62 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/load_layout.c
View File

@ -417,16 +417,16 @@ void tree_append_json(const char *filename, char **errormsg) {
LOG("read %d bytes\n", n);
yajl_gen g;
yajl_handle hand;
yajl_callbacks callbacks;
memset(&callbacks, '\0', sizeof(yajl_callbacks));
callbacks.yajl_start_map = json_start_map;
callbacks.yajl_end_map = json_end_map;
callbacks.yajl_end_array = json_end_array;
callbacks.yajl_string = json_string;
callbacks.yajl_map_key = json_key;
callbacks.yajl_integer = json_int;
callbacks.yajl_double = json_double;
callbacks.yajl_boolean = json_bool;
static yajl_callbacks callbacks = {
.yajl_boolean = json_bool,
.yajl_integer = json_int,
.yajl_double = json_double,
.yajl_string = json_string,
.yajl_start_map = json_start_map,
.yajl_map_key = json_key,
.yajl_end_map = json_end_map,
.yajl_end_array = json_end_array,
};
#if YAJL_MAJOR >= 2
g = yajl_gen_alloc(NULL);
hand = yajl_alloc(&callbacks, NULL, (void*)g);