From 92d23245c93eb7db64818384ee6c5366a465e29e Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Mon, 19 Mar 2001 23:49:41 +0000 Subject: Another cleanup patch from Jeff Garzik --- cmdedit.c | 2 +- console-tools/loadacm.c | 53 +++++++++---------------------------------------- coreutils/expr.c | 2 +- coreutils/test.c | 4 ++-- coreutils/usleep.c | 2 ++ expr.c | 2 +- loadacm.c | 53 +++++++++---------------------------------------- mkfs_minix.c | 2 +- networking/telnet.c | 4 ++-- shell/cmdedit.c | 2 +- telnet.c | 4 ++-- test.c | 4 ++-- usleep.c | 2 ++ util-linux/mkfs_minix.c | 2 +- 14 files changed, 36 insertions(+), 102 deletions(-) diff --git a/cmdedit.c b/cmdedit.c index ffe7afab2..e317b86fa 100644 --- a/cmdedit.c +++ b/cmdedit.c @@ -113,7 +113,7 @@ void *xcalloc(size_t size, size_t se) } #define error_msg(s, d) fprintf(stderr, s, d) -#endif +#endif /* TEST */ struct history { diff --git a/console-tools/loadacm.c b/console-tools/loadacm.c index 81b973b02..e5a29b6a1 100644 --- a/console-tools/loadacm.c +++ b/console-tools/loadacm.c @@ -24,10 +24,10 @@ typedef unsigned short unicode; static long int ctoi(unsigned char *s, int *is_unicode); -int old_screen_map_read_ascii(FILE * fp, unsigned char buf[]); -int uni_screen_map_read_ascii(FILE * fp, unicode buf[], int *is_unicode); -unicode utf8_to_ucs2(char *buf); -int screen_map_load(int fd, FILE * fp); +static int old_screen_map_read_ascii(FILE * fp, unsigned char buf[]); +static int uni_screen_map_read_ascii(FILE * fp, unicode buf[], int *is_unicode); +static unicode utf8_to_ucs2(char *buf); +static int screen_map_load(int fd, FILE * fp); int loadacm_main(int argc, char **argv) { @@ -51,7 +51,7 @@ int loadacm_main(int argc, char **argv) return EXIT_SUCCESS; } -int screen_map_load(int fd, FILE * fp) +static int screen_map_load(int fd, FILE * fp) { struct stat stbuf; unicode wbuf[E_TABSZ]; @@ -141,7 +141,7 @@ int screen_map_load(int fd, FILE * fp) * * FIXME: ignores everything after second word */ -int uni_screen_map_read_ascii(FILE * fp, unicode buf[], int *is_unicode) +static int uni_screen_map_read_ascii(FILE * fp, unicode buf[], int *is_unicode) { char buffer[256]; /* line buffer reading file */ char *p, *q; /* 1st + 2nd words in line */ @@ -213,7 +213,7 @@ int uni_screen_map_read_ascii(FILE * fp, unicode buf[], int *is_unicode) } -int old_screen_map_read_ascii(FILE * fp, unsigned char buf[]) +static int old_screen_map_read_ascii(FILE * fp, unsigned char buf[]) { char buffer[256]; int in, on; @@ -255,7 +255,7 @@ int old_screen_map_read_ascii(FILE * fp, unsigned char buf[]) * * CAVEAT: will report valid UTF mappings using only 1 byte as 8-bit ones. */ -long int ctoi(unsigned char *s, int *is_unicode) +static long int ctoi(unsigned char *s, int *is_unicode) { int i; size_t ls; @@ -302,42 +302,7 @@ long int ctoi(unsigned char *s, int *is_unicode) } -void saveoldmap(int fd, char *omfil) -{ - FILE *fp; - char buf[E_TABSZ]; - -#ifdef GIO_UNISCRNMAP - unicode xbuf[E_TABSZ]; - int is_old_map = 0; - - if (ioctl(fd, GIO_UNISCRNMAP, xbuf)) { - perror_msg("GIO_UNISCRNMAP ioctl error"); -#endif - if (ioctl(fd, GIO_SCRNMAP, buf)) - perror_msg_and_die("GIO_SCRNMAP ioctl error"); - else - is_old_map = 1; -#ifdef GIO_UNISCRNMAP - } -#endif - - fp = xfopen(omfil, "w"); -#ifdef GIO_UNISCRNMAP - if (is_old_map) { -#endif - if (fwrite(buf, E_TABSZ, 1, fp) != 1) - perror_msg_and_die("Error writing map to file"); -#ifdef GIO_UNISCRNMAP - } else if (fwrite(xbuf, sizeof(unicode) * E_TABSZ, 1, fp) != 1) { - perror_msg_and_die("Error writing map to file"); - } -#endif - - fclose(fp); -} - -unicode utf8_to_ucs2(char *buf) +static unicode utf8_to_ucs2(char *buf) { int utf_count = 0; long utf_char = 0; diff --git a/coreutils/expr.c b/coreutils/expr.c index 10aaa6be1..4a537bf33 100644 --- a/coreutils/expr.c +++ b/coreutils/expr.c @@ -225,7 +225,7 @@ int name (l, r) VALUE *l; VALUE *r; \ } #define arithdivf(name, op) \ -int name (l, r) VALUE *l; VALUE *r; \ +static int name (l, r) VALUE *l; VALUE *r; \ { \ if (!toarith (l) || !toarith (r)) \ error_msg_and_die ( "non-numeric argument"); \ diff --git a/coreutils/test.c b/coreutils/test.c index ab9c23e4b..79db8cbb6 100644 --- a/coreutils/test.c +++ b/coreutils/test.c @@ -110,10 +110,10 @@ enum token_types { PAREN }; -struct t_op { +static const struct t_op { const char *op_text; short op_num, op_type; -} const ops [] = { +} ops [] = { {"-r", FILRD, UNOP}, {"-w", FILWR, UNOP}, {"-x", FILEX, UNOP}, diff --git a/coreutils/usleep.c b/coreutils/usleep.c index 92e4437c5..6023bf430 100644 --- a/coreutils/usleep.c +++ b/coreutils/usleep.c @@ -21,6 +21,8 @@ * */ +/* getopt not needed */ + #include #include #include "busybox.h" diff --git a/expr.c b/expr.c index 10aaa6be1..4a537bf33 100644 --- a/expr.c +++ b/expr.c @@ -225,7 +225,7 @@ int name (l, r) VALUE *l; VALUE *r; \ } #define arithdivf(name, op) \ -int name (l, r) VALUE *l; VALUE *r; \ +static int name (l, r) VALUE *l; VALUE *r; \ { \ if (!toarith (l) || !toarith (r)) \ error_msg_and_die ( "non-numeric argument"); \ diff --git a/loadacm.c b/loadacm.c index 81b973b02..e5a29b6a1 100644 --- a/loadacm.c +++ b/loadacm.c @@ -24,10 +24,10 @@ typedef unsigned short unicode; static long int ctoi(unsigned char *s, int *is_unicode); -int old_screen_map_read_ascii(FILE * fp, unsigned char buf[]); -int uni_screen_map_read_ascii(FILE * fp, unicode buf[], int *is_unicode); -unicode utf8_to_ucs2(char *buf); -int screen_map_load(int fd, FILE * fp); +static int old_screen_map_read_ascii(FILE * fp, unsigned char buf[]); +static int uni_screen_map_read_ascii(FILE * fp, unicode buf[], int *is_unicode); +static unicode utf8_to_ucs2(char *buf); +static int screen_map_load(int fd, FILE * fp); int loadacm_main(int argc, char **argv) { @@ -51,7 +51,7 @@ int loadacm_main(int argc, char **argv) return EXIT_SUCCESS; } -int screen_map_load(int fd, FILE * fp) +static int screen_map_load(int fd, FILE * fp) { struct stat stbuf; unicode wbuf[E_TABSZ]; @@ -141,7 +141,7 @@ int screen_map_load(int fd, FILE * fp) * * FIXME: ignores everything after second word */ -int uni_screen_map_read_ascii(FILE * fp, unicode buf[], int *is_unicode) +static int uni_screen_map_read_ascii(FILE * fp, unicode buf[], int *is_unicode) { char buffer[256]; /* line buffer reading file */ char *p, *q; /* 1st + 2nd words in line */ @@ -213,7 +213,7 @@ int uni_screen_map_read_ascii(FILE * fp, unicode buf[], int *is_unicode) } -int old_screen_map_read_ascii(FILE * fp, unsigned char buf[]) +static int old_screen_map_read_ascii(FILE * fp, unsigned char buf[]) { char buffer[256]; int in, on; @@ -255,7 +255,7 @@ int old_screen_map_read_ascii(FILE * fp, unsigned char buf[]) * * CAVEAT: will report valid UTF mappings using only 1 byte as 8-bit ones. */ -long int ctoi(unsigned char *s, int *is_unicode) +static long int ctoi(unsigned char *s, int *is_unicode) { int i; size_t ls; @@ -302,42 +302,7 @@ long int ctoi(unsigned char *s, int *is_unicode) } -void saveoldmap(int fd, char *omfil) -{ - FILE *fp; - char buf[E_TABSZ]; - -#ifdef GIO_UNISCRNMAP - unicode xbuf[E_TABSZ]; - int is_old_map = 0; - - if (ioctl(fd, GIO_UNISCRNMAP, xbuf)) { - perror_msg("GIO_UNISCRNMAP ioctl error"); -#endif - if (ioctl(fd, GIO_SCRNMAP, buf)) - perror_msg_and_die("GIO_SCRNMAP ioctl error"); - else - is_old_map = 1; -#ifdef GIO_UNISCRNMAP - } -#endif - - fp = xfopen(omfil, "w"); -#ifdef GIO_UNISCRNMAP - if (is_old_map) { -#endif - if (fwrite(buf, E_TABSZ, 1, fp) != 1) - perror_msg_and_die("Error writing map to file"); -#ifdef GIO_UNISCRNMAP - } else if (fwrite(xbuf, sizeof(unicode) * E_TABSZ, 1, fp) != 1) { - perror_msg_and_die("Error writing map to file"); - } -#endif - - fclose(fp); -} - -unicode utf8_to_ucs2(char *buf) +static unicode utf8_to_ucs2(char *buf) { int utf_count = 0; long utf_char = 0; diff --git a/mkfs_minix.c b/mkfs_minix.c index a83fa7961..70374eae9 100644 --- a/mkfs_minix.c +++ b/mkfs_minix.c @@ -382,7 +382,7 @@ static void mark_good_blocks(void) mark_zone(good_blocks_table[blk]); } -inline int next(int zone) +static int next(int zone) { if (!zone) zone = FIRSTZONE - 1; diff --git a/networking/telnet.c b/networking/telnet.c index d47bf699b..edcc5081f 100644 --- a/networking/telnet.c +++ b/networking/telnet.c @@ -85,7 +85,7 @@ enum { typedef unsigned char byte; /* use globals to reduce size ??? */ /* test this hypothesis later */ -struct Globalvars { +static struct Globalvars { int netfd; /* console fd:s are 0 and 1 (and 2) */ /* same buffer used both for network and console read/write */ char * buf; /* allocating so static size is smaller */ @@ -108,7 +108,7 @@ struct Globalvars { struct Globalvars * Gptr; #define G (*Gptr) #else -struct Globalvars G; +static struct Globalvars G; #endif static inline void iacflush() diff --git a/shell/cmdedit.c b/shell/cmdedit.c index ffe7afab2..e317b86fa 100644 --- a/shell/cmdedit.c +++ b/shell/cmdedit.c @@ -113,7 +113,7 @@ void *xcalloc(size_t size, size_t se) } #define error_msg(s, d) fprintf(stderr, s, d) -#endif +#endif /* TEST */ struct history { diff --git a/telnet.c b/telnet.c index d47bf699b..edcc5081f 100644 --- a/telnet.c +++ b/telnet.c @@ -85,7 +85,7 @@ enum { typedef unsigned char byte; /* use globals to reduce size ??? */ /* test this hypothesis later */ -struct Globalvars { +static struct Globalvars { int netfd; /* console fd:s are 0 and 1 (and 2) */ /* same buffer used both for network and console read/write */ char * buf; /* allocating so static size is smaller */ @@ -108,7 +108,7 @@ struct Globalvars { struct Globalvars * Gptr; #define G (*Gptr) #else -struct Globalvars G; +static struct Globalvars G; #endif static inline void iacflush() diff --git a/test.c b/test.c index ab9c23e4b..79db8cbb6 100644 --- a/test.c +++ b/test.c @@ -110,10 +110,10 @@ enum token_types { PAREN }; -struct t_op { +static const struct t_op { const char *op_text; short op_num, op_type; -} const ops [] = { +} ops [] = { {"-r", FILRD, UNOP}, {"-w", FILWR, UNOP}, {"-x", FILEX, UNOP}, diff --git a/usleep.c b/usleep.c index 92e4437c5..6023bf430 100644 --- a/usleep.c +++ b/usleep.c @@ -21,6 +21,8 @@ * */ +/* getopt not needed */ + #include #include #include "busybox.h" diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c index a83fa7961..70374eae9 100644 --- a/util-linux/mkfs_minix.c +++ b/util-linux/mkfs_minix.c @@ -382,7 +382,7 @@ static void mark_good_blocks(void) mark_zone(good_blocks_table[blk]); } -inline int next(int zone) +static int next(int zone) { if (!zone) zone = FIRSTZONE - 1; -- cgit v1.2.3