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

lsblk: differentiate between infos[] and columns[] 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2014-07-17 15:35:52 +02:00
parent 5ffe4d514c
commit 03df0d1150
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
misc-utils/lsblk.c
View File

@ -296,7 +296,7 @@ static int column_name_to_id(const char *name, size_t namesz)
{
size_t i;
for (i = 0; i < NCOLS; i++) {
for (i = 0; i < ARRAY_SIZE(infos); i++) {
const char *cn = infos[i].name;
if (!strncasecmp(name, cn, namesz) && !*(cn + namesz))
@ -1494,7 +1494,7 @@ static void __attribute__((__noreturn__)) help(FILE *out)
fprintf(out, _("\nAvailable columns (for --output):\n"));
for (i = 0; i < NCOLS; i++)
for (i = 0; i < ARRAY_SIZE(infos); i++)
fprintf(out, " %11s %s\n", infos[i].name, _(infos[i].help));
fprintf(out, USAGE_MAN_TAIL("lsblk(8)"));
@ -1599,7 +1599,7 @@ int main(int argc, char *argv[])
outarg = optarg;
break;
case 'O':
for (ncolumns = 0 ; ncolumns < (int) NCOLS; ncolumns++)
for (ncolumns = 0 ; ncolumns < (int) ARRAY_SIZE(infos); ncolumns++)
columns[ncolumns] = ncolumns;
break;
case 'p':