ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vppinfra: respect indent in format_table

Browse Source 
Change-Id: Ib7e5cb5adfe81e5cc6243125d91f5179608a7733
Type: improvement
Signed-off-by: Damjan Marion <damarion@cisco.com>
This commit is contained in:
Damjan Marion
2023-11-13 21:46:48 +00:00
committed by Dave Wallace
parent f6f21db2e3
commit dd8f8dec50
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/vppinfra/format_table.c
View File

@ -125,6 +125,7 @@ format_table (u8 *s, va_list *args)
table_t *t = va_arg (*args, table_t *); table_t *t = va_arg (*args, table_t *);
table_cell_t title_cell = { .text = t->title }; table_cell_t title_cell = { .text = t->title };
int table_width = 0; int table_width = 0;
u32 indent = format_get_indent (s);
for (int i = 0; i < vec_len (t->row_sizes); i++) for (int i = 0; i < vec_len (t->row_sizes); i++)
table_width += t->row_sizes[i]; table_width += t->row_sizes[i];
@ -134,7 +135,7 @@ format_table (u8 *s, va_list *args)
title_default = title_default =
t->default_title.as_u32 ? &t->default_title : &default_title; t->default_title.as_u32 ? &t->default_title : &default_title;
s = format_text_cell (t, s, &title_cell, title_default, table_width); s = format_text_cell (t, s, &title_cell, title_default, table_width);
s = format (s, "\n"); s = format (s, "\n%U", format_white_space, indent);
} }
for (int c = 0; c < vec_len (t->cells); c++) for (int c = 0; c < vec_len (t->cells); c++)
@ -161,7 +162,7 @@ format_table (u8 *s, va_list *args)
t->row_sizes[r]); t->row_sizes[r]);
} }
if (c + 1 < vec_len (t->cells)) if (c + 1 < vec_len (t->cells))
s = format (s, "\n"); s = format (s, "\n%U", format_white_space, indent);
} }
return s; return s;