External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-06 09:55:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

vsh-table: Get rid of trailing spaces

Browse Source 
Get rid of trailing spaces which can be found after last column in tables.

Signed-off-by: Simon Kobyda <skobyda@redhat.com>
This commit is contained in:
Simon Kobyda 2018-11-27 10:07:32 +01:00 committed by Michal Privoznik
parent 4b4ed783ba
commit 071488983c
3 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/virshtest.c
View File

@ -96,9 +96,9 @@ static int testCompareListDefault(const void *data ATTRIBUTE_UNUSED)
{ {
const char *const argv[] = { VIRSH_DEFAULT, "list", NULL }; const char *const argv[] = { VIRSH_DEFAULT, "list", NULL };
const char *exp = "\ const char *exp = "\
Id Name State \n\ Id Name State\n\
----------------------\n\ ----------------------\n\
1 test running \n\ 1 test running\n\
\n"; \n";
return testCompareOutputLit(exp, NULL, argv); return testCompareOutputLit(exp, NULL, argv);
} }
@ -107,10 +107,10 @@ static int testCompareListCustom(const void *data ATTRIBUTE_UNUSED)
{ {
const char *const argv[] = { VIRSH_CUSTOM, "list", NULL }; const char *const argv[] = { VIRSH_CUSTOM, "list", NULL };
const char *exp = "\ const char *exp = "\
Id Name State \n\ Id Name State\n\
----------------------\n\ ----------------------\n\
1 fv0 running \n\ 1 fv0 running\n\
2 fc4 running \n\ 2 fc4 running\n\
\n"; \n";
return testCompareOutputLit(exp, NULL, argv); return testCompareOutputLit(exp, NULL, argv);
} }

58
tests/vshtabletest.c
View File

@ -43,13 +43,13 @@ testVshTableHeader(const void *opaque ATTRIBUTE_UNUSED)
int ret = 0; int ret = 0;
char *act = NULL; char *act = NULL;
const char *exp = const char *exp =
" 1 fedora28 running \n" " 1 fedora28 running\n"
" 2 rhel7.5 running \n"; " 2 rhel7.5 running\n";
const char *exp2 = const char *exp2 =
" Id Name State \n" " Id Name State\n"
"--------------------------\n" "--------------------------\n"
" 1 fedora28 running \n" " 1 fedora28 running\n"
" 2 rhel7.5 running \n"; " 2 rhel7.5 running\n";
vshTablePtr table = vshTableNew("Id", "Name", "State", vshTablePtr table = vshTableNew("Id", "Name", "State",
NULL); //to ask about return NULL); //to ask about return
@ -118,10 +118,10 @@ testUnicode(const void *opaque ATTRIBUTE_UNUSED)
char *act = NULL; char *act = NULL;
const char *exp = const char *exp =
" Id 名稱 государство \n" " Id 名稱 государство\n"
"-----------------------------------------\n" "-----------------------------------------\n"
" 1 fedora28 running \n" " 1 fedora28 running\n"
" 2 つへソrhel7.5つへソ running \n"; " 2 つへソrhel7.5つへソ running\n";
vshTablePtr table; vshTablePtr table;
table = vshTableNew("Id", "名稱", "государство", NULL); table = vshTableNew("Id", "名稱", "государство", NULL);
@ -150,10 +150,10 @@ testUnicodeArabic(const void *opaque ATTRIBUTE_UNUSED)
char *act = NULL; char *act = NULL;
const char *exp = const char *exp =
" ﻡﺍ ﻢﻣﺍ ﻕﺎﺌﻣﺓ ﺓ ﺎﻠﺼﻋ ﺍﻸﺜﻧﺎﻧ \n" " ﻡﺍ ﻢﻣﺍ ﻕﺎﺌﻣﺓ ﺓ ﺎﻠﺼﻋ ﺍﻸﺜﻧﺎﻧ\n"
"-------------------------------------------------------------------------------------------\n" "-------------------------------------------------------------------------------------------\n"
" 1 ﻉﺪﻴﻟ ﺎﻠﺜﻘﻴﻟ ﻕﺎﻣ ﻊﻧ, ٣٠ ﻎﻴﻨﻳﺍ ﻮﺘﻧﺎﻤﺗ ﺎﻠﺛﺎﻠﺛ، ﺄﺳﺭ, ﺩﻮﻟ ﺩﻮﻟ. ﺄﻣﺎﻣ ﺍ ﺎﻧ ﻲﻜﻧ \n" " 1 ﻉﺪﻴﻟ ﺎﻠﺜﻘﻴﻟ ﻕﺎﻣ ﻊﻧ, ٣٠ ﻎﻴﻨﻳﺍ ﻮﺘﻧﺎﻤﺗ ﺎﻠﺛﺎﻠﺛ، ﺄﺳﺭ, ﺩﻮﻟ ﺩﻮﻟ. ﺄﻣﺎﻣ ﺍ ﺎﻧ ﻲﻜﻧ\n"
" ﺺﻔﺣﺓ ﺖﻜﺘﻴﻛﺍً ﻊﻟ, ﺎﻠﺠﻧﻭﺩ ﻭﺎﻠﻌﺗﺍﺩ ﺵﺭ \n"; " ﺺﻔﺣﺓ ﺖﻜﺘﻴﻛﺍً ﻊﻟ, ﺎﻠﺠﻧﻭﺩ ﻭﺎﻠﻌﺗﺍﺩ ﺵﺭ\n";
vshTablePtr table; vshTablePtr table;
wchar_t wc; wchar_t wc;
@ -192,10 +192,10 @@ testUnicodeZeroWidthChar(const void *opaque ATTRIBUTE_UNUSED)
int ret = 0; int ret = 0;
vshTablePtr table = NULL; vshTablePtr table = NULL;
const char *exp = const char *exp =
" I\u200Bd Name \u200BStatus \n" " I\u200Bd Name \u200BStatus\n"
"--------------------------\n" "--------------------------\n"
" 1\u200B fedora28 run\u200Bning \n" " 1\u200B fedora28 run\u200Bning\n"
" 2 rhel7.5 running \n"; " 2 rhel7.5 running\n";
char *act = NULL; char *act = NULL;
wchar_t wc; wchar_t wc;
@ -229,10 +229,10 @@ testUnicodeCombiningChar(const void *opaque ATTRIBUTE_UNUSED)
int ret = 0; int ret = 0;
vshTablePtr table = NULL; vshTablePtr table = NULL;
const char *exp = const char *exp =
" Id Náme Ⓢtatus \n" " Id Náme Ⓢtatus\n"
"--------------------------\n" "--------------------------\n"
" 1 fědora28 running \n" " 1 fědora28 running\n"
" 2 rhel running \n"; " 2 rhel running\n";
char *act = NULL; char *act = NULL;
table = vshTableNew("Id", "Náme", "Ⓢtatus", NULL); table = vshTableNew("Id", "Náme", "Ⓢtatus", NULL);
@ -258,10 +258,10 @@ testUnicodeNonPrintableChar(const void *opaque ATTRIBUTE_UNUSED)
int ret = 0; int ret = 0;
vshTablePtr table = NULL; vshTablePtr table = NULL;
const char *exp = const char *exp =
" I\\x09d Name Status \n" " I\\x09d Name Status\n"
"----------------------------------\n" "----------------------------------\n"
" 1 f\\x07edora28 running \n" " 1 f\\x07edora28 running\n"
" 2 rhel7.5 running \n"; " 2 rhel7.5 running\n";
char *act = NULL; char *act = NULL;
table = vshTableNew("I\td", "Name", "Status", NULL); table = vshTableNew("I\td", "Name", "Status", NULL);
@ -288,20 +288,20 @@ testNTables(const void *opaque ATTRIBUTE_UNUSED)
vshTablePtr table2 = NULL; vshTablePtr table2 = NULL;
vshTablePtr table3 = NULL; vshTablePtr table3 = NULL;
const char *exp1 = const char *exp1 =
" Id Name Status \n" " Id Name Status\n"
"--------------------------\n" "--------------------------\n"
" 1 fedora28 running \n" " 1 fedora28 running\n"
" 2 rhel7.5 running \n"; " 2 rhel7.5 running\n";
const char *exp2 = const char *exp2 =
" Id Name Status \n" " Id Name Status\n"
"---------------------\n"; "---------------------\n";
const char *exp3 = const char *exp3 =
" Id \n" " Id\n"
"-----\n" "-----\n"
" 1 \n" " 1\n"
" 2 \n" " 2\n"
" 3 \n" " 3\n"
" 4 \n"; " 4\n";
char *act1 = NULL; char *act1 = NULL;
char *act2 = NULL; char *act2 = NULL;
char *act3 = NULL; char *act3 = NULL;

6
tools/vsh-table.c
View File

@ -348,8 +348,10 @@ vshTableRowPrint(vshTableRowPtr row,
for (i = 0; i < row->ncells; i++) { for (i = 0; i < row->ncells; i++) {
virBufferAsprintf(buf, " %s", row->cells[i]); virBufferAsprintf(buf, " %s", row->cells[i]);
for (j = 0; j < maxwidths[i] - widths[i] + 2; j++) if (i < (row->ncells - 1)) {
virBufferAddChar(buf, ' '); for (j = 0; j < maxwidths[i] - widths[i] + 2; j++)
virBufferAddChar(buf, ' ');
}
} }
virBufferAddChar(buf, '\n'); virBufferAddChar(buf, '\n');
} }