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

Merge branch 'ignatenko/libsmartcols-dead' of https://github.com/ignatenkobrain/util-linux 

* 'ignatenko/libsmartcols-dead' of https://github.com/ignatenkobrain/util-linux:
  libsmartcols: remove dead checks
This commit is contained in:
Karel Zak 2017-01-09 13:07:37 +01:00
parent a3c455ac9b 16e64b6822
commit efc0795811
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsmartcols/src/table_print.c
View File

@ -275,7 +275,7 @@ static const char *get_cell_color(struct libscols_table *tb,
const char *color = NULL;
if (tb && tb->colors_wanted) {
if (ce && !color)
if (ce)
color = ce->color;
if (ln && !color)
color = ln->color;
@ -455,7 +455,7 @@ 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 || !*data)
if (!*data)
fputs("null", tb->out);
else
fputs_quoted_json(data, tb->out);