diff options
| -rw-r--r-- | maint.mk | 6 | ||||
| -rw-r--r-- | src/base64.c | 3 | ||||
| -rw-r--r-- | src/cat.c | 2 | ||||
| -rw-r--r-- | src/chcon.c | 2 | ||||
| -rw-r--r-- | src/chgrp.c | 2 | ||||
| -rw-r--r-- | src/chmod.c | 2 | ||||
| -rw-r--r-- | src/chown.c | 2 | ||||
| -rw-r--r-- | src/comm.c | 3 | ||||
| -rw-r--r-- | src/cp.c | 2 | ||||
| -rw-r--r-- | src/csplit.c | 2 | ||||
| -rw-r--r-- | src/cut.c | 2 | ||||
| -rw-r--r-- | src/date.c | 2 | ||||
| -rw-r--r-- | src/dd.c | 6 | ||||
| -rw-r--r-- | src/df.c | 2 | ||||
| -rw-r--r-- | src/dircolors.c | 2 | ||||
| -rw-r--r-- | src/du.c | 2 | ||||
| -rw-r--r-- | src/env.c | 2 | ||||
| -rw-r--r-- | src/expand.c | 2 | ||||
| -rw-r--r-- | src/fmt.c | 2 | ||||
| -rw-r--r-- | src/fold.c | 2 | ||||
| -rw-r--r-- | src/groups.c | 2 | ||||
| -rw-r--r-- | src/head.c | 2 | ||||
| -rw-r--r-- | src/id.c | 2 | ||||
| -rw-r--r-- | src/install.c | 2 | ||||
| -rw-r--r-- | src/join.c | 2 | ||||
| -rw-r--r-- | src/kill.c | 2 | ||||
| -rw-r--r-- | src/ln.c | 2 | ||||
| -rw-r--r-- | src/ls.c | 6 | ||||
| -rw-r--r-- | src/md5sum.c | 2 | ||||
| -rw-r--r-- | src/mkdir.c | 2 | ||||
| -rw-r--r-- | src/mkfifo.c | 2 | ||||
| -rw-r--r-- | src/mknod.c | 2 | ||||
| -rw-r--r-- | src/mktemp.c | 2 | ||||
| -rw-r--r-- | src/mv.c | 2 | ||||
| -rw-r--r-- | src/nice.c | 2 | ||||
| -rw-r--r-- | src/nl.c | 2 | ||||
| -rw-r--r-- | src/od.c | 4 | ||||
| -rw-r--r-- | src/paste.c | 2 | ||||
| -rw-r--r-- | src/pathchk.c | 2 | ||||
| -rw-r--r-- | src/pinky.c | 2 | ||||
| -rw-r--r-- | src/pr.c | 2 | ||||
| -rw-r--r-- | src/ptx.c | 2 | ||||
| -rw-r--r-- | src/readlink.c | 2 | ||||
| -rw-r--r-- | src/rm.c | 2 | ||||
| -rw-r--r-- | src/rmdir.c | 2 | ||||
| -rw-r--r-- | src/runcon.c | 3 | ||||
| -rw-r--r-- | src/seq.c | 2 | ||||
| -rw-r--r-- | src/shred.c | 2 | ||||
| -rw-r--r-- | src/shuf.c | 2 | ||||
| -rw-r--r-- | src/sort.c | 4 | ||||
| -rw-r--r-- | src/split.c | 2 | ||||
| -rw-r--r-- | src/stat.c | 3 | ||||
| -rw-r--r-- | src/stty.c | 16 | ||||
| -rw-r--r-- | src/su.c | 2 | ||||
| -rw-r--r-- | src/sum.c | 2 | ||||
| -rw-r--r-- | src/tac.c | 2 | ||||
| -rw-r--r-- | src/tail.c | 2 | ||||
| -rw-r--r-- | src/tee.c | 2 | ||||
| -rw-r--r-- | src/timeout.c | 3 | ||||
| -rw-r--r-- | src/touch.c | 2 | ||||
| -rw-r--r-- | src/tr.c | 2 | ||||
| -rw-r--r-- | src/truncate.c | 3 | ||||
| -rw-r--r-- | src/tty.c | 2 | ||||
| -rw-r--r-- | src/uname.c | 4 | ||||
| -rw-r--r-- | src/unexpand.c | 2 | ||||
| -rw-r--r-- | src/uniq.c | 2 | ||||
| -rw-r--r-- | src/wc.c | 2 | ||||
| -rw-r--r-- | src/who.c | 3 |
68 files changed, 93 insertions, 82 deletions
@@ -483,6 +483,12 @@ sc_proper_name_utf8_requires_ICONV: exit 1; } || :; \ fi +sc_const_long_option: + @grep '^ *static.*struct option ' $$($(VC_LIST_EXCEPT)) \ + | grep -v 'const struct option const' && { \ + echo 1>&2 '$(ME): add "const" to the above declarations'; \ + exit 1; } || : + # Update the hash stored above. Do this after each release and # for any corrections to old entries. update-NEWS-hash: NEWS diff --git a/src/base64.c b/src/base64.c index 3e66c12e0..e5c16e456 100644 --- a/src/base64.c +++ b/src/base64.c @@ -37,7 +37,8 @@ #define AUTHORS proper_name ("Simon Josefsson") -static const struct option long_options[] = { +static const struct option const long_options[] = +{ {"decode", no_argument, 0, 'd'}, {"wrap", required_argument, 0, 'w'}, {"ignore-garbage", no_argument, 0, 'i'}, @@ -547,7 +547,7 @@ main (int argc, char **argv) bool show_tabs = false; int file_open_mode = O_RDONLY; - static struct option const long_options[] = + static const 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 659664e3d..a043413fa 100644 --- a/src/chcon.c +++ b/src/chcon.c @@ -88,7 +88,7 @@ enum REFERENCE_FILE_OPTION }; -static struct option const long_options[] = +static const 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 db83c59df..206d9bb20 100644 --- a/src/chgrp.c +++ b/src/chgrp.c @@ -56,7 +56,7 @@ enum REFERENCE_FILE_OPTION }; -static struct option const long_options[] = +static const 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 80fc363aa..8f8d8a5f3 100644 --- a/src/chmod.c +++ b/src/chmod.c @@ -91,7 +91,7 @@ enum REFERENCE_FILE_OPTION }; -static struct option const long_options[] = +static const 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 e5740d259..218aae08e 100644 --- a/src/chown.c +++ b/src/chown.c @@ -62,7 +62,7 @@ enum REFERENCE_FILE_OPTION }; -static struct option const long_options[] = +static const 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 2bf876121..c855a3355 100644 --- a/src/comm.c +++ b/src/comm.c @@ -79,8 +79,7 @@ enum OUTPUT_DELIMITER_OPTION }; - -static struct option const long_options[] = +static const struct option const long_options[] = { {"check-order", no_argument, NULL, CHECK_ORDER_OPTION}, {"nocheck-order", no_argument, NULL, NOCHECK_ORDER_OPTION}, @@ -120,7 +120,7 @@ static int const reply_vals[] = }; ARGMATCH_VERIFY (reply_args, reply_vals); -static struct option const long_opts[] = +static const 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 7e63ca831..26874c1a4 100644 --- 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 struct option const longopts[] = +static const struct option const longopts[] = { {"digits", required_argument, NULL, 'n'}, {"quiet", no_argument, NULL, 'q'}, @@ -164,7 +164,7 @@ enum COMPLEMENT_OPTION }; -static struct option const longopts[] = +static const 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 24390529c..4c575b164 100644 --- 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 struct option const long_options[] = +static const struct option const long_options[] = { {"date", required_argument, NULL, 'd'}, {"file", required_argument, NULL, 'f'}, @@ -236,7 +236,7 @@ struct symbol_value }; /* Conversion symbols, for conv="...". */ -static struct symbol_value const conversions[] = +static const 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 struct symbol_value const conversions[] = }; /* Flags, for iflag="..." and oflag="...". */ -static struct symbol_value const flags[] = +static const struct symbol_value const flags[] = { {"append", O_APPEND}, {"binary", O_BINARY}, @@ -275,7 +275,7 @@ static struct symbol_value const flags[] = }; /* Status, for status="...". */ -static struct symbol_value const statuses[] = +static const struct symbol_value const statuses[] = { {"noxfer", STATUS_NOXFER}, {"", 0} @@ -117,7 +117,7 @@ enum SYNC_OPTION }; -static struct option const long_options[] = +static const 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 56194f793..73e6490f7 100644 --- 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 struct option const long_options[] = +static const struct option const long_options[] = { {"bourne-shell", no_argument, NULL, 'b'}, {"sh", no_argument, NULL, 'b'}, @@ -200,7 +200,7 @@ enum TIME_STYLE_OPTION }; -static struct option const long_options[] = +static const struct option const long_options[] = { {"all", no_argument, NULL, 'a'}, {"apparent-size", no_argument, NULL, APPARENT_SIZE_OPTION}, @@ -96,7 +96,7 @@ int putenv (); extern char **environ; -static struct option const longopts[] = +static const 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 8efb81b33..ae70737ac 100644 --- 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 struct option const longopts[] = +static const struct option const longopts[] = { {"tabs", required_argument, NULL, 't'}, {"initial", no_argument, NULL, 'i'}, @@ -300,7 +300,7 @@ With no FILE, or when FILE is -, read standard input.\n"), /* Decode options and launch execution. */ -static const struct option long_options[] = +static const 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 57ff123c7..eb97753fc 100644 --- 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 struct option const longopts[] = +static const 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 ef9640005..65873f9b5 100644 --- a/src/groups.c +++ b/src/groups.c @@ -37,7 +37,7 @@ proper_name ("James Youngman") -static struct option const longopts[] = +static const struct option const longopts[] = { {GETOPT_HELP_OPTION_DECL}, {GETOPT_VERSION_OPTION_DECL}, diff --git a/src/head.c b/src/head.c index 7a0e2ada9..798dcae66 100644 --- a/src/head.c +++ b/src/head.c @@ -82,7 +82,7 @@ enum PRESUME_INPUT_PIPE_OPTION = CHAR_MAX + 1 }; -static struct option const long_options[] = +static const struct option const long_options[] = { {"bytes", required_argument, NULL, 'c'}, {"lines", required_argument, NULL, 'n'}, @@ -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 struct option const longopts[] = +static const 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 0d3927df4..8133b5647 100644 --- a/src/install.c +++ b/src/install.c @@ -138,7 +138,7 @@ enum PRESERVE_CONTEXT_OPTION = CHAR_MAX + 1 }; -static struct option const long_options[] = +static const 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 4c506d1ac..c89fe8f18 100644 --- a/src/join.c +++ b/src/join.c @@ -130,7 +130,7 @@ enum }; -static struct option const longopts[] = +static const 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 1fd495840..f29b12fc8 100644 --- 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 struct option const long_options[] = +static const struct option const long_options[] = { {"list", no_argument, NULL, 'l'}, {"signal", required_argument, NULL, 's'}, @@ -93,7 +93,7 @@ static Hash_table *dest_set; /* Initial size of the dest_set hash table. */ enum { DEST_INFO_INITIAL_CAPACITY = 61 }; -static struct option const long_options[] = +static const struct option const long_options[] = { {"backup", optional_argument, NULL, 'b'}, {"directory", no_argument, NULL, 'F'}, @@ -672,7 +672,7 @@ enum { TIME_STAMP_LEN_MAXIMUM = MAX (1000, INT_STRLEN_BOUND (time_t)) }; /* strftime formats for non-recent and recent files, respectively, in -l output. */ -static char const *long_time_format[2] = +static const char const *long_time_format[2] = { /* strftime format for non-recent files (older than 6 months), in -l output. This should contain the year, month and day (at @@ -741,7 +741,7 @@ enum TIME_STYLE_OPTION }; -static struct option const long_options[] = +static const struct option const long_options[] = { {"all", no_argument, NULL, 'a'}, {"escape", no_argument, NULL, 'b'}, @@ -3151,7 +3151,7 @@ static int rev_xstrcoll_df_version (V a, V b) } \ } -static qsortFunc sort_functions[][2][2][2] = +static const qsortFunc const sort_functions[][2][2][2] = { LIST_SORTFUNCTION_VARIANTS (name), LIST_SORTFUNCTION_VARIANTS (extension), diff --git a/src/md5sum.c b/src/md5sum.c index dcafe9733..bc708dc4d 100644 --- a/src/md5sum.c +++ b/src/md5sum.c @@ -128,7 +128,7 @@ enum QUIET_OPTION }; -static const struct option long_options[] = +static const 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 9644f4c9f..7cb03746f 100644 --- a/src/mkdir.c +++ b/src/mkdir.c @@ -36,7 +36,7 @@ #define AUTHORS proper_name ("David MacKenzie") -static struct option const longopts[] = +static const 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 d0d2c4519..b77cfbab7 100644 --- a/src/mkfifo.c +++ b/src/mkfifo.c @@ -32,7 +32,7 @@ #define AUTHORS proper_name ("David MacKenzie") -static struct option const longopts[] = +static const 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 d93e2cb9d..f5c59905d 100644 --- a/src/mknod.c +++ b/src/mknod.c @@ -33,7 +33,7 @@ #define AUTHORS proper_name ("David MacKenzie") -static struct option const longopts[] = +static const 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 8a09231f9..2821c8cdf 100644 --- a/src/mktemp.c +++ b/src/mktemp.c @@ -42,7 +42,7 @@ enum TMPDIR_OPTION = CHAR_MAX + 1 }; -static struct option const longopts[] = +static const struct option const longopts[] = { {"directory", no_argument, NULL, 'd'}, {"quiet", no_argument, NULL, 'q'}, @@ -71,7 +71,7 @@ static int const reply_vals[] = I_ALWAYS_YES, I_ALWAYS_NO, I_ASK_USER }; -static struct option const long_options[] = +static const 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 13033ec5e..278005f86 100644 --- a/src/nice.c +++ b/src/nice.c @@ -55,7 +55,7 @@ # define NZERO 20 #endif -static struct option const longopts[] = +static const struct option const longopts[] = { {"adjustment", required_argument, NULL, 'n'}, {NULL, 0, NULL, 0} @@ -144,7 +144,7 @@ static intmax_t line_no; /* True if we have ever read standard input. */ static bool have_read_stdin; -static struct option const longopts[] = +static const struct option const longopts[] = { {"header-numbering", required_argument, NULL, 'h'}, {"body-numbering", required_argument, NULL, 'b'}, @@ -174,7 +174,7 @@ static const int width_bytes[] = verify (sizeof width_bytes / sizeof width_bytes[0] == N_SIZE_SPECS); /* Names for some non-printing characters. */ -static char const charname[33][4] = +static const char const charname[33][4] = { "nul", "soh", "stx", "etx", "eot", "enq", "ack", "bel", "bs", "ht", "nl", "vt", "ff", "cr", "so", "si", @@ -281,7 +281,7 @@ enum TRADITIONAL_OPTION = CHAR_MAX + 1 }; -static struct option const long_options[] = +static const 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 9dee94aa4..a40bee55b 100644 --- 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 struct option const longopts[] = +static const 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 48001fc03..fceda9130 100644 --- a/src/pathchk.c +++ b/src/pathchk.c @@ -78,7 +78,7 @@ enum PORTABILITY_OPTION = CHAR_MAX + 1 }; -static struct option const longopts[] = +static const 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 9c80d94d5..778ae0c84 100644 --- 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 struct option const longopts[] = +static const struct option const longopts[] = { {GETOPT_HELP_OPTION_DECL}, {GETOPT_VERSION_OPTION_DECL}, @@ -740,7 +740,7 @@ enum static char const short_options[] = "-0123456789D:FJN:S::TW:abcde::fh:i::l:mn::o:rs::tvw:"; -static struct option const long_options[] = +static const struct option const long_options[] = { {"pages", required_argument, NULL, PAGES_OPTION}, {"columns", required_argument, NULL, COLUMNS_OPTION}, @@ -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 long_options[] = +static const 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 98a955c0c..405d467d7 100644 --- 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 struct option const longopts[] = +static const struct option const longopts[] = { {"canonicalize", no_argument, NULL, 'f'}, {"canonicalize-existing", no_argument, NULL, 'e'}, @@ -84,7 +84,7 @@ enum interactive_type interactive_always /* 2: default, -i or --interactive=always */ }; -static struct option const long_opts[] = +static const 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 64575b091..25d72db52 100644 --- a/src/rmdir.c +++ b/src/rmdir.c @@ -55,7 +55,7 @@ enum IGNORE_FAIL_ON_NON_EMPTY_OPTION = CHAR_MAX + 1 }; -static struct option const longopts[] = +static const 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 a5c2300fc..8c2b26168 100644 --- a/src/runcon.c +++ b/src/runcon.c @@ -61,7 +61,8 @@ #define AUTHORS proper_name ("Russell Coker") -static struct option long_options[] = { +static const struct option const long_options[] = +{ {"role", required_argument, NULL, 'r'}, {"type", required_argument, NULL, 't'}, {"user", required_argument, NULL, 'u'}, @@ -51,7 +51,7 @@ static char const *separator; /* FIXME: make this an option. */ static char const terminator[] = "\n"; -static struct option const long_options[] = +static const 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 bfafa96f3..91a89d257 100644 --- a/src/shred.c +++ b/src/shred.c @@ -133,7 +133,7 @@ enum RANDOM_SOURCE_OPTION = CHAR_MAX + 1 }; -static struct option const long_opts[] = +static const 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 ca5345b4b..118ba0bf6 100644 --- a/src/shuf.c +++ b/src/shuf.c @@ -84,7 +84,7 @@ enum RANDOM_SOURCE_OPTION = CHAR_MAX + 1 }; -static struct option const long_opts[] = +static const 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 632c5c836..218bd2986 100644 --- a/src/sort.c +++ b/src/sort.c @@ -205,7 +205,7 @@ static char fold_toupper[UCHAR_LIM]; /* Table mapping month names to integers. Alphabetic order allows binary search. */ -static struct month monthtab[] = +static const struct month const monthtab[] = { {"APR", 4}, {"AUG", 8}, @@ -399,7 +399,7 @@ enum static char const short_options[] = "-bcCdfgik:mMno:rRsS:t:T:uy:z"; -static struct option const long_options[] = +static const 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 181d83783..995a5a31e 100644 --- a/src/split.c +++ b/src/split.c @@ -79,7 +79,7 @@ enum VERBOSE_OPTION = CHAR_MAX + 1 }; -static struct option const longopts[] = +static const 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 0d52c27b1..087bda3cb 100644 --- a/src/stat.c +++ b/src/stat.c @@ -157,7 +157,8 @@ enum PRINTF_OPTION = CHAR_MAX + 1 }; -static struct option const long_options[] = { +static const struct option const long_options[] = +{ {"context", no_argument, 0, 'Z'}, {"dereference", no_argument, NULL, 'L'}, {"file-system", no_argument, NULL, 'f'}, diff --git a/src/stty.c b/src/stty.c index 004c3186c..548923da4 100644 --- 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 struct mode_info mode_info[] = +static const 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 struct control_info control_info[] = +static const struct control_info const control_info[] = { {"intr", CINTR, VINTR}, {"quit", CQUIT, VQUIT}, @@ -418,7 +418,7 @@ static char const *visible (cc_t ch); static unsigned long int baud_to_value (speed_t speed); static bool recover_mode (char const *arg, struct termios *mode); static int screen_columns (void); -static bool set_mode (struct mode_info *info, bool reversed, +static bool set_mode (struct mode_info const *info, bool reversed, struct termios *mode); static unsigned long int integer_arg (const char *s, unsigned long int max); static speed_t string_to_baud (const char *arg); @@ -432,7 +432,7 @@ static void display_settings (enum output_type output_type, static void display_speed (struct termios *mode, bool fancy); static void display_window_size (bool fancy, char const *device_name); static void sane_mode (struct termios *mode); -static void set_control_char (struct control_info *info, +static void set_control_char (struct control_info const *info, const char *arg, struct termios *mode); static void set_speed (enum speed_setting type, const char *arg, @@ -445,7 +445,7 @@ static int max_col; /* Current position, to know when to wrap. */ static int current_col; -static struct option longopts[] = +static const struct option const longopts[] = { {"all", no_argument, NULL, 'a'}, {"save", no_argument, NULL, 'g'}, @@ -1061,7 +1061,7 @@ main (int argc, char **argv) return true. */ static bool -set_mode (struct mode_info *info, bool reversed, struct termios *mode) +set_mode (struct mode_info const *info, bool reversed, struct termios *mode) { tcflag_t *bitsp; @@ -1267,7 +1267,7 @@ set_mode (struct mode_info *info, bool reversed, struct termios *mode) } static void -set_control_char (struct control_info *info, const char *arg, +set_control_char (struct control_info const *info, const char *arg, struct termios *mode) { unsigned long int value; @@ -1716,7 +1716,7 @@ struct speed_map unsigned long int value; /* Numeric value. */ }; -static struct speed_map speeds[] = +static const struct speed_map const speeds[] = { {"0", B0, 0}, {"50", B50, 50}, @@ -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 struct option const longopts[] = +static const struct option const longopts[] = { {"command", required_argument, NULL, 'c'}, {"fast", no_argument, NULL, 'f'}, @@ -39,7 +39,7 @@ /* True if any of the files read were the standard input. */ static bool have_read_stdin; -static struct option const longopts[] = +static const struct option const longopts[] = { {"sysv", no_argument, NULL, 's'}, {GETOPT_HELP_OPTION_DECL}, @@ -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 struct option const longopts[] = +static const 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 1ce207e52..72f8267dd 100644 --- a/src/tail.c +++ b/src/tail.c @@ -185,7 +185,7 @@ enum LONG_FOLLOW_OPTION }; -static struct option const long_options[] = +static const struct option const long_options[] = { {"bytes", required_argument, NULL, 'c'}, {"follow", optional_argument, NULL, LONG_FOLLOW_OPTION}, @@ -41,7 +41,7 @@ static bool append; /* If true, ignore interrupts. */ static bool ignore_interrupts; -static struct option const long_options[] = +static const 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 53ebf3c05..b7993456d 100644 --- a/src/timeout.c +++ b/src/timeout.c @@ -84,7 +84,8 @@ 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 struct option const long_options[] = { +static const 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 bbc9c6012..bea51b528 100644 --- a/src/touch.c +++ b/src/touch.c @@ -77,7 +77,7 @@ enum TIME_OPTION = CHAR_MAX + 1 }; -static struct option const longopts[] = +static const struct option const longopts[] = { {"time", required_argument, NULL, TIME_OPTION}, {"no-create", no_argument, NULL, '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 struct option const long_options[] = +static const 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 f26fd45a8..cc4f5075d 100644 --- a/src/truncate.c +++ b/src/truncate.c @@ -50,7 +50,8 @@ static bool block_mode; /* (-r) Reference file to use size from */ static char const *ref_file; -static struct option const longopts[] = { +static const struct option const longopts[] = +{ {"no-create", no_argument, NULL, 'c'}, {"io-blocks", no_argument, NULL, 'o'}, {"reference", required_argument, NULL, 'r'}, @@ -45,7 +45,7 @@ enum /* If true, return an exit status but produce no output. */ static bool silent; -static struct option const longopts[] = +static const 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 3870dfa3d..57778b919 100644 --- a/src/uname.c +++ b/src/uname.c @@ -86,7 +86,7 @@ /* Operating system. */ #define PRINT_OPERATING_SYSTEM 128 -static struct option const uname_long_options[] = +static const struct option const uname_long_options[] = { {"all", no_argument, NULL, 'a'}, {"kernel-name", no_argument, NULL, 's'}, @@ -104,7 +104,7 @@ static struct option const uname_long_options[] = {NULL, 0, NULL, 0} }; -static struct option const arch_long_options[] = +static const 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 5a2d0cdeb..ec8831f42 100644 --- a/src/unexpand.c +++ b/src/unexpand.c @@ -96,7 +96,7 @@ enum CONVERT_FIRST_ONLY_OPTION = CHAR_MAX + 1 }; -static struct option const longopts[] = +static const 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 5af52710c..e837182f8 100644 --- 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 struct option const longopts[] = +static const struct option const longopts[] = { {"count", no_argument, NULL, 'c'}, {"repeated", no_argument, NULL, 'd'}, @@ -85,7 +85,7 @@ enum FILES0_FROM_OPTION = CHAR_MAX + 1 }; -static struct option const longopts[] = +static const struct option const longopts[] = { {"bytes", no_argument, NULL, 'c'}, {"chars", no_argument, NULL, 'm'}, @@ -159,7 +159,8 @@ enum LOOKUP_OPTION = CHAR_MAX + 1 }; -static struct option const longopts[] = { +static const struct option const longopts[] = +{ {"all", no_argument, NULL, 'a'}, {"boot", no_argument, NULL, 'b'}, {"count", no_argument, NULL, 'q'}, |