use designated initializers for yajl_callbacks struct

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

View File

@ -93,20 +93,6 @@ static int header_map_key(void *ctx, const unsigned char *stringval, unsigned in
return 1;
}
static yajl_callbacks version_callbacks = {
NULL, /* null */
&header_boolean, /* boolean */
&header_integer,
NULL, /* double */
NULL, /* number */
NULL, /* string */
NULL, /* start_map */
&header_map_key,
NULL, /* end_map */
NULL, /* start_array */
NULL /* end_array */
};
static void child_init(i3bar_child *child) {
child->version = 0;
child->stop_signal = SIGSTOP;
@ -122,6 +108,12 @@ static void child_init(i3bar_child *child) {
*
*/
void parse_json_header(i3bar_child *child, const unsigned char *buffer, int length, unsigned int *consumed) {
static yajl_callbacks version_callbacks = {
.yajl_boolean = header_boolean,
.yajl_integer = header_integer,
.yajl_map_key = &header_map_key,
};
child_init(child);
current_key = NO_KEY;