From 4e9a99dd9a9ffc5a2a2dc17c55fc5b58f0cafa02 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 25 Jul 1998 15:14:16 +0000 Subject: [PATCH] (long_options): Changes table entries not to use this form: {"all", no_argument, &show_all_fs, 1}, but rather this form: {"all", no_argument, NULL, 'a'}, Using the latter, all the option handling in one place: the getopt loop. --- src/df.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/df.c b/src/df.c index 60d554a60..ce7ff3b21 100644 --- a/src/df.c +++ b/src/df.c @@ -111,20 +111,20 @@ static int print_type; static struct option const long_options[] = { - {"all", no_argument, &show_all_fs, 1}, - {"block-size", required_argument, 0, 131}, - {"inodes", no_argument, &inode_format, 1}, - {"human-readable", no_argument, 0, 'h'}, - {"si", no_argument, 0, 'H'}, - {"kilobytes", no_argument, 0, 'k'}, - {"local", no_argument, &show_all_fs, -1}, - {"megabytes", no_argument, 0, 'm'}, - {"portability", no_argument, &posix_format, 1}, - {"print-type", no_argument, &print_type, 1}, - {"sync", no_argument, 0, 129}, - {"no-sync", no_argument, 0, 130}, - {"type", required_argument, 0, 't'}, - {"exclude-type", required_argument, 0, 'x'}, + {"all", no_argument, NULL, 'a'}, + {"block-size", required_argument, NULL, 131}, + {"inodes", no_argument, NULL, 'i'}, + {"human-readable", no_argument, NULL, 'h'}, + {"si", no_argument, NULL, 'H'}, + {"kilobytes", no_argument, NULL, 'k'}, + {"local", no_argument, NULL, 'l'}, + {"megabytes", no_argument, NULL, 'm'}, + {"portability", no_argument, NULL, 'P'}, + {"print-type", no_argument, NULL, 'T'}, + {"sync", no_argument, NULL, 129}, + {"no-sync", no_argument, NULL, 130}, + {"type", required_argument, NULL, 't'}, + {"exclude-type", required_argument, NULL, 'x'}, {"help", no_argument, &show_help, 1}, {"version", no_argument, &show_version, 1}, {NULL, 0, NULL, 0} -- 2.34.1