From dfba741457cc81eb2ed3a9d4c074fbad74aa3249 Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Mon, 6 Mar 2006 20:47:33 +0000
Subject: Robert P. Day removed 8 gazillion occurrences of "extern" on function
 definitions.  (That should only be on prototypes.)

---
 coreutils/basename.c                        | 2 +-
 coreutils/cat.c                             | 2 +-
 coreutils/cp.c                              | 2 +-
 coreutils/cut.c                             | 2 +-
 coreutils/df.c                              | 2 +-
 coreutils/dirname.c                         | 2 +-
 coreutils/echo.c                            | 2 +-
 coreutils/env.c                             | 2 +-
 coreutils/false.c                           | 2 +-
 coreutils/fold.c                            | 2 +-
 coreutils/hostid.c                          | 2 +-
 coreutils/id.c                              | 2 +-
 coreutils/install.c                         | 2 +-
 coreutils/length.c                          | 2 +-
 coreutils/libcoreutils/cp_mv_stat.c         | 4 ++--
 coreutils/libcoreutils/getopt_mk_fifo_nod.c | 2 +-
 coreutils/ln.c                              | 2 +-
 coreutils/logname.c                         | 2 +-
 coreutils/ls.c                              | 2 +-
 coreutils/mkdir.c                           | 2 +-
 coreutils/mkfifo.c                          | 2 +-
 coreutils/mknod.c                           | 2 +-
 coreutils/mv.c                              | 2 +-
 coreutils/pwd.c                             | 2 +-
 coreutils/rm.c                              | 2 +-
 coreutils/rmdir.c                           | 2 +-
 coreutils/seq.c                             | 2 +-
 coreutils/sleep.c                           | 2 +-
 coreutils/stty.c                            | 4 ++--
 coreutils/sync.c                            | 2 +-
 coreutils/test.c                            | 2 +-
 coreutils/touch.c                           | 2 +-
 coreutils/tr.c                              | 2 +-
 coreutils/true.c                            | 2 +-
 coreutils/tty.c                             | 2 +-
 coreutils/usleep.c                          | 2 +-
 coreutils/uudecode.c                        | 2 +-
 coreutils/watch.c                           | 2 +-
 coreutils/who.c                             | 2 +-
 coreutils/whoami.c                          | 2 +-
 coreutils/yes.c                             | 2 +-
 41 files changed, 43 insertions(+), 43 deletions(-)

(limited to 'coreutils')

diff --git a/coreutils/basename.c b/coreutils/basename.c
index 7b8b7b6f0..91652cfed 100644
--- a/coreutils/basename.c
+++ b/coreutils/basename.c
@@ -37,7 +37,7 @@
 #include <string.h>
 #include "busybox.h"
 
-extern int basename_main(int argc, char **argv)
+int basename_main(int argc, char **argv)
 {
 	size_t m, n;
 	char *s;
diff --git a/coreutils/cat.c b/coreutils/cat.c
index 62af6c5d5..9645f6143 100644
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -40,7 +40,7 @@
 #include <unistd.h>
 #include "busybox.h"
 
-extern int cat_main(int argc, char **argv)
+int cat_main(int argc, char **argv)
 {
 	FILE *f;
 	int retval = EXIT_SUCCESS;
diff --git a/coreutils/cp.c b/coreutils/cp.c
index ac572548f..87f229196 100644
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -28,7 +28,7 @@
 #include "busybox.h"
 #include "libcoreutils/coreutils.h"
 
-extern int cp_main(int argc, char **argv)
+int cp_main(int argc, char **argv)
 {
 	struct stat source_stat;
 	struct stat dest_stat;
diff --git a/coreutils/cut.c b/coreutils/cut.c
index 839bab68e..526a99393 100644
--- a/coreutils/cut.c
+++ b/coreutils/cut.c
@@ -289,7 +289,7 @@ static void cut_file(FILE *file)
 }
 
 
-extern int cut_main(int argc, char **argv)
+int cut_main(int argc, char **argv)
 {
 	unsigned long opt;
 	char *sopt, *sdopt;
diff --git a/coreutils/df.c b/coreutils/df.c
index ef08f91d4..bd487ee95 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -46,7 +46,7 @@ static long kscale(long b, long bs)
 }
 #endif
 
-extern int df_main(int argc, char **argv)
+int df_main(int argc, char **argv)
 {
 	long blocks_used;
 	long blocks_percent_used;
diff --git a/coreutils/dirname.c b/coreutils/dirname.c
index 5136e4909..dfe40e44b 100644
--- a/coreutils/dirname.c
+++ b/coreutils/dirname.c
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include "busybox.h"
 
-extern int dirname_main(int argc, char **argv)
+int dirname_main(int argc, char **argv)
 {
 	if (argc != 2) {
 		bb_show_usage();
diff --git a/coreutils/echo.c b/coreutils/echo.c
index 595e6defe..0dbb32f28 100644
--- a/coreutils/echo.c
+++ b/coreutils/echo.c
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include "busybox.h"
 
-extern int echo_main(int argc, char** argv)
+int echo_main(int argc, char** argv)
 {
 	(void)bb_echo(argc, argv);
 	bb_fflush_stdout_and_exit(EXIT_SUCCESS);
diff --git a/coreutils/env.c b/coreutils/env.c
index 156f4e77d..fd58a23da 100644
--- a/coreutils/env.c
+++ b/coreutils/env.c
@@ -57,7 +57,7 @@ static const struct option env_long_options[] = {
 	{ 0, 0, 0, 0 }
 };
 
-extern int env_main(int argc, char** argv)
+int env_main(int argc, char** argv)
 {
 	static char *cleanenv[1] = { NULL };
 
diff --git a/coreutils/false.c b/coreutils/false.c
index b06ef8b62..084bc0c1e 100644
--- a/coreutils/false.c
+++ b/coreutils/false.c
@@ -13,7 +13,7 @@
 #include <stdlib.h>
 #include "busybox.h"
 
-extern int false_main(int ATTRIBUTE_UNUSED argc, char ATTRIBUTE_UNUSED **argv)
+int false_main(int ATTRIBUTE_UNUSED argc, char ATTRIBUTE_UNUSED **argv)
 {
 	return EXIT_FAILURE;
 }
diff --git a/coreutils/fold.c b/coreutils/fold.c
index f1ab1bdc0..833935af3 100644
--- a/coreutils/fold.c
+++ b/coreutils/fold.c
@@ -44,7 +44,7 @@ static int adjust_column(int column, char c)
 	return column;
 }
 
-extern int fold_main(int argc, char **argv)
+int fold_main(int argc, char **argv)
 {
 	char *w_opt;
 	int width = 80;
diff --git a/coreutils/hostid.c b/coreutils/hostid.c
index 0c11ca385..cda96726a 100644
--- a/coreutils/hostid.c
+++ b/coreutils/hostid.c
@@ -13,7 +13,7 @@
 #include <unistd.h>
 #include "busybox.h"
 
-extern int hostid_main(int argc, char ATTRIBUTE_UNUSED **argv)
+int hostid_main(int argc, char ATTRIBUTE_UNUSED **argv)
 {
 	if (argc > 1) {
 		bb_show_usage();
diff --git a/coreutils/id.c b/coreutils/id.c
index 39a57c196..73c3c2e3b 100644
--- a/coreutils/id.c
+++ b/coreutils/id.c
@@ -53,7 +53,7 @@ static short printf_full(unsigned int id, const char *arg, const char prefix)
 	return status;
 }
 
-extern int id_main(int argc, char **argv)
+int id_main(int argc, char **argv)
 {
 	struct passwd *p;
 	uid_t uid;
diff --git a/coreutils/install.c b/coreutils/install.c
index e58cac931..e8dd5060c 100644
--- a/coreutils/install.c
+++ b/coreutils/install.c
@@ -49,7 +49,7 @@ static const struct option install_long_options[] = {
 	{ 0,	0,	0,	0 }
 };
 
-extern int install_main(int argc, char **argv)
+int install_main(int argc, char **argv)
 {
 	mode_t mode;
 	uid_t uid;
diff --git a/coreutils/length.c b/coreutils/length.c
index bce43ab3f..55fef131b 100644
--- a/coreutils/length.c
+++ b/coreutils/length.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include "busybox.h"
 
-extern int length_main(int argc, char **argv)
+int length_main(int argc, char **argv)
 {
 	if ((argc != 2) ||  (**(++argv) == '-')) {
 	    bb_show_usage();
diff --git a/coreutils/libcoreutils/cp_mv_stat.c b/coreutils/libcoreutils/cp_mv_stat.c
index 5a70b0221..d401bcc75 100644
--- a/coreutils/libcoreutils/cp_mv_stat.c
+++ b/coreutils/libcoreutils/cp_mv_stat.c
@@ -25,7 +25,7 @@
 #include "libbb.h"
 #include "coreutils.h"
 
-extern int cp_mv_stat2(const char *fn, struct stat *fn_stat, stat_func sf)
+int cp_mv_stat2(const char *fn, struct stat *fn_stat, stat_func sf)
 {
 	if (sf(fn, fn_stat) < 0) {
 		if (errno != ENOENT) {
@@ -39,7 +39,7 @@ extern int cp_mv_stat2(const char *fn, struct stat *fn_stat, stat_func sf)
 	return 1;
 }
 
-extern int cp_mv_stat(const char *fn, struct stat *fn_stat)
+int cp_mv_stat(const char *fn, struct stat *fn_stat)
 {
 	return cp_mv_stat2(fn, fn_stat, stat);
 }
diff --git a/coreutils/libcoreutils/getopt_mk_fifo_nod.c b/coreutils/libcoreutils/getopt_mk_fifo_nod.c
index 090fefaee..d1f5b1e89 100644
--- a/coreutils/libcoreutils/getopt_mk_fifo_nod.c
+++ b/coreutils/libcoreutils/getopt_mk_fifo_nod.c
@@ -26,7 +26,7 @@
 #include "libbb.h"
 #include "coreutils.h"
 
-extern mode_t getopt_mk_fifo_nod(int argc, char **argv)
+mode_t getopt_mk_fifo_nod(int argc, char **argv)
 {
 	mode_t mode = 0666;
 	char *smode = NULL;
diff --git a/coreutils/ln.c b/coreutils/ln.c
index dcb70d40f..229c68218 100644
--- a/coreutils/ln.c
+++ b/coreutils/ln.c
@@ -36,7 +36,7 @@
 #define LN_BACKUP           8
 #define LN_SUFFIX           16
 
-extern int ln_main(int argc, char **argv)
+int ln_main(int argc, char **argv)
 {
 	int status = EXIT_SUCCESS;
 	int flag;
diff --git a/coreutils/logname.c b/coreutils/logname.c
index e2a74f932..da8a1cfc9 100644
--- a/coreutils/logname.c
+++ b/coreutils/logname.c
@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include "busybox.h"
 
-extern int logname_main(int argc, char ATTRIBUTE_UNUSED **argv)
+int logname_main(int argc, char ATTRIBUTE_UNUSED **argv)
 {
 	const char *p;
 
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 79a583a1c..a575a02cb 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -955,7 +955,7 @@ static const unsigned opt_flags[] = {
 
 /*----------------------------------------------------------------------*/
 
-extern int ls_main(int argc, char **argv)
+int ls_main(int argc, char **argv)
 {
 	struct dnode **dnd;
 	struct dnode **dnf;
diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index e24ef4f89..48a95badb 100644
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -40,7 +40,7 @@ static const struct option mkdir_long_options[] = {
 	{ 0, 0, 0, 0 }
 };
 
-extern int mkdir_main (int argc, char **argv)
+int mkdir_main (int argc, char **argv)
 {
 	mode_t mode = (mode_t)(-1);
 	int status = EXIT_SUCCESS;
diff --git a/coreutils/mkfifo.c b/coreutils/mkfifo.c
index 77e0e6dd8..2414be38e 100644
--- a/coreutils/mkfifo.c
+++ b/coreutils/mkfifo.c
@@ -29,7 +29,7 @@
 #include "busybox.h"
 #include "libcoreutils/coreutils.h"
 
-extern int mkfifo_main(int argc, char **argv)
+int mkfifo_main(int argc, char **argv)
 {
 	mode_t mode;
 	int retval = EXIT_SUCCESS;
diff --git a/coreutils/mknod.c b/coreutils/mknod.c
index b6e85272d..cb5980b95 100644
--- a/coreutils/mknod.c
+++ b/coreutils/mknod.c
@@ -32,7 +32,7 @@
 static const char modes_chars[] = { 'p', 'c', 'u', 'b', 0, 1, 1, 2 };
 static const mode_t modes_cubp[] = { S_IFIFO, S_IFCHR, S_IFBLK };
 
-extern int mknod_main(int argc, char **argv)
+int mknod_main(int argc, char **argv)
 {
 	mode_t mode;
 	dev_t dev;
diff --git a/coreutils/mv.c b/coreutils/mv.c
index aef1ed19a..1c0dc3d72 100644
--- a/coreutils/mv.c
+++ b/coreutils/mv.c
@@ -46,7 +46,7 @@ static const struct option mv_long_options[] = {
 
 static const char fmt[] = "cannot overwrite %sdirectory with %sdirectory";
 
-extern int mv_main(int argc, char **argv)
+int mv_main(int argc, char **argv)
 {
 	struct stat dest_stat;
 	const char *last;
diff --git a/coreutils/pwd.c b/coreutils/pwd.c
index 7e0dc056a..33f80d004 100644
--- a/coreutils/pwd.c
+++ b/coreutils/pwd.c
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include "busybox.h"
 
-extern int pwd_main(int argc, char **argv)
+int pwd_main(int argc, char **argv)
 {
 	char *buf;
 
diff --git a/coreutils/rm.c b/coreutils/rm.c
index e4e9bb0be..59c639b88 100644
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -32,7 +32,7 @@
 #include <unistd.h>
 #include "busybox.h"
 
-extern int rm_main(int argc, char **argv)
+int rm_main(int argc, char **argv)
 {
 	int status = 0;
 	int flags = 0;
diff --git a/coreutils/rmdir.c b/coreutils/rmdir.c
index 1d6b2cadb..cc21f5df9 100644
--- a/coreutils/rmdir.c
+++ b/coreutils/rmdir.c
@@ -28,7 +28,7 @@
 #include <libgen.h>
 #include "busybox.h"
 
-extern int rmdir_main(int argc, char **argv)
+int rmdir_main(int argc, char **argv)
 {
 	int status = EXIT_SUCCESS;
 	int flags;
diff --git a/coreutils/seq.c b/coreutils/seq.c
index 51e3add81..66141c4e2 100644
--- a/coreutils/seq.c
+++ b/coreutils/seq.c
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 #include "busybox.h"
 
-extern int seq_main(int argc, char **argv)
+int seq_main(int argc, char **argv)
 {
 	double last, first, increment, i;
 	
diff --git a/coreutils/sleep.c b/coreutils/sleep.c
index 506192dd3..c46a4e5f4 100644
--- a/coreutils/sleep.c
+++ b/coreutils/sleep.c
@@ -46,7 +46,7 @@ static const struct suffix_mult sleep_suffixes[] = {
 };
 #endif
 
-extern int sleep_main(int argc, char **argv)
+int sleep_main(int argc, char **argv)
 {
 	unsigned int duration;
 
diff --git a/coreutils/stty.c b/coreutils/stty.c
index 63d586e50..a3526136f 100644
--- a/coreutils/stty.c
+++ b/coreutils/stty.c
@@ -467,9 +467,9 @@ static const struct suffix_mult stty_suffixes[] = {
 };
 
 #ifndef TEST
-extern int stty_main(int argc, char **argv)
+int stty_main(int argc, char **argv)
 #else
-extern int main(int argc, char **argv)
+int main(int argc, char **argv)
 #endif
 {
 	struct termios mode;
diff --git a/coreutils/sync.c b/coreutils/sync.c
index 84746311f..4e75e4f29 100644
--- a/coreutils/sync.c
+++ b/coreutils/sync.c
@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include "busybox.h"
 
-extern int sync_main(int argc, char **argv)
+int sync_main(int argc, char **argv)
 {
 	bb_warn_ignoring_args(argc - 1);
 
diff --git a/coreutils/test.c b/coreutils/test.c
index d7bd5a0de..ecd154907 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -183,7 +183,7 @@ static int test_eaccess(char *path, int mode);
 static int is_a_group_member(gid_t gid);
 static void initialize_group_array(void);
 
-extern int test_main(int argc, char **argv)
+int test_main(int argc, char **argv)
 {
 	int res;
 
diff --git a/coreutils/touch.c b/coreutils/touch.c
index 645fb2174..f78fe5114 100644
--- a/coreutils/touch.c
+++ b/coreutils/touch.c
@@ -39,7 +39,7 @@
 #include <stdlib.h>
 #include "busybox.h"
 
-extern int touch_main(int argc, char **argv)
+int touch_main(int argc, char **argv)
 {
 	int fd;
 	int flags;
diff --git a/coreutils/tr.c b/coreutils/tr.c
index d6c5e346e..adddf83d2 100644
--- a/coreutils/tr.c
+++ b/coreutils/tr.c
@@ -202,7 +202,7 @@ static int complement(unsigned char *buffer, int buffer_len)
 	return ix;
 }
 
-extern int tr_main(int argc, char **argv)
+int tr_main(int argc, char **argv)
 {
 	register unsigned char *ptr;
 	int output_length=0, input_length;
diff --git a/coreutils/true.c b/coreutils/true.c
index 3e7eb0111..1f2768615 100644
--- a/coreutils/true.c
+++ b/coreutils/true.c
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include "busybox.h"
 
-extern int true_main(int argc, char **argv)
+int true_main(int argc, char **argv)
 {
 	return EXIT_SUCCESS;
 }
diff --git a/coreutils/tty.c b/coreutils/tty.c
index cd2c784fd..6aea7a30f 100644
--- a/coreutils/tty.c
+++ b/coreutils/tty.c
@@ -28,7 +28,7 @@
 #include <unistd.h>
 #include "busybox.h"
 
-extern int tty_main(int argc, char **argv)
+int tty_main(int argc, char **argv)
 {
 	const char *s;
 	int silent;		/* Note: No longer relevant in SUSv3. */
diff --git a/coreutils/usleep.c b/coreutils/usleep.c
index f570f2734..9dd643f92 100644
--- a/coreutils/usleep.c
+++ b/coreutils/usleep.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #include "busybox.h"
 
-extern int usleep_main(int argc, char **argv)
+int usleep_main(int argc, char **argv)
 {
 	if (argc != 2) {
 		bb_show_usage();
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c
index 5823afd90..310d5b6c4 100644
--- a/coreutils/uudecode.c
+++ b/coreutils/uudecode.c
@@ -138,7 +138,7 @@ static int read_base64(FILE *src_stream, FILE *dst_stream)
 	}
 }
 
-extern int uudecode_main(int argc, char **argv)
+int uudecode_main(int argc, char **argv)
 {
 	int (*decode_fn_ptr) (FILE * src, FILE * dst);
 	FILE *src_stream;
diff --git a/coreutils/watch.c b/coreutils/watch.c
index 31fadfb85..9da591b48 100644
--- a/coreutils/watch.c
+++ b/coreutils/watch.c
@@ -39,7 +39,7 @@
 #include <sys/wait.h>
 #include "busybox.h"
 
-extern int watch_main(int argc, char **argv)
+int watch_main(int argc, char **argv)
 {
 	const int header_len = 40;
 	time_t t;
diff --git a/coreutils/who.c b/coreutils/who.c
index e2ea227eb..1156ba20f 100644
--- a/coreutils/who.c
+++ b/coreutils/who.c
@@ -25,7 +25,7 @@
 #include <time.h>
 #include "busybox.h"
 
-extern int who_main(int argc, char **argv)
+int who_main(int argc, char **argv)
 {
     struct utmp *ut;
     struct stat st;
diff --git a/coreutils/whoami.c b/coreutils/whoami.c
index 16d28083c..71ef3537d 100644
--- a/coreutils/whoami.c
+++ b/coreutils/whoami.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #include "busybox.h"
 
-extern int whoami_main(int argc, char **argv)
+int whoami_main(int argc, char **argv)
 {
 	if (argc > 1)
 		bb_show_usage();
diff --git a/coreutils/yes.c b/coreutils/yes.c
index 74f7571cf..cafc16bc9 100644
--- a/coreutils/yes.c
+++ b/coreutils/yes.c
@@ -31,7 +31,7 @@
 #include <stdlib.h>
 #include "busybox.h"
 
-extern int yes_main(int argc, char **argv)
+int yes_main(int argc, char **argv)
 {
 	static const char fmt_str[] = " %s";
 	const char *fmt;
-- 
cgit v1.2.3