libsmartcols: make sure boolean is true/false only

.. and never "null".

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2018-04-05 12:12:25 +02:00
parent 92368ce179
commit de30626495
1 changed files with 9 additions and 5 deletions

View File

@ -467,14 +467,18 @@ static int print_data(struct libscols_table *tb,
case SCOLS_FMT_JSON:
fputs_quoted_json_lower(scols_cell_get_data(&cl->header), tb->out);
fputs(":", tb->out);
if (!*data)
fputs("null", tb->out);
else switch (cl->json_type) {
switch (cl->json_type) {
case SCOLS_JSON_STRING:
fputs_quoted_json(data, tb->out);
if (!*data)
fputs("null", tb->out);
else
fputs_quoted_json(data, tb->out);
break;
case SCOLS_JSON_NUMBER:
fputs(data, tb->out);
if (!*data)
fputs("null", tb->out);
else
fputs(data, tb->out);
break;
case SCOLS_JSON_BOOLEAN:
fputs(!*data ? "false" :