diff options
| author | Karel Zak | 2014-07-18 13:22:52 +0200 |
|---|---|---|
| committer | Karel Zak | 2014-07-18 13:50:33 +0200 |
| commit | 059a91f8d0de7a1f2018d97e9e161cd68991f843 (patch) | |
| tree | 3adef6b1d6dd4925e32a7c215ee539fac1d8a598 /sys-utils/wdctl.c | |
| parent | findmnt: more robust usage of columns[] (diff) | |
| download | kernel-qcow2-util-linux-059a91f8d0de7a1f2018d97e9e161cd68991f843.tar.gz kernel-qcow2-util-linux-059a91f8d0de7a1f2018d97e9e161cd68991f843.tar.xz kernel-qcow2-util-linux-059a91f8d0de7a1f2018d97e9e161cd68991f843.zip | |
wdctl: clean up columns[] usage
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'sys-utils/wdctl.c')
| -rw-r--r-- | sys-utils/wdctl.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys-utils/wdctl.c b/sys-utils/wdctl.c index 137649a3d..0628c8eca 100644 --- a/sys-utils/wdctl.c +++ b/sys-utils/wdctl.c @@ -105,8 +105,8 @@ static struct colinfo infos[] = { }; -#define NCOLS ARRAY_SIZE(infos) -static int columns[NCOLS], ncolumns; +static int columns[ARRAY_SIZE(infos) * 2]; +static int ncolumns; struct wdinfo { char *device; @@ -143,7 +143,7 @@ static int column2id(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)) return i; @@ -154,9 +154,8 @@ static int column2id(const char *name, size_t namesz) static int get_column_id(int num) { - assert(ARRAY_SIZE(columns) == NCOLS); assert(num < ncolumns); - assert(columns[num] < (int) NCOLS); + assert(columns[num] < (int) ARRAY_SIZE(infos)); return columns[num]; } |