diff options
Diffstat (limited to 'libsmartcols/src/table_print.c')
| -rw-r--r-- | libsmartcols/src/table_print.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libsmartcols/src/table_print.c b/libsmartcols/src/table_print.c index ae8d2da1c..a15bf90e3 100644 --- a/libsmartcols/src/table_print.c +++ b/libsmartcols/src/table_print.c @@ -1067,8 +1067,8 @@ static int count_column_width(struct libscols_table *tb, { struct libscols_line *ln; struct libscols_iter itr; - int count = 0, rc = 0, no_header = 0; - size_t sum = 0; + int extreme_count = 0, rc = 0, no_header = 0; + size_t extreme_sum = 0; assert(tb); assert(cl); @@ -1112,11 +1112,11 @@ static int count_column_width(struct libscols_table *tb, len = 0; cl->width_max = max(len, cl->width_max); - if (cl->is_extreme && len > cl->width_avg * 2) + if (cl->is_extreme && cl->width_avg && len > cl->width_avg * 2) continue; else if (scols_column_is_noextremes(cl)) { - sum += len; - count++; + extreme_sum += len; + extreme_count++; } cl->width = max(len, cl->width); if (scols_column_is_tree(cl)) { @@ -1125,9 +1125,9 @@ static int count_column_width(struct libscols_table *tb, } } - if (count && cl->width_avg == 0) { - cl->width_avg = sum / count; - if (cl->width_max > cl->width_avg * 2) + if (extreme_count && cl->width_avg == 0) { + cl->width_avg = extreme_sum / extreme_count; + if (cl->width_avg && cl->width_max > cl->width_avg * 2) cl->is_extreme = 1; } |