Don't prototype usage as static.

diff --git a/src/cat.c b/src/cat.c
index a278a951f9d1563f6aab72baea56cb3956500874..8fe48e648401c91d24d978c28fb22fc21d7fcd31 100644 (file)
--- a/src/cat.c
+++ b/src/cat.c
@@ -72,7 +72,7 @@ static int newlines2 = 0;
 /* Count of non-fatal error conditions.  */
 static int exit_status = 0;
 
-static void
+void
 usage (int status)
 {
   if (status != 0)

diff --git a/src/cksum.c b/src/cksum.c
index 81d745d8040883305cc199267eec4078fac1389a..ad389827a4b19dd614661079ad2f4ffb16700c74 100644 (file)
--- a/src/cksum.c
+++ b/src/cksum.c
@@ -260,7 +260,7 @@ cksum (char *file, int print_name)
   return 0;
 }
 
-static void
+void
 usage (int status)
 {
   if (status != 0)

diff --git a/src/comm.c b/src/comm.c
index ef27f81ddbea0d21befdfb5a8a857a4f6878198a..f2cf9953e023e210403c2746c340deec2b16cec2 100644 (file)
--- a/src/comm.c
+++ b/src/comm.c
@@ -57,7 +57,7 @@ static struct option const long_options[] =
 
 \f
 
-static void
+void
 usage (int status)
 {
   if (status != 0)

diff --git a/src/csplit.c b/src/csplit.c
index fe007eb5f2329660afd57ccc23bb4f9bdf383607..17fca156e5a06f29396055818327fd8f9997c293 100644 (file)
--- a/src/csplit.c
+++ b/src/csplit.c
@@ -123,7 +123,7 @@ static void close_output_file PARAMS ((void));
 static void create_output_file PARAMS ((void));
 static void delete_all_files PARAMS ((void));
 static void save_line_to_file PARAMS ((const struct cstring *line));
-static void usage PARAMS ((int status));
+void usage PARAMS ((int status));
 
 /* The name this program was run with. */
 char *program_name;
@@ -1496,7 +1496,7 @@ main (int argc, char **argv)
   exit (EXIT_SUCCESS);
 }
 
-static void
+void
 usage (int status)
 {
   if (status != 0)

diff --git a/src/cut.c b/src/cut.c
index 801e8b8e34f0da111387bf636db3873409351c42..e8047c95e70e8f1c1af759de2e84b3b1777e9fef 100644 (file)
--- a/src/cut.c
+++ b/src/cut.c
@@ -187,7 +187,7 @@ static struct option const longopts[] =
   {0, 0, 0, 0}
 };
 
-static void
+void
 usage (int status)
 {
   if (status != 0)

diff --git a/src/expand.c b/src/expand.c
index 84f589a93718bf818a19bbd030c6e41720d5511d..ecb4590b25578d6c8e063b4568755c1c6badd769 100644 (file)
--- a/src/expand.c
+++ b/src/expand.c
@@ -98,7 +98,7 @@ static struct option const longopts[] =
   {NULL, 0, NULL, 0}
 };
 
-static void
+void
 usage (int status)
 {
   if (status != 0)

diff --git a/src/fmt.c b/src/fmt.c
index f0f7108ee435bc65a1bfbf7c072718f78440c9a6..b944e36412f78dc9af36e71c6683217057eb0364 100644 (file)
--- a/src/fmt.c
+++ b/src/fmt.c
@@ -262,7 +262,7 @@ static int next_prefix_indent;
    paragraphs chosen by fmt_paragraph().  */
 static int last_line_length;
 
-static void
+void
 usage (int status)
 {
   if (status != 0)

diff --git a/src/fold.c b/src/fold.c
index 14868b343519fbaf64e3edc96d903ed3ed111826..e51bdde71e6a87968eaf572d2edce05518786484 100644 (file)
--- a/src/fold.c
+++ b/src/fold.c
@@ -55,7 +55,7 @@ static struct option const longopts[] =
   {NULL, 0, NULL, 0}
 };
 
-static void
+void
 usage (int status)
 {
   if (status != 0)

diff --git a/src/head.c b/src/head.c
index 474ff8bc50a9c67decb3e8262dda16513f9a5aca..a698c2dd8c9063e769b7b84444f7f39b7b03de43 100644 (file)
--- a/src/head.c
+++ b/src/head.c
@@ -76,7 +76,7 @@ static struct option const long_options[] =
   {NULL, 0, NULL, 0}
 };
 
-static void
+void
 usage (int status)
 {
   if (status != 0)
@@ -342,7 +342,6 @@ main (int argc, char **argv)
 
     }
 
-
   while ((c = getopt_long (argc, argv, "c:n:qv", long_options, NULL)) != -1)
     {
       switch (c)

diff --git a/src/join.c b/src/join.c
index 72264f3788ab88e2a0edb7915c75cb81938065a9..30c27c5515753f45d103c98d282e11c3096b9881 100644 (file)
--- a/src/join.c
+++ b/src/join.c
@@ -127,7 +127,7 @@ static struct line uni_blank;
 /* If nonzero, ignore case when comparing join fields.  */
 static int ignore_case;
 
-static void
+void
 usage (int status)
 {
   if (status != 0)

diff --git a/src/md5sum.c b/src/md5sum.c
index 5e364b5245c1ab96715ec9604006a73285295dee..4803285833f4fcefb0b9bcd2a8753cf36660657f 100644 (file)
--- a/src/md5sum.c
+++ b/src/md5sum.c
@@ -93,7 +93,7 @@ static const struct option long_options[] =
   { NULL, 0, NULL, 0 }
 };
 
-static void
+void
 usage (int status)
 {
   if (status != 0)

diff --git a/src/nl.c b/src/nl.c
index c0f35001820796e0ff4fc00aaf5fe11f765ad45c..cd4ce568dadf6e413f7563ff387397d73f49c496 100644 (file)
--- a/src/nl.c
+++ b/src/nl.c
@@ -165,7 +165,7 @@ static struct option const longopts[] =
 
 /* Print a usage message and quit. */
 
-static void
+void
 usage (int status)
 {
   if (status != 0)

diff --git a/src/od.c b/src/od.c
index 71545ecf1af1f8346077ae6bfa748ad6452e8062..1b4cf6539e9f48af37470a7c92bac65027c91fb2 100644 (file)
--- a/src/od.c
+++ b/src/od.c
@@ -37,7 +37,6 @@ typedef long double LONG_DOUBLE;
 typedef double LONG_DOUBLE;
 #endif
 
-
 #if HAVE_VALUES_H
 # include <values.h>
 #endif
@@ -264,7 +263,7 @@ static struct option const long_options[] =
   {NULL, 0, NULL, 0}
 };
 
-static void
+void
 usage (int status)
 {
   if (status != 0)

diff --git a/src/paste.c b/src/paste.c
index 4136133c4d2b5c4b16c8790624b0e8ec2399b341..21f7a0cb9998a299d4042e3e4991859698ba0447 100644 (file)
--- a/src/paste.c
+++ b/src/paste.c
@@ -399,7 +399,7 @@ paste_serial (int nfiles, char **fnamptr)
   return errors;
 }
 
-static void
+void
 usage (int status)
 {
   if (status != 0)

diff --git a/src/pr.c b/src/pr.c
index ed524f93e5baee8846b0bc9473caf467a4dd4c95..c4c6790dcef53d426685fd21cad32036ea76fa30 100644 (file)
--- a/src/pr.c
+++ b/src/pr.c
@@ -29,7 +29,6 @@
 
    Improve the printing of control prefixes.
 
-
    Options:
 
    +FIRST_PAGE[:LAST_PAGE]
@@ -270,7 +269,7 @@ static void pad_across_to PARAMS ((int position));
 static void add_line_number PARAMS ((COLUMN *p));
 static void getoptarg PARAMS ((char *arg, char switch_char, char *character,
                               int *number));
-static void usage PARAMS ((int status));
+void usage PARAMS ((int status));
 static void print_files PARAMS ((int number_of_files, char **av));
 static void init_parameters PARAMS ((int number_of_files));
 static void init_header PARAMS ((char *filename, int desc));
@@ -2438,7 +2437,7 @@ cleanup (void)
 \f
 /* Complain, print a usage message, and die. */
 
-static void
+void
 usage (int status)
 {
   if (status != 0)

diff --git a/src/ptx.c b/src/ptx.c
index b086cb925212bf7a1e355a45678231df578b10ec..215c47531b3ad5cc76a257475a4f8e9aa1a5f0a9 100644 (file)
--- a/src/ptx.c
+++ b/src/ptx.c
@@ -176,7 +176,6 @@ int maximum_word_length;
 /* Maximum width of any reference used.  */
 int reference_max_width;
 
-
 /* Ignore and Only word tables.  */
 
 WORD_TABLE ignore_table;       /* table of words to ignore */
@@ -269,7 +268,6 @@ size_t number_of_occurs[1]; /* number of used slots in occurs_table */
 #define ALLOC_NEW_OCCURS(language) \
   BUMP_ALLOC (occurs_table[language], number_of_occurs[language], 9, OCCURS)
 
-
 /* Communication among output routines.  */
 
 /* Indicate if special output processing is requested for each character.  */
@@ -1810,7 +1808,6 @@ generate_all_output (void)
   int occurs_index;            /* index of keyword entry being processed */
   OCCURS *occurs_cursor;       /* current keyword entry being processed */
 
-
   /* The following assignments are useful to provide default values in case
      line contexts or references are not used, in which case these variables
      would never be computed.  */
@@ -1823,7 +1820,6 @@ generate_all_output (void)
   head.end = NULL;
   head_truncation = 0;
 
-
   /* Loop over all keyword occurrences.  */
 
   occurs_cursor = occurs_table[0];
@@ -1867,7 +1863,7 @@ generate_all_output (void)
 | Print program identification and options, then exit.  |
 `------------------------------------------------------*/
 
-static void
+void
 usage (int status)
 {
   if (status != EXIT_SUCCESS)
@@ -2064,8 +2060,8 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"),
          break;
 
        case 10:
-         XARGMATCH (&output_format, "--format", optarg,
-                    format_args, format_vals, usage (1));
+         output_format = XARGMATCH ("--format", optarg,
+                                    format_args, format_vals);
        }
     }
 

diff --git a/src/sort.c b/src/sort.c
index 6e76059df53ff648e9f16430db073e861007506a..9636547ebb0fd2afbcb2599c799d561c79b96d7c 100644 (file)
--- a/src/sort.c
+++ b/src/sort.c
@@ -269,7 +269,7 @@ static int have_read_stdin;
 /* Lists of key field comparisons to be tried. */
 static struct keyfield keyhead;
 
-static void
+void
 usage (int status)
 {
   if (status != 0)

diff --git a/src/split.c b/src/split.c
index 288ee5ec92c8a92f2c2bddd48539ad0aa90a20f8..938c5d1dfbda947c0891d4d3e94610a612e16db2 100644 (file)
--- a/src/split.c
+++ b/src/split.c
@@ -77,7 +77,7 @@ static struct option const longopts[] =
   {NULL, 0, NULL, 0}
 };
 
-static void
+void
 usage (int status)
 {
   if (status != 0)

diff --git a/src/sum.c b/src/sum.c
index bb97e10a03bbb0067bfc3ae5efa03759e93a9d26..2a956c5041d0764a57b12e840710ea940830a8e6 100644 (file)
--- a/src/sum.c
+++ b/src/sum.c
@@ -51,7 +51,7 @@ static struct option const longopts[] =
   {NULL, 0, NULL, 0}
 };
 
-static void
+void
 usage (int status)
 {
   if (status != 0)

diff --git a/src/tac.c b/src/tac.c
index b9841703ee57eb35171aefbc57d5e8163246412f..b547296c92f74cbc3affed34c127fb476d28e98e 100644 (file)
--- a/src/tac.c
+++ b/src/tac.c
@@ -109,7 +109,7 @@ static struct option const longopts[] =
   {NULL, 0, NULL, 0}
 };
 
-static void
+void
 usage (int status)
 {
   if (status != 0)

diff --git a/src/tail.c b/src/tail.c
index a8edb57698d943be6dce7c6ba52a22352369cdb1..90d8d49b4d31331e6c0b22c1eef537db34f6265c 100644 (file)
--- a/src/tail.c
+++ b/src/tail.c
@@ -183,7 +183,7 @@ static struct option const long_options[] =
   {NULL, 0, NULL, 0}
 };
 
-static void
+void
 usage (int status)
 {
   if (status != 0)
@@ -1268,8 +1268,8 @@ parse_options (int argc, char **argv,
          if (optarg == NULL)
            follow_mode = DEFAULT_FOLLOW_MODE;
          else
-           XARGMATCH (&follow_mode, "--follow", optarg,
-                      follow_mode_string, follow_mode_map, usage (1));
+           follow_mode = XARGMATCH ("--follow", optarg,
+                                    follow_mode_string, follow_mode_map);
          break;
 
        case CHAR_MAX + 1:

diff --git a/src/tr.c b/src/tr.c
index 88d1700bbb3ac585f49cd92a08d57b3339245692..def9a3716cf1755743d54e36ed476296a549f528 100644 (file)
--- a/src/tr.c
+++ b/src/tr.c
@@ -315,7 +315,7 @@ static struct option const long_options[] =
   {NULL, 0, NULL, 0}
 };
 \f
-static void
+void
 usage (int status)
 {
   if (status != 0)

diff --git a/src/tsort.c b/src/tsort.c
index 418532d1bacc8104bbdb76c050442cd93eb426dd..270632ffeae7dd2b4543a96aa2538457441783d2 100644 (file)
--- a/src/tsort.c
+++ b/src/tsort.c
@@ -77,7 +77,7 @@ static struct option const long_options[] =
   { NULL, 0, NULL, 0}
 };
 \f
-static void
+void
 usage (int status)
 {
   if (status != 0)
@@ -446,7 +446,6 @@ tsort (const char *file)
     }
 }
 
-
 int
 main (int argc, char **argv)
 {

diff --git a/src/unexpand.c b/src/unexpand.c
index 5c4702494e5beb908c9a26e87f5abb27e70b84d5..7768c14cbb1ca9bd961f939debde69778121d5c3 100644 (file)
--- a/src/unexpand.c
+++ b/src/unexpand.c
@@ -351,7 +351,7 @@ unexpand (void)
     }
 }
 
-static void
+void
 usage (int status)
 {
   if (status != 0)

diff --git a/src/uniq.c b/src/uniq.c
index d02790c2e2e54b404bf6ee63069932dea55917d6..9514fa10c587fce53ff265fc9ebf98326035d42f 100644 (file)
--- a/src/uniq.c
+++ b/src/uniq.c
@@ -90,7 +90,7 @@ static struct option const longopts[] =
   {NULL, 0, NULL, 0}
 };
 
-static void
+void
 usage (int status)
 {
   if (status != 0)

diff --git a/src/wc.c b/src/wc.c
index 9571fd9da0d8e23c4ed5656b07b2fce20b02c876..8e20e910419f7c0828c53f8cddfed49c285f9d86 100644 (file)
--- a/src/wc.c
+++ b/src/wc.c
@@ -71,7 +71,7 @@ static struct option const longopts[] =
   {NULL, 0, NULL, 0}
 };
 
-static void
+void
 usage (int status)
 {
   if (status != 0)