diff options
| author | Karel Zak | 2014-07-17 15:35:52 +0200 |
|---|---|---|
| committer | Karel Zak | 2014-07-18 13:45:32 +0200 |
| commit | 03df0d1150d5b8512397ca299edbe10810bb7fbf (patch) | |
| tree | 166cfa30029250a654c2c18c3b93bcde4ea8f9cd /misc-utils/lsblk.c | |
| parent | Merge branch 'patch-1' of https://github.com/bneijt/util-linux (diff) | |
| download | kernel-qcow2-util-linux-03df0d1150d5b8512397ca299edbe10810bb7fbf.tar.gz kernel-qcow2-util-linux-03df0d1150d5b8512397ca299edbe10810bb7fbf.tar.xz kernel-qcow2-util-linux-03df0d1150d5b8512397ca299edbe10810bb7fbf.zip | |
lsblk: differentiate between infos[] and columns[]
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'misc-utils/lsblk.c')
| -rw-r--r-- | misc-utils/lsblk.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c index 688ee6dea..bdd28a29f 100644 --- a/misc-utils/lsblk.c +++ b/misc-utils/lsblk.c @@ -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': |