remove redundant const directives

In 1463824d8e7f72c31f1d803d7cfe2b608ccafc5c, I added some
missing "const" directives, as well as some new, redundant ones.
This removes the redundant ones.  Pointed out by Eric Blake.
* base64.c, cat.c, chcon.c, chgrp.c, chmod.c, chown.c, comm.c:
* cp.c, csplit.c, cut.c, date.c, dd.c, df.c, dircolors.c, du.c:
* env.c, expand.c, fmt.c, fold.c, groups.c, head.c, id.c:
* install.c, join.c, kill.c, ln.c, ls.c, md5sum.c, mkdir.c:
* mkfifo.c, mknod.c, mktemp.c, mv.c, nice.c, nl.c, od.c:
* paste.c, pathchk.c, pinky.c, pr.c, ptx.c, readlink.c, rm.c:
* rmdir.c, runcon.c, seq.c, shred.c, shuf.c, sort.c, split.c:
* stat.c, stty.c, su.c, sum.c, tac.c, tail.c, tee.c, timeout.c:
* touch.c, tr.c, truncate.c, tty.c, uname.c, unexpand.c, uniq.c:
* wc.c, who.c: Remove redundant const directives.
* maint.mk (sc_const_long_option): Don't require redundant "const".

diff --git a/maint.mk b/maint.mk
index 4c50d00..df6b7f3 100644 (file)
--- a/maint.mk
+++ b/maint.mk
@@ -485,7 +485,7 @@ sc_proper_name_utf8_requires_ICONV:
 
 sc_const_long_option:
        @grep '^ *static.*struct option ' $$($(VC_LIST_EXCEPT))         \
-         | grep -v 'const struct option const' && {                    \
+         | grep -Ev 'const struct option|struct option const' && {     \
              echo 1>&2 '$(ME): add "const" to the above declarations'; \
              exit 1; } || :
 

diff --git a/src/base64.c b/src/base64.c
index e5c16e4..5067b28 100644 (file)
--- a/src/base64.c
+++ b/src/base64.c
@@ -37,7 +37,7 @@
 
 #define AUTHORS proper_name ("Simon Josefsson")
 
-static const struct option const long_options[] =
+static struct option const long_options[] =
 {
   {"decode", no_argument, 0, 'd'},
   {"wrap", required_argument, 0, 'w'},

diff --git a/src/cat.c b/src/cat.c
index 75d30d0..d762f45 100644 (file)
--- a/src/cat.c
+++ b/src/cat.c
@@ -547,7 +547,7 @@ main (int argc, char **argv)
   bool show_tabs = false;
   int file_open_mode = O_RDONLY;
 
-  static const struct option const long_options[] =
+  static struct option const long_options[] =
   {
     {"number-nonblank", no_argument, NULL, 'b'},
     {"number", no_argument, NULL, 'n'},

diff --git a/src/chcon.c b/src/chcon.c
index b271ce4..c929cdf 100644 (file)
--- a/src/chcon.c
+++ b/src/chcon.c
@@ -88,7 +88,7 @@ enum
   REFERENCE_FILE_OPTION
 };
 
-static const struct option const long_options[] =
+static struct option const long_options[] =
 {
   {"recursive", no_argument, NULL, 'R'},
   {"dereference", no_argument, NULL, DEREFERENCE_OPTION},

diff --git a/src/chgrp.c b/src/chgrp.c
index 206d9bb..db83c59 100644 (file)
--- a/src/chgrp.c
+++ b/src/chgrp.c
@@ -56,7 +56,7 @@ enum
   REFERENCE_FILE_OPTION
 };
 
-static const struct option const long_options[] =
+static struct option const long_options[] =
 {
   {"recursive", no_argument, NULL, 'R'},
   {"changes", no_argument, NULL, 'c'},

diff --git a/src/chmod.c b/src/chmod.c
index 8f8d8a5..80fc363 100644 (file)
--- a/src/chmod.c
+++ b/src/chmod.c
@@ -91,7 +91,7 @@ enum
   REFERENCE_FILE_OPTION
 };
 
-static const struct option const long_options[] =
+static struct option const long_options[] =
 {
   {"changes", no_argument, NULL, 'c'},
   {"recursive", no_argument, NULL, 'R'},

diff --git a/src/chown.c b/src/chown.c
index 218aae0..e5740d2 100644 (file)
--- a/src/chown.c
+++ b/src/chown.c
@@ -62,7 +62,7 @@ enum
   REFERENCE_FILE_OPTION
 };
 
-static const struct option const long_options[] =
+static struct option const long_options[] =
 {
   {"recursive", no_argument, NULL, 'R'},
   {"changes", no_argument, NULL, 'c'},

diff --git a/src/comm.c b/src/comm.c
index c855a33..9e70253 100644 (file)
--- a/src/comm.c
+++ b/src/comm.c
@@ -79,7 +79,7 @@ enum
   OUTPUT_DELIMITER_OPTION
 };
 
-static const struct option const long_options[] =
+static struct option const long_options[] =
 {
   {"check-order", no_argument, NULL, CHECK_ORDER_OPTION},
   {"nocheck-order", no_argument, NULL, NOCHECK_ORDER_OPTION},

diff --git a/src/cp.c b/src/cp.c
index c365717..c768d1b 100644 (file)
--- a/src/cp.c
+++ b/src/cp.c
@@ -120,7 +120,7 @@ static int const reply_vals[] =
 };
 ARGMATCH_VERIFY (reply_args, reply_vals);
 
-static const struct option const long_opts[] =
+static struct option const long_opts[] =
 {
   {"archive", no_argument, NULL, 'a'},
   {"backup", optional_argument, NULL, 'b'},

diff --git a/src/csplit.c b/src/csplit.c
index 26874c1..7e63ca8 100644 (file)
--- a/src/csplit.c
+++ b/src/csplit.c
@@ -192,7 +192,7 @@ static size_t control_used;
 /* The set of signals that are caught.  */
 static sigset_t caught_signals;
 
-static const struct option const longopts[] =
+static struct option const longopts[] =
 {
   {"digits", required_argument, NULL, 'n'},
   {"quiet", no_argument, NULL, 'q'},

diff --git a/src/cut.c b/src/cut.c
index 5a8745c..0e151fd 100644 (file)
--- a/src/cut.c
+++ b/src/cut.c
@@ -164,7 +164,7 @@ enum
   COMPLEMENT_OPTION
 };
 
-static const struct option const longopts[] =
+static struct option const longopts[] =
 {
   {"bytes", required_argument, NULL, 'b'},
   {"characters", required_argument, NULL, 'c'},

diff --git a/src/date.c b/src/date.c
index 4c575b1..2439052 100644 (file)
--- a/src/date.c
+++ b/src/date.c
@@ -86,7 +86,7 @@ enum
 
 static char const short_options[] = "d:f:I::r:Rs:u";
 
-static const struct option const long_options[] =
+static struct option const long_options[] =
 {
   {"date", required_argument, NULL, 'd'},
   {"file", required_argument, NULL, 'f'},

diff --git a/src/dd.c b/src/dd.c
index d811d24..ead9574 100644 (file)
--- a/src/dd.c
+++ b/src/dd.c
@@ -236,7 +236,7 @@ struct symbol_value
 };
 
 /* Conversion symbols, for conv="...".  */
-static const struct symbol_value const conversions[] =
+static struct symbol_value const conversions[] =
 {
   {"ascii", C_ASCII | C_TWOBUFS},      /* EBCDIC to ASCII. */
   {"ebcdic", C_EBCDIC | C_TWOBUFS},    /* ASCII to EBCDIC. */
@@ -257,7 +257,7 @@ static const struct symbol_value const conversions[] =
 };
 
 /* Flags, for iflag="..." and oflag="...".  */
-static const struct symbol_value const flags[] =
+static struct symbol_value const flags[] =
 {
   {"append",   O_APPEND},
   {"binary",   O_BINARY},
@@ -275,7 +275,7 @@ static const struct symbol_value const flags[] =
 };
 
 /* Status, for status="...".  */
-static const struct symbol_value const statuses[] =
+static struct symbol_value const statuses[] =
 {
   {"noxfer",   STATUS_NOXFER},
   {"",         0}

diff --git a/src/df.c b/src/df.c
index 7212962..66e9207 100644 (file)
--- a/src/df.c
+++ b/src/df.c
@@ -117,7 +117,7 @@ enum
   SYNC_OPTION
 };
 
-static const struct option const long_options[] =
+static struct option const long_options[] =
 {
   {"all", no_argument, NULL, 'a'},
   {"block-size", required_argument, NULL, 'B'},

diff --git a/src/dircolors.c b/src/dircolors.c
index 73e6490..56194f7 100644 (file)
--- a/src/dircolors.c
+++ b/src/dircolors.c
@@ -75,7 +75,7 @@ static const char *const ls_codes[] =
 #define array_len(Array) (sizeof (Array) / sizeof *(Array))
 verify (array_len (slack_codes) == array_len (ls_codes));
 
-static const struct option const long_options[] =
+static struct option const long_options[] =
   {
     {"bourne-shell", no_argument, NULL, 'b'},
     {"sh", no_argument, NULL, 'b'},

diff --git a/src/du.c b/src/du.c
index ebb8414..d974991 100644 (file)
--- a/src/du.c
+++ b/src/du.c
@@ -200,7 +200,7 @@ enum
   TIME_STYLE_OPTION
 };
 
-static const struct option const long_options[] =
+static struct option const long_options[] =
 {
   {"all", no_argument, NULL, 'a'},
   {"apparent-size", no_argument, NULL, APPARENT_SIZE_OPTION},

diff --git a/src/env.c b/src/env.c
index 5baac0f..67e411f 100644 (file)
--- a/src/env.c
+++ b/src/env.c
@@ -96,7 +96,7 @@ int putenv ();
 
 extern char **environ;
 
-static const struct option const longopts[] =
+static struct option const longopts[] =
 {
   {"ignore-environment", no_argument, NULL, 'i'},
   {"unset", required_argument, NULL, 'u'},

diff --git a/src/expand.c b/src/expand.c
index ae70737..8efb81b 100644 (file)
--- a/src/expand.c
+++ b/src/expand.c
@@ -87,7 +87,7 @@ static int exit_status;
 
 static char const shortopts[] = "it:0::1::2::3::4::5::6::7::8::9::";
 
-static const struct option const longopts[] =
+static struct option const longopts[] =
 {
   {"tabs", required_argument, NULL, 't'},
   {"initial", no_argument, NULL, 'i'},

diff --git a/src/fmt.c b/src/fmt.c
index 4df86d9..c1f6b22 100644 (file)
--- a/src/fmt.c
+++ b/src/fmt.c
@@ -300,7 +300,7 @@ With no FILE, or when FILE is -, read standard input.\n"),
 
 /* Decode options and launch execution.  */
 
-static const struct option const long_options[] =
+static struct option const long_options[] =
 {
   {"crown-margin", no_argument, NULL, 'c'},
   {"prefix", required_argument, NULL, 'p'},

diff --git a/src/fold.c b/src/fold.c
index eb97753..57ff123 100644 (file)
--- a/src/fold.c
+++ b/src/fold.c
@@ -45,7 +45,7 @@ static bool have_read_stdin;
 
 static char const shortopts[] = "bsw:0::1::2::3::4::5::6::7::8::9::";
 
-static const struct option const longopts[] =
+static struct option const longopts[] =
 {
   {"bytes", no_argument, NULL, 'b'},
   {"spaces", no_argument, NULL, 's'},

diff --git a/src/groups.c b/src/groups.c
index 65873f9..ef96400 100644 (file)
--- a/src/groups.c
+++ b/src/groups.c
@@ -37,7 +37,7 @@
   proper_name ("James Youngman")
 
 
-static const struct option const longopts[] =
+static struct option const longopts[] =
 {
   {GETOPT_HELP_OPTION_DECL},
   {GETOPT_VERSION_OPTION_DECL},

diff --git a/src/head.c b/src/head.c
index 798dcae..7a0e2ad 100644 (file)
--- a/src/head.c
+++ b/src/head.c
@@ -82,7 +82,7 @@ enum
   PRESUME_INPUT_PIPE_OPTION = CHAR_MAX + 1
 };
 
-static const struct option const long_options[] =
+static struct option const long_options[] =
 {
   {"bytes", required_argument, NULL, 'c'},
   {"lines", required_argument, NULL, 'n'},

diff --git a/src/id.c b/src/id.c
index 8977a65..14b558d 100644 (file)
--- a/src/id.c
+++ b/src/id.c
@@ -58,7 +58,7 @@ static bool ok = true;
    knows when `context' has not been set to a meaningful value.  */
 static security_context_t context = NULL;
 
-static const struct option const longopts[] =
+static struct option const longopts[] =
 {
   {"context", no_argument, NULL, 'Z'},
   {"group", no_argument, NULL, 'g'},

diff --git a/src/install.c b/src/install.c
index 8133b56..0d3927d 100644 (file)
--- a/src/install.c
+++ b/src/install.c
@@ -138,7 +138,7 @@ enum
   PRESERVE_CONTEXT_OPTION = CHAR_MAX + 1
 };
 
-static const struct option const long_options[] =
+static struct option const long_options[] =
 {
   {"backup", optional_argument, NULL, 'b'},
   {GETOPT_SELINUX_CONTEXT_OPTION_DECL},

diff --git a/src/join.c b/src/join.c
index c89fe8f..4c506d1 100644 (file)
--- a/src/join.c
+++ b/src/join.c
@@ -130,7 +130,7 @@ enum
 };
 
 
-static const struct option const longopts[] =
+static struct option const longopts[] =
 {
   {"ignore-case", no_argument, NULL, 'i'},
   {"check-order", no_argument, NULL, CHECK_ORDER_OPTION},

diff --git a/src/kill.c b/src/kill.c
index f29b12f..1fd4958 100644 (file)
--- a/src/kill.c
+++ b/src/kill.c
@@ -66,7 +66,7 @@ static char const short_options[] =
   "N::O::P::Q::R::S::T::U::V::W::X::Y::Z::"
   "ln:s:t";
 
-static const struct option const long_options[] =
+static struct option const long_options[] =
 {
   {"list", no_argument, NULL, 'l'},
   {"signal", required_argument, NULL, 's'},

diff --git a/src/ln.c b/src/ln.c
index 52763ff..2dc5628 100644 (file)
--- a/src/ln.c
+++ b/src/ln.c
@@ -93,7 +93,7 @@ static Hash_table *dest_set;
 /* Initial size of the dest_set hash table.  */
 enum { DEST_INFO_INITIAL_CAPACITY = 61 };
 
-static const struct option const long_options[] =
+static struct option const long_options[] =
 {
   {"backup", optional_argument, NULL, 'b'},
   {"directory", no_argument, NULL, 'F'},

diff --git a/src/ls.c b/src/ls.c
index efdab88..87f7997 100644 (file)
--- a/src/ls.c
+++ b/src/ls.c
@@ -741,7 +741,7 @@ enum
   TIME_STYLE_OPTION
 };
 
-static const struct option const long_options[] =
+static struct option const long_options[] =
 {
   {"all", no_argument, NULL, 'a'},
   {"escape", no_argument, NULL, 'b'},

diff --git a/src/md5sum.c b/src/md5sum.c
index bc708dc..a92113b 100644 (file)
--- a/src/md5sum.c
+++ b/src/md5sum.c
@@ -128,7 +128,7 @@ enum
   QUIET_OPTION
 };
 
-static const struct option const long_options[] =
+static struct option const long_options[] =
 {
   { "binary", no_argument, NULL, 'b' },
   { "check", no_argument, NULL, 'c' },

diff --git a/src/mkdir.c b/src/mkdir.c
index 7cb0374..9644f4c 100644 (file)
--- a/src/mkdir.c
+++ b/src/mkdir.c
@@ -36,7 +36,7 @@
 
 #define AUTHORS proper_name ("David MacKenzie")
 
-static const struct option const longopts[] =
+static struct option const longopts[] =
 {
   {GETOPT_SELINUX_CONTEXT_OPTION_DECL},
   {"mode", required_argument, NULL, 'm'},

diff --git a/src/mkfifo.c b/src/mkfifo.c
index b77cfba..d0d2c45 100644 (file)
--- a/src/mkfifo.c
+++ b/src/mkfifo.c
@@ -32,7 +32,7 @@
 
 #define AUTHORS proper_name ("David MacKenzie")
 
-static const struct option const longopts[] =
+static struct option const longopts[] =
 {
   {GETOPT_SELINUX_CONTEXT_OPTION_DECL},
   {"mode", required_argument, NULL, 'm'},

diff --git a/src/mknod.c b/src/mknod.c
index f5c5990..d93e2cb 100644 (file)
--- a/src/mknod.c
+++ b/src/mknod.c
@@ -33,7 +33,7 @@
 
 #define AUTHORS proper_name ("David MacKenzie")
 
-static const struct option const longopts[] =
+static struct option const longopts[] =
 {
   {GETOPT_SELINUX_CONTEXT_OPTION_DECL},
   {"mode", required_argument, NULL, 'm'},

diff --git a/src/mktemp.c b/src/mktemp.c
index 2821c8c..8a09231 100644 (file)
--- a/src/mktemp.c
+++ b/src/mktemp.c
@@ -42,7 +42,7 @@ enum
   TMPDIR_OPTION = CHAR_MAX + 1
 };
 
-static const struct option const longopts[] =
+static struct option const longopts[] =
 {
   {"directory", no_argument, NULL, 'd'},
   {"quiet", no_argument, NULL, 'q'},

diff --git a/src/mv.c b/src/mv.c
index d58216c..fc255f3 100644 (file)
--- a/src/mv.c
+++ b/src/mv.c
@@ -71,7 +71,7 @@ static int const reply_vals[] =
   I_ALWAYS_YES, I_ALWAYS_NO, I_ASK_USER
 };
 
-static const struct option const long_options[] =
+static struct option const long_options[] =
 {
   {"backup", optional_argument, NULL, 'b'},
   {"force", no_argument, NULL, 'f'},

diff --git a/src/nice.c b/src/nice.c
index 278005f..13033ec 100644 (file)
--- a/src/nice.c
+++ b/src/nice.c
@@ -55,7 +55,7 @@
 # define NZERO 20
 #endif
 
-static const struct option const longopts[] =
+static struct option const longopts[] =
 {
   {"adjustment", required_argument, NULL, 'n'},
   {NULL, 0, NULL, 0}

diff --git a/src/nl.c b/src/nl.c
index 0d2c5ea..ddd0fcf 100644 (file)
--- a/src/nl.c
+++ b/src/nl.c
@@ -144,7 +144,7 @@ static intmax_t line_no;
 /* True if we have ever read standard input.  */
 static bool have_read_stdin;
 
-static const struct option const longopts[] =
+static struct option const longopts[] =
 {
   {"header-numbering", required_argument, NULL, 'h'},
   {"body-numbering", required_argument, NULL, 'b'},

diff --git a/src/od.c b/src/od.c
index dec9dec..70ba59c 100644 (file)
--- a/src/od.c
+++ b/src/od.c
@@ -281,7 +281,7 @@ enum
   TRADITIONAL_OPTION = CHAR_MAX + 1
 };
 
-static const struct option const long_options[] =
+static struct option const long_options[] =
 {
   {"skip-bytes", required_argument, NULL, 'j'},
   {"address-radix", required_argument, NULL, 'A'},

diff --git a/src/paste.c b/src/paste.c
index a40bee5..9dee94a 100644 (file)
--- a/src/paste.c
+++ b/src/paste.c
@@ -67,7 +67,7 @@ static char *delims;
 /* A pointer to the character after the end of `delims'. */
 static char const *delim_end;
 
-static const struct option const longopts[] =
+static struct option const longopts[] =
 {
   {"serial", no_argument, NULL, 's'},
   {"delimiters", required_argument, NULL, 'd'},

diff --git a/src/pathchk.c b/src/pathchk.c
index fceda91..48001fc 100644 (file)
--- a/src/pathchk.c
+++ b/src/pathchk.c
@@ -78,7 +78,7 @@ enum
   PORTABILITY_OPTION = CHAR_MAX + 1
 };
 
-static const struct option const longopts[] =
+static struct option const longopts[] =
 {
   {"portability", no_argument, NULL, PORTABILITY_OPTION},
   {GETOPT_HELP_OPTION_DECL},

diff --git a/src/pinky.c b/src/pinky.c
index 778ae0c..9c80d94 100644 (file)
--- a/src/pinky.c
+++ b/src/pinky.c
@@ -78,7 +78,7 @@ static bool include_where = true;
 static char const *time_format;
 static int time_format_width;
 
-static const struct option const longopts[] =
+static struct option const longopts[] =
 {
   {GETOPT_HELP_OPTION_DECL},
   {GETOPT_VERSION_OPTION_DECL},

diff --git a/src/pr.c b/src/pr.c
index 464891a..6ffe8f1 100644 (file)
--- a/src/pr.c
+++ b/src/pr.c
@@ -740,7 +740,7 @@ enum
 static char const short_options[] =
   "-0123456789D:FJN:S::TW:abcde::fh:i::l:mn::o:rs::tvw:";
 
-static const struct option const long_options[] =
+static struct option const long_options[] =
 {
   {"pages", required_argument, NULL, PAGES_OPTION},
   {"columns", required_argument, NULL, COLUMNS_OPTION},

diff --git a/src/ptx.c b/src/ptx.c
index 6d457c5..827d22e 100644 (file)
--- a/src/ptx.c
+++ b/src/ptx.c
@@ -1935,7 +1935,7 @@ With no FILE or if FILE is -, read Standard Input.  `-F /' by default.\n\
 `----------------------------------------------------------------------*/
 
 /* Long options equivalences.  */
-static const struct option const long_options[] =
+static struct option const long_options[] =
 {
   {"auto-reference", no_argument, NULL, 'A'},
   {"break-file", required_argument, NULL, 'b'},

diff --git a/src/readlink.c b/src/readlink.c
index 405d467..98a955c 100644 (file)
--- a/src/readlink.c
+++ b/src/readlink.c
@@ -38,7 +38,7 @@ static bool no_newline;
 /* If true, report error messages.  */
 static bool verbose;
 
-static const struct option const longopts[] =
+static struct option const longopts[] =
 {
   {"canonicalize", no_argument, NULL, 'f'},
   {"canonicalize-existing", no_argument, NULL, 'e'},

diff --git a/src/rm.c b/src/rm.c
index e1e987d..7304330 100644 (file)
--- a/src/rm.c
+++ b/src/rm.c
@@ -84,7 +84,7 @@ enum interactive_type
     interactive_always         /* 2: default, -i or --interactive=always */
   };
 
-static const struct option const long_opts[] =
+static struct option const long_opts[] =
 {
   {"directory", no_argument, NULL, 'd'},
   {"force", no_argument, NULL, 'f'},

diff --git a/src/rmdir.c b/src/rmdir.c
index 25d72db..64575b0 100644 (file)
--- a/src/rmdir.c
+++ b/src/rmdir.c
@@ -55,7 +55,7 @@ enum
   IGNORE_FAIL_ON_NON_EMPTY_OPTION = CHAR_MAX + 1
 };
 
-static const struct option const longopts[] =
+static struct option const longopts[] =
 {
   /* Don't name this `--force' because it's not close enough in meaning
      to e.g. rm's -f option.  */

diff --git a/src/runcon.c b/src/runcon.c
index 8c2b261..fce83e5 100644 (file)
--- a/src/runcon.c
+++ b/src/runcon.c
@@ -61,7 +61,7 @@
 
 #define AUTHORS proper_name ("Russell Coker")
 
-static const struct option const long_options[] =
+static struct option const long_options[] =
 {
   {"role", required_argument, NULL, 'r'},
   {"type", required_argument, NULL, 't'},

diff --git a/src/seq.c b/src/seq.c
index f0a0437..55518df 100644 (file)
--- a/src/seq.c
+++ b/src/seq.c
@@ -51,7 +51,7 @@ static char const *separator;
 /* FIXME: make this an option.  */
 static char const terminator[] = "\n";
 
-static const struct option const long_options[] =
+static struct option const long_options[] =
 {
   { "equal-width", no_argument, NULL, 'w'},
   { "format", required_argument, NULL, 'f'},

diff --git a/src/shred.c b/src/shred.c
index 91a89d2..bfafa96 100644 (file)
--- a/src/shred.c
+++ b/src/shred.c
@@ -133,7 +133,7 @@ enum
   RANDOM_SOURCE_OPTION = CHAR_MAX + 1
 };
 
-static const struct option const long_opts[] =
+static struct option const long_opts[] =
 {
   {"exact", no_argument, NULL, 'x'},
   {"force", no_argument, NULL, 'f'},

diff --git a/src/shuf.c b/src/shuf.c
index 118ba0b..ca5345b 100644 (file)
--- a/src/shuf.c
+++ b/src/shuf.c
@@ -84,7 +84,7 @@ enum
   RANDOM_SOURCE_OPTION = CHAR_MAX + 1
 };
 
-static const struct option const long_opts[] =
+static struct option const long_opts[] =
 {
   {"echo", no_argument, NULL, 'e'},
   {"input-range", required_argument, NULL, 'i'},

diff --git a/src/sort.c b/src/sort.c
index bec3cf0..632c5c8 100644 (file)
--- a/src/sort.c
+++ b/src/sort.c
@@ -399,7 +399,7 @@ enum
 
 static char const short_options[] = "-bcCdfgik:mMno:rRsS:t:T:uy:z";
 
-static const struct option const long_options[] =
+static struct option const long_options[] =
 {
   {"ignore-leading-blanks", no_argument, NULL, 'b'},
   {"check", optional_argument, NULL, CHECK_OPTION},

diff --git a/src/split.c b/src/split.c
index 995a5a3..181d837 100644 (file)
--- a/src/split.c
+++ b/src/split.c
@@ -79,7 +79,7 @@ enum
   VERBOSE_OPTION = CHAR_MAX + 1
 };
 
-static const struct option const longopts[] =
+static struct option const longopts[] =
 {
   {"bytes", required_argument, NULL, 'b'},
   {"lines", required_argument, NULL, 'l'},

diff --git a/src/stat.c b/src/stat.c
index 087bda3..0b07dab 100644 (file)
--- a/src/stat.c
+++ b/src/stat.c
@@ -157,7 +157,7 @@ enum
   PRINTF_OPTION = CHAR_MAX + 1
 };
 
-static const struct option const long_options[] =
+static struct option const long_options[] =
 {
   {"context", no_argument, 0, 'Z'},
   {"dereference", no_argument, NULL, 'L'},

diff --git a/src/stty.c b/src/stty.c
index 548923d..5ac2cc6 100644 (file)
--- a/src/stty.c
+++ b/src/stty.c
@@ -204,7 +204,7 @@ struct mode_info
     unsigned long mask;                /* Other bits to turn off for this mode.  */
   };
 
-static const struct mode_info const mode_info[] =
+static struct mode_info const mode_info[] =
 {
   {"parenb", control, REV, PARENB, 0},
   {"parodd", control, REV, PARODD, 0},
@@ -368,7 +368,7 @@ struct control_info
 
 /* Control characters. */
 
-static const struct control_info const control_info[] =
+static struct control_info const control_info[] =
 {
   {"intr", CINTR, VINTR},
   {"quit", CQUIT, VQUIT},
@@ -445,7 +445,7 @@ static int max_col;
 /* Current position, to know when to wrap. */
 static int current_col;
 
-static const struct option const longopts[] =
+static struct option const longopts[] =
 {
   {"all", no_argument, NULL, 'a'},
   {"save", no_argument, NULL, 'g'},
@@ -1716,7 +1716,7 @@ struct speed_map
   unsigned long int value;     /* Numeric value. */
 };
 
-static const struct speed_map const speeds[] =
+static struct speed_map const speeds[] =
 {
   {"0", B0, 0},
   {"50", B50, 50},

diff --git a/src/su.c b/src/su.c
index fed2778..f6b61f7 100644 (file)
--- a/src/su.c
+++ b/src/su.c
@@ -137,7 +137,7 @@ static bool simulate_login;
 /* If true, change some environment vars to indicate the user su'd to.  */
 static bool change_environment;
 
-static const struct option const longopts[] =
+static struct option const longopts[] =
 {
   {"command", required_argument, NULL, 'c'},
   {"fast", no_argument, NULL, 'f'},

diff --git a/src/sum.c b/src/sum.c
index 7bedb87..4dfc867 100644 (file)
--- a/src/sum.c
+++ b/src/sum.c
@@ -39,7 +39,7 @@
 /* True if any of the files read were the standard input. */
 static bool have_read_stdin;
 
-static const struct option const longopts[] =
+static struct option const longopts[] =
 {
   {"sysv", no_argument, NULL, 's'},
   {GETOPT_HELP_OPTION_DECL},

diff --git a/src/tac.c b/src/tac.c
index 4a43e59..9cf6d60 100644 (file)
--- a/src/tac.c
+++ b/src/tac.c
@@ -111,7 +111,7 @@ static struct re_pattern_buffer compiled_separator;
 static char compiled_separator_fastmap[UCHAR_MAX + 1];
 static struct re_registers regs;
 
-static const struct option const longopts[] =
+static struct option const longopts[] =
 {
   {"before", no_argument, NULL, 'b'},
   {"regex", no_argument, NULL, 'r'},

diff --git a/src/tail.c b/src/tail.c
index 72f8267..1ce207e 100644 (file)
--- a/src/tail.c
+++ b/src/tail.c
@@ -185,7 +185,7 @@ enum
   LONG_FOLLOW_OPTION
 };
 
-static const struct option const long_options[] =
+static struct option const long_options[] =
 {
   {"bytes", required_argument, NULL, 'c'},
   {"follow", optional_argument, NULL, LONG_FOLLOW_OPTION},

diff --git a/src/tee.c b/src/tee.c
index 284c97b..162455c 100644 (file)
--- a/src/tee.c
+++ b/src/tee.c
@@ -41,7 +41,7 @@ static bool append;
 /* If true, ignore interrupts. */
 static bool ignore_interrupts;
 
-static const struct option const long_options[] =
+static struct option const long_options[] =
 {
   {"append", no_argument, NULL, 'a'},
   {"ignore-interrupts", no_argument, NULL, 'i'},

diff --git a/src/timeout.c b/src/timeout.c
index b799345..963c977 100644 (file)
--- a/src/timeout.c
+++ b/src/timeout.c
@@ -84,7 +84,7 @@ static int term_signal = SIGTERM;  /* same default as kill command.  */
 static int monitored_pid;
 static int sigs_to_ignore[NSIG];   /* so monitor can ignore sigs it resends.  */
 
-static const struct option const long_options[] =
+static struct option const long_options[] =
 {
   {"signal", required_argument, NULL, 's'},
   {NULL, 0, NULL, 0}

diff --git a/src/touch.c b/src/touch.c
index bea51b5..bbc9c60 100644 (file)
--- a/src/touch.c
+++ b/src/touch.c
@@ -77,7 +77,7 @@ enum
   TIME_OPTION = CHAR_MAX + 1
 };
 
-static const struct option const longopts[] =
+static struct option const longopts[] =
 {
   {"time", required_argument, NULL, TIME_OPTION},
   {"no-create", no_argument, NULL, 'c'},

diff --git a/src/tr.c b/src/tr.c
index 7a74710..e1bb404 100644 (file)
--- a/src/tr.c
+++ b/src/tr.c
@@ -264,7 +264,7 @@ static bool in_delete_set[N_CHARS];
    two specification strings and the delete switch is not given.  */
 static char xlate[N_CHARS];
 
-static const struct option const long_options[] =
+static struct option const long_options[] =
 {
   {"complement", no_argument, NULL, 'c'},
   {"delete", no_argument, NULL, 'd'},

diff --git a/src/truncate.c b/src/truncate.c
index cc4f507..8febd58 100644 (file)
--- a/src/truncate.c
+++ b/src/truncate.c
@@ -50,7 +50,7 @@ static bool block_mode;
 /* (-r) Reference file to use size from */
 static char const *ref_file;
 
-static const struct option const longopts[] =
+static struct option const longopts[] =
 {
   {"no-create", no_argument, NULL, 'c'},
   {"io-blocks", no_argument, NULL, 'o'},

diff --git a/src/tty.c b/src/tty.c
index dd563b8..c7b13dc 100644 (file)
--- a/src/tty.c
+++ b/src/tty.c
@@ -45,7 +45,7 @@ enum
 /* If true, return an exit status but produce no output. */
 static bool silent;
 
-static const struct option const longopts[] =
+static struct option const longopts[] =
 {
   {"silent", no_argument, NULL, 's'},
   {"quiet", no_argument, NULL, 's'},

diff --git a/src/uname.c b/src/uname.c
index 57778b9..3870dfa 100644 (file)
--- a/src/uname.c
+++ b/src/uname.c
@@ -86,7 +86,7 @@
 /* Operating system.  */
 #define PRINT_OPERATING_SYSTEM 128
 
-static const struct option const uname_long_options[] =
+static struct option const uname_long_options[] =
 {
   {"all", no_argument, NULL, 'a'},
   {"kernel-name", no_argument, NULL, 's'},
@@ -104,7 +104,7 @@ static const struct option const uname_long_options[] =
   {NULL, 0, NULL, 0}
 };
 
-static const struct option const arch_long_options[] =
+static struct option const arch_long_options[] =
 {
   {GETOPT_HELP_OPTION_DECL},
   {GETOPT_VERSION_OPTION_DECL},

diff --git a/src/unexpand.c b/src/unexpand.c
index ec8831f..5a2d0cd 100644 (file)
--- a/src/unexpand.c
+++ b/src/unexpand.c
@@ -96,7 +96,7 @@ enum
   CONVERT_FIRST_ONLY_OPTION = CHAR_MAX + 1
 };
 
-static const struct option const longopts[] =
+static struct option const longopts[] =
 {
   {"tabs", required_argument, NULL, 't'},
   {"all", no_argument, NULL, 'a'},

diff --git a/src/uniq.c b/src/uniq.c
index e837182..5af5271 100644 (file)
--- a/src/uniq.c
+++ b/src/uniq.c
@@ -107,7 +107,7 @@ static enum delimit_method const delimit_method_map[] =
 /* Select whether/how to delimit groups of duplicate lines.  */
 static enum delimit_method delimit_groups;
 
-static const struct option const longopts[] =
+static struct option const longopts[] =
 {
   {"count", no_argument, NULL, 'c'},
   {"repeated", no_argument, NULL, 'd'},

diff --git a/src/wc.c b/src/wc.c
index 7990a7a..e6b9a1e 100644 (file)
--- a/src/wc.c
+++ b/src/wc.c
@@ -85,7 +85,7 @@ enum
   FILES0_FROM_OPTION = CHAR_MAX + 1
 };
 
-static const struct option const longopts[] =
+static struct option const longopts[] =
 {
   {"bytes", no_argument, NULL, 'c'},
   {"chars", no_argument, NULL, 'm'},

diff --git a/src/who.c b/src/who.c
index ae9320b..9bf437c 100644 (file)
--- a/src/who.c
+++ b/src/who.c
@@ -159,7 +159,7 @@ enum
   LOOKUP_OPTION = CHAR_MAX + 1
 };
 
-static const struct option const longopts[] =
+static struct option const longopts[] =
 {
   {"all", no_argument, NULL, 'a'},
   {"boot", no_argument, NULL, 'b'},