ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libsmartcols: add support for optional boolean values 

These default to `null` instead of `false`.

Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
This commit is contained in:
Thomas Weißschuh 2021-05-26 13:30:31 +02:00
parent 17353ee0cd
commit f48554d48b
4 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/jsonwrt.h
View File

@ -40,5 +40,7 @@ void ul_jsonwrt_value_u64(struct ul_jsonwrt *fmt,
const char *name, uint64_t data);
void ul_jsonwrt_value_boolean(struct ul_jsonwrt *fmt,
const char *name, int data);
void ul_jsonwrt_value_null(struct ul_jsonwrt *fmt,
const char *name);
#endif /* UTIL_LINUX_JSONWRT_H */

8
lib/jsonwrt.c
View File

@ -214,3 +214,11 @@ void ul_jsonwrt_value_boolean(struct ul_jsonwrt *fmt,
fputs(data ? "true" : "false", fmt->out);
ul_jsonwrt_value_close(fmt);
}
void ul_jsonwrt_value_null(struct ul_jsonwrt *fmt,
const char *name)
{
ul_jsonwrt_value_open(fmt, name);
fputs("null", fmt->out);
ul_jsonwrt_value_close(fmt);
}

3
libsmartcols/src/libsmartcols.h.in
View File

@ -95,7 +95,8 @@ enum {
SCOLS_JSON_NUMBER = 1,
SCOLS_JSON_BOOLEAN = 2,
SCOLS_JSON_ARRAY_STRING = 3, /* e.g. for multi-line (SCOLS_FL_WRAP) cells */
SCOLS_JSON_ARRAY_NUMBER = 4
SCOLS_JSON_ARRAY_NUMBER = 4,
SCOLS_JSON_BOOLEAN_OPTIONAL = 5,
};
/*

15
libsmartcols/src/print.c
View File

@ -524,11 +524,16 @@ static void print_json_data(struct libscols_table *tb,
ul_jsonwrt_value_raw(&tb->json, name, data);
break;
case SCOLS_JSON_BOOLEAN:
/* name: true|false */
ul_jsonwrt_value_boolean(&tb->json, name,
!*data ? 0 :
*data == '0' ? 0 :
*data == 'N' || *data == 'n' ? 0 : 1);
case SCOLS_JSON_BOOLEAN_OPTIONAL:
/* name: true|false|null */
if (cl->json_type == SCOLS_JSON_BOOLEAN_OPTIONAL && (!*data || !strcmp(data, "-"))) {
ul_jsonwrt_value_null(&tb->json, name);
} else {
ul_jsonwrt_value_boolean(&tb->json, name,
!*data ? 0 :
*data == '0' ? 0 :
*data == 'N' || *data == 'n' ? 0 : 1);
}
break;
case SCOLS_JSON_ARRAY_STRING:
case SCOLS_JSON_ARRAY_NUMBER: