diff options
author | Eric Andersen | 2001-03-09 21:24:12 +0000 |
---|---|---|
committer | Eric Andersen | 2001-03-09 21:24:12 +0000 |
commit | 3e6ff9017f5aa4ea41de2520a3f6d29fb20e0332 (patch) | |
tree | c9e6d3d695cbb2449132428a32fb6c309aad870f /networking | |
parent | dd91724aa089e344d0f05e40a338dcce481c1845 (diff) | |
download | busybox-3e6ff9017f5aa4ea41de2520a3f6d29fb20e0332.zip busybox-3e6ff9017f5aa4ea41de2520a3f6d29fb20e0332.tar.gz |
A cleanup patch from Jeff Garzik to static-ify a number of
namespace polluting things that really should be static.
Diffstat (limited to 'networking')
-rw-r--r-- | networking/hostname.c | 4 | ||||
-rw-r--r-- | networking/route.c | 4 | ||||
-rw-r--r-- | networking/telnet.c | 2 | ||||
-rw-r--r-- | networking/wget.c | 22 |
4 files changed, 16 insertions, 16 deletions
diff --git a/networking/hostname.c b/networking/hostname.c index 8ea8fe1..a6e001d 100644 --- a/networking/hostname.c +++ b/networking/hostname.c @@ -1,6 +1,6 @@ /* vi: set sw=4 ts=4: */ /* - * $Id: hostname.c,v 1.25 2001/03/09 14:36:42 andersen Exp $ + * $Id: hostname.c,v 1.26 2001/03/09 21:24:12 andersen Exp $ * Mini hostname implementation for busybox * * Copyright (C) 1999 by Randolph Chung <tausq@debian.org> @@ -32,7 +32,7 @@ #include <stdio.h> #include <stdlib.h> -void do_sethostname(char *s, int isfile) +static void do_sethostname(char *s, int isfile) { FILE *f; char buf[255]; diff --git a/networking/route.c b/networking/route.c index b1152ca..337b358 100644 --- a/networking/route.c +++ b/networking/route.c @@ -15,7 +15,7 @@ * Foundation; either version 2 of the License, or (at * your option) any later version. * - * $Id: route.c,v 1.8 2001/03/07 06:33:01 andersen Exp $ + * $Id: route.c,v 1.9 2001/03/09 21:24:12 andersen Exp $ * * displayroute() code added by Vladimir N. Oleynik <dzo@simtreas.ru> * adjustments by Larry Doolittle <LRDoolittle@lbl.gov> @@ -346,7 +346,7 @@ INET_setroute(int action, int options, char **args) return EXIT_SUCCESS; } -void displayroutes(void) +static void displayroutes(void) { char buff[256]; int nl = 0 ; diff --git a/networking/telnet.c b/networking/telnet.c index fd1ace4..758cce8 100644 --- a/networking/telnet.c +++ b/networking/telnet.c @@ -325,7 +325,7 @@ static void putiac1(byte c) /* ******************************* */ -char const escapecharis[] = "\r\nEscape character is "; +static char const escapecharis[] = "\r\nEscape character is "; static void setConMode() { diff --git a/networking/wget.c b/networking/wget.c index 4b8392b..85023f9 100644 --- a/networking/wget.c +++ b/networking/wget.c @@ -47,22 +47,22 @@ } while (0) #endif -void parse_url(char *url, char **uri_host, int *uri_port, char **uri_path); -FILE *open_socket(char *host, int port); -char *gethdr(char *buf, size_t bufsiz, FILE *fp, int *istrunc); -void progressmeter(int flag); +static void parse_url(char *url, char **uri_host, int *uri_port, char **uri_path); +static FILE *open_socket(char *host, int port); +static char *gethdr(char *buf, size_t bufsiz, FILE *fp, int *istrunc); +static void progressmeter(int flag); /* Globals (can be accessed from signal handlers */ static off_t filesize = 0; /* content-length of the file */ #ifdef BB_FEATURE_WGET_STATUSBAR static char *curfile; /* Name of current file being transferred. */ static struct timeval start; /* Time a transfer started. */ -volatile unsigned long statbytes; /* Number of bytes transferred so far. */ +static volatile unsigned long statbytes; /* Number of bytes transferred so far. */ /* For progressmeter() -- number of seconds before xfer considered "stalled" */ static const int STALLTIME = 5; #endif -void close_and_delete_outfile(FILE* output, char *fname_out, int do_continue) +static void close_and_delete_outfile(FILE* output, char *fname_out, int do_continue) { if (output != stdout && do_continue==0) { fclose(output); @@ -371,7 +371,7 @@ char *gethdr(char *buf, size_t bufsiz, FILE *fp, int *istrunc) */ -int +static int getttywidth(void) { struct winsize winsize; @@ -382,7 +382,7 @@ getttywidth(void) return (80); } -void +static void updateprogressmeter(int ignore) { int save_errno = errno; @@ -391,7 +391,7 @@ updateprogressmeter(int ignore) errno = save_errno; } -void +static void alarmtimer(int wait) { struct itimerval itv; @@ -403,7 +403,7 @@ alarmtimer(int wait) } -void +static void progressmeter(int flag) { static const char prefixes[] = " KMGTP"; @@ -534,7 +534,7 @@ progressmeter(int flag) * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: wget.c,v 1.28 2001/02/20 06:14:08 andersen Exp $ + * $Id: wget.c,v 1.29 2001/03/09 21:24:12 andersen Exp $ */ |