diff options
| author | Sami Kerola | 2017-02-11 21:23:26 +0100 |
|---|---|---|
| committer | Karel Zak | 2017-02-20 12:58:49 +0100 |
| commit | 87918040658f2fa9b1bf78f1f8f4f5c065a2e3a3 (patch) | |
| tree | 513541cfa347d7fc66e50137603489cb195c86de /sys-utils/mount.c | |
| parent | cfdisk: avoid use of VLA in combination with sizeof() [smatch scan] (diff) | |
| download | kernel-qcow2-util-linux-87918040658f2fa9b1bf78f1f8f4f5c065a2e3a3.tar.gz kernel-qcow2-util-linux-87918040658f2fa9b1bf78f1f8f4f5c065a2e3a3.tar.xz kernel-qcow2-util-linux-87918040658f2fa9b1bf78f1f8f4f5c065a2e3a3.zip | |
misc: do not use plain 0 as NULL [smatch scan]
text-utils/tailf.c:69:21: warning: Using plain integer as NULL pointer
Since many 'struct option' has used zero as NULL make them more readable in
same go by reindenting, and using named argument requirements.
Reference: https://lwn.net/Articles/93577/
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Diffstat (limited to 'sys-utils/mount.c')
| -rw-r--r-- | sys-utils/mount.c | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/sys-utils/mount.c b/sys-utils/mount.c index 0b55500f2..b09e77616 100644 --- a/sys-utils/mount.c +++ b/sys-utils/mount.c @@ -832,40 +832,40 @@ int main(int argc, char **argv) }; static const struct option longopts[] = { - { "all", 0, 0, 'a' }, - { "fake", 0, 0, 'f' }, - { "fstab", 1, 0, 'T' }, - { "fork", 0, 0, 'F' }, - { "help", 0, 0, 'h' }, - { "no-mtab", 0, 0, 'n' }, - { "read-only", 0, 0, 'r' }, - { "ro", 0, 0, 'r' }, - { "verbose", 0, 0, 'v' }, - { "version", 0, 0, 'V' }, - { "read-write", 0, 0, 'w' }, - { "rw", 0, 0, 'w' }, - { "options", 1, 0, 'o' }, - { "test-opts", 1, 0, 'O' }, - { "types", 1, 0, 't' }, - { "uuid", 1, 0, 'U' }, - { "label", 1, 0, 'L'}, - { "bind", 0, 0, 'B' }, - { "move", 0, 0, 'M' }, - { "rbind", 0, 0, 'R' }, - { "make-shared", 0, 0, MOUNT_OPT_SHARED }, - { "make-slave", 0, 0, MOUNT_OPT_SLAVE }, - { "make-private", 0, 0, MOUNT_OPT_PRIVATE }, - { "make-unbindable", 0, 0, MOUNT_OPT_UNBINDABLE }, - { "make-rshared", 0, 0, MOUNT_OPT_RSHARED }, - { "make-rslave", 0, 0, MOUNT_OPT_RSLAVE }, - { "make-rprivate", 0, 0, MOUNT_OPT_RPRIVATE }, - { "make-runbindable", 0, 0, MOUNT_OPT_RUNBINDABLE }, - { "no-canonicalize", 0, 0, 'c' }, - { "internal-only", 0, 0, 'i' }, - { "show-labels", 0, 0, 'l' }, - { "target", 1, 0, MOUNT_OPT_TARGET }, - { "source", 1, 0, MOUNT_OPT_SOURCE }, - { NULL, 0, 0, 0 } + { "all", no_argument, NULL, 'a' }, + { "fake", no_argument, NULL, 'f' }, + { "fstab", required_argument, NULL, 'T' }, + { "fork", no_argument, NULL, 'F' }, + { "help", no_argument, NULL, 'h' }, + { "no-mtab", no_argument, NULL, 'n' }, + { "read-only", no_argument, NULL, 'r' }, + { "ro", no_argument, NULL, 'r' }, + { "verbose", no_argument, NULL, 'v' }, + { "version", no_argument, NULL, 'V' }, + { "read-write", no_argument, NULL, 'w' }, + { "rw", no_argument, NULL, 'w' }, + { "options", required_argument, NULL, 'o' }, + { "test-opts", required_argument, NULL, 'O' }, + { "types", required_argument, NULL, 't' }, + { "uuid", required_argument, NULL, 'U' }, + { "label", required_argument, NULL, 'L' }, + { "bind", no_argument, NULL, 'B' }, + { "move", no_argument, NULL, 'M' }, + { "rbind", no_argument, NULL, 'R' }, + { "make-shared", no_argument, NULL, MOUNT_OPT_SHARED }, + { "make-slave", no_argument, NULL, MOUNT_OPT_SLAVE }, + { "make-private", no_argument, NULL, MOUNT_OPT_PRIVATE }, + { "make-unbindable", no_argument, NULL, MOUNT_OPT_UNBINDABLE }, + { "make-rshared", no_argument, NULL, MOUNT_OPT_RSHARED }, + { "make-rslave", no_argument, NULL, MOUNT_OPT_RSLAVE }, + { "make-rprivate", no_argument, NULL, MOUNT_OPT_RPRIVATE }, + { "make-runbindable", no_argument, NULL, MOUNT_OPT_RUNBINDABLE }, + { "no-canonicalize", no_argument, NULL, 'c' }, + { "internal-only", no_argument, NULL, 'i' }, + { "show-labels", no_argument, NULL, 'l' }, + { "target", required_argument, NULL, MOUNT_OPT_TARGET }, + { "source", required_argument, NULL, MOUNT_OPT_SOURCE }, + { NULL, 0, NULL, 0 } }; static const ul_excl_t excl[] = { /* rows and cols in ASCII order */ |