remove redundant const directives

In 1463824d8e, 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".
This commit is contained in:
Jim Meyering committed 2008-06-16 16:40:59 +02:00
1 parent 3de1559830
commit 45e67188d6
68 files changed
+74 -74

No files matched your search

+1 -1
View File
@@ -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; } || :
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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'},
+3 -3
View File
@@ -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}
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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},
+1 -1
View File
@@ -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},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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' },
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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}
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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},
+1 -1
View File
@@ -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},
+1 -1
View File
@@ -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},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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. */
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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'},
+4 -4
View File
@@ -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},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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}
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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'},
+2 -2
View File
@@ -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},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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'},
+1 -1
View File
@@ -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'},