diff options
| author | Karel Zak | 2016-09-07 11:07:04 +0200 |
|---|---|---|
| committer | Karel Zak | 2016-09-07 11:07:04 +0200 |
| commit | 64ce7cbbc0a43010d97e333cc56b31e3218ab646 (patch) | |
| tree | 2edc10509c8398fdfd4838952efadc59e1721888 /libsmartcols/src/table_print.c | |
| parent | fsck: remove fs-specific options from man page (diff) | |
| download | kernel-qcow2-util-linux-64ce7cbbc0a43010d97e333cc56b31e3218ab646.tar.gz kernel-qcow2-util-linux-64ce7cbbc0a43010d97e333cc56b31e3218ab646.tar.xz kernel-qcow2-util-linux-64ce7cbbc0a43010d97e333cc56b31e3218ab646.zip | |
libsmartcols: allow to change cell padding char
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libsmartcols/src/table_print.c')
| -rw-r--r-- | libsmartcols/src/table_print.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/libsmartcols/src/table_print.c b/libsmartcols/src/table_print.c index 32b9ddab1..69ee32689 100644 --- a/libsmartcols/src/table_print.c +++ b/libsmartcols/src/table_print.c @@ -27,6 +27,11 @@ #include "carefulputc.h" #include "smartcolsP.h" +#define colsep(tb) ((tb)->colsep ? (tb)->colsep : " ") +#define linesep(tb) ((tb)->linesep ? (tb)->linesep : "\n") +#define cellpadding(tb) ((tb) && (tb)->symbols && (tb)->symbols->cell_padding ? (tb)->symbols->cell_padding : " ") + + /* This is private struct to work with output data */ struct libscols_buffer { char *begin; /* begin of the buffer */ @@ -190,9 +195,6 @@ static int is_last_column(struct libscols_column *cl) return 0; } -#define colsep(tb) ((tb)->colsep ? (tb)->colsep : " ") -#define linesep(tb) ((tb)->linesep ? (tb)->linesep : "\n") - static int has_pending_data(struct libscols_table *tb) { @@ -248,7 +250,7 @@ static void print_empty_cell(struct libscols_table *tb, /* fill rest of cell with space */ for(; len_pad < cl->width; ++len_pad) - fputc(' ', tb->out); + fputs(cellpadding(tb), tb->out); fputs(colsep(tb), tb->out); } @@ -393,7 +395,7 @@ static int print_pending_data( return 0; for (i = len; i < width; i++) - fputc(' ', tb->out); /* padding */ + fputs(cellpadding(tb), tb->out); /* padding */ fputs(colsep(tb), tb->out); /* columns separator */ return 0; @@ -505,7 +507,7 @@ static int print_data(struct libscols_table *tb, if (color) fputs(color, tb->out); for (i = len; i < width; i++) - fputc(' ', tb->out); + fputs(cellpadding(tb), tb->out); fputs(data, tb->out); if (color) fputs(UL_COLOR_RESET, tb->out); @@ -528,7 +530,7 @@ static int print_data(struct libscols_table *tb, fputs(data, tb->out); } for (i = len; i < width; i++) - fputc(' ', tb->out); /* padding */ + fputs(cellpadding(tb), tb->out); /* padding */ if (is_last_column(cl)) return 0; |