Convert static declarations of struct option to use new macros from

getopt.h: no_argument, required_argument, and optional_argument.

1 files changed, 23 insertions, 23 deletions

diff --git a/src/ls.c b/src/ls.c
index 6fb98fc8a..202e16c6f 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -422,29 +422,29 @@ main (argc, argv)
 
 static struct option const long_options[] =
 {
-  {"all", 0, 0, 'a'},
-  {"escape", 0, 0, 'b'},
-  {"directory", 0, 0, 'd'},
-  {"inode", 0, 0, 'i'},
-  {"kilobytes", 0, 0, 'k'},
-  {"numeric-uid-gid", 0, 0, 'n'},
-  {"hide-control-chars", 0, 0, 'q'},
-  {"reverse", 0, 0, 'r'},
-  {"size", 0, 0, 's'},
-  {"width", 1, 0, 'w'},
-  {"almost-all", 0, 0, 'A'},
-  {"ignore-backups", 0, 0, 'B'},
-  {"classify", 0, 0, 'F'},
-  {"file-type", 0, 0, 'F'},
-  {"ignore", 1, 0, 'I'},
-  {"dereference", 0, 0, 'L'},
-  {"literal", 0, 0, 'N'},
-  {"quote-name", 0, 0, 'Q'},
-  {"recursive", 0, 0, 'R'},
-  {"format", 1, 0, 12},
-  {"sort", 1, 0, 10},
-  {"tabsize", 1, 0, 'T'},
-  {"time", 1, 0, 11},
+  {"all", no_argument, 0, 'a'},
+  {"escape", no_argument, 0, 'b'},
+  {"directory", no_argument, 0, 'd'},
+  {"inode", no_argument, 0, 'i'},
+  {"kilobytes", no_argument, 0, 'k'},
+  {"numeric-uid-gid", no_argument, 0, 'n'},
+  {"hide-control-chars", no_argument, 0, 'q'},
+  {"reverse", no_argument, 0, 'r'},
+  {"size", no_argument, 0, 's'},
+  {"width", required_argument, 0, 'w'},
+  {"almost-all", no_argument, 0, 'A'},
+  {"ignore-backups", no_argument, 0, 'B'},
+  {"classify", no_argument, 0, 'F'},
+  {"file-type", no_argument, 0, 'F'},
+  {"ignore", required_argument, 0, 'I'},
+  {"dereference", no_argument, 0, 'L'},
+  {"literal", no_argument, 0, 'N'},
+  {"quote-name", no_argument, 0, 'Q'},
+  {"recursive", no_argument, 0, 'R'},
+  {"format", required_argument, 0, 12},
+  {"sort", required_argument, 0, 10},
+  {"tabsize", required_argument, 0, 'T'},
+  {"time", required_argument, 0, 11},
   {0, 0, 0, 0}
 };