emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup of duplicated symbols -- found by compiling with

Browse Source 
LDFLAGS += -Wl,-warn-common
This commit is contained in:
Eric Andersen 2000-11-07 06:52:13 +00:00
parent eb69ead091
commit 63a862272c
8 changed files with 72 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
archival/gunzip.c
View File

@ -155,32 +155,28 @@ typedef unsigned short ush;
typedef unsigned long ulg; typedef unsigned long ulg;
typedef int file_t; /* Do not use stdio */ typedef int file_t; /* Do not use stdio */
uch *inbuf; static uch *inbuf;
uch *outbuf; static uch *outbuf;
ush *d_buf; static ush *d_buf;
uch *window; static uch *window;
ush *tab_prefix0; static ush *tab_prefix0;
ush *tab_prefix1; static ush *tab_prefix1;
/* local variables */ /* local variables */
int test_mode = 0; /* check file integrity option */ static int test_mode = 0; /* check file integrity option */
int foreground; /* set if program run in foreground */ static int foreground; /* set if program run in foreground */
int maxbits = BITS; /* max bits per code for LZW */ static int method = DEFLATED; /* compression method */
int method = DEFLATED; /* compression method */ static int exit_code = OK; /* program exit code */
int exit_code = OK; /* program exit code */ static int last_member; /* set for .zip and .Z files */
int last_member; /* set for .zip and .Z files */ static int part_nb; /* number of parts in .gz file */
int part_nb; /* number of parts in .gz file */ static long ifile_size; /* input file size, -1 for devices (debug only) */
long ifile_size; /* input file size, -1 for devices (debug only) */ static long bytes_in; /* number of input bytes */
long bytes_in; /* number of input bytes */ static long bytes_out; /* number of output bytes */
long bytes_out; /* number of output bytes */ static int ifd; /* input file descriptor */
long total_in = 0; /* input bytes for all files */ static int ofd; /* output file descriptor */
long total_out = 0; /* output bytes for all files */ static unsigned insize; /* valid bytes in inbuf */
struct stat istat; /* status for input file */ static unsigned inptr; /* index of next byte to be processed in inbuf */
int ifd; /* input file descriptor */ static unsigned outcnt; /* bytes in output buffer */
int ofd; /* output file descriptor */
unsigned insize; /* valid bytes in inbuf */
unsigned inptr; /* index of next byte to be processed in inbuf */
unsigned outcnt; /* bytes in output buffer */
unsigned hufts; /* track memory usage */ unsigned hufts; /* track memory usage */
ulg bb; /* bit buffer */ ulg bb; /* bit buffer */

39
archival/gzip.c
View File

@ -1754,34 +1754,23 @@ DECLARE(ush, tab_prefix1, 1L << (BITS - 1));
/* local variables */ /* local variables */
int ascii = 0; /* convert end-of-lines to local OS conventions */ static int foreground; /* set if program run in foreground */
int decompress = 0; /* decompress (-d) */
int no_name = -1; /* don't save or restore the original file name */
int no_time = -1; /* don't save or restore the original file time */
int foreground; /* set if program run in foreground */
char *progname; /* program name */
static int method = DEFLATED; /* compression method */ static int method = DEFLATED; /* compression method */
static int exit_code = OK; /* program exit code */ static int exit_code = OK; /* program exit code */
int save_orig_name; /* set if original name must be saved */ static int part_nb; /* number of parts in .gz file */
int last_member; /* set for .zip and .Z files */ static long time_stamp; /* original time stamp (modification time) */
int part_nb; /* number of parts in .gz file */ static long ifile_size; /* input file size, -1 for devices (debug only) */
long time_stamp; /* original time stamp (modification time) */ static char z_suffix[MAX_SUFFIX + 1]; /* default suffix (can be set with --suffix) */
long ifile_size; /* input file size, -1 for devices (debug only) */ static int z_len; /* strlen(z_suffix) */
char *env; /* contents of GZIP env variable */
char z_suffix[MAX_SUFFIX + 1]; /* default suffix (can be set with --suffix) */
int z_len; /* strlen(z_suffix) */
long bytes_in; /* number of input bytes */ static long bytes_in; /* number of input bytes */
long bytes_out; /* number of output bytes */ static long bytes_out; /* number of output bytes */
char ifname[MAX_PATH_LEN]; /* input file name */ static char ifname[MAX_PATH_LEN]; /* input file name */
char ofname[MAX_PATH_LEN]; /* output file name */ static char ofname[MAX_PATH_LEN]; /* output file name */
int remove_ofname = 0; /* remove output file on error */ static int ifd; /* input file descriptor */
struct stat istat; /* status for input file */ static int ofd; /* output file descriptor */
int ifd; /* input file descriptor */ static unsigned insize; /* valid bytes in inbuf */
int ofd; /* output file descriptor */ static unsigned outcnt; /* bytes in output buffer */
unsigned insize; /* valid bytes in inbuf */
unsigned inptr; /* index of next byte to be processed in inbuf */
unsigned outcnt; /* bytes in output buffer */
/* local functions */ /* local functions */

2
cmdedit.c
View File

@ -69,7 +69,7 @@ static struct history *his_end = NULL; /* Last element in command line list */
#endif #endif
/* Current termio and the previous termio before starting sh */ /* Current termio and the previous termio before starting sh */
struct termios initial_settings, new_settings; static struct termios initial_settings, new_settings;
#ifndef _POSIX_VDISABLE #ifndef _POSIX_VDISABLE

44
gunzip.c
View File

@ -155,32 +155,28 @@ typedef unsigned short ush;
typedef unsigned long ulg; typedef unsigned long ulg;
typedef int file_t; /* Do not use stdio */ typedef int file_t; /* Do not use stdio */
uch *inbuf; static uch *inbuf;
uch *outbuf; static uch *outbuf;
ush *d_buf; static ush *d_buf;
uch *window; static uch *window;
ush *tab_prefix0; static ush *tab_prefix0;
ush *tab_prefix1; static ush *tab_prefix1;
/* local variables */ /* local variables */
int test_mode = 0; /* check file integrity option */ static int test_mode = 0; /* check file integrity option */
int foreground; /* set if program run in foreground */ static int foreground; /* set if program run in foreground */
int maxbits = BITS; /* max bits per code for LZW */ static int method = DEFLATED; /* compression method */
int method = DEFLATED; /* compression method */ static int exit_code = OK; /* program exit code */
int exit_code = OK; /* program exit code */ static int last_member; /* set for .zip and .Z files */
int last_member; /* set for .zip and .Z files */ static int part_nb; /* number of parts in .gz file */
int part_nb; /* number of parts in .gz file */ static long ifile_size; /* input file size, -1 for devices (debug only) */
long ifile_size; /* input file size, -1 for devices (debug only) */ static long bytes_in; /* number of input bytes */
long bytes_in; /* number of input bytes */ static long bytes_out; /* number of output bytes */
long bytes_out; /* number of output bytes */ static int ifd; /* input file descriptor */
long total_in = 0; /* input bytes for all files */ static int ofd; /* output file descriptor */
long total_out = 0; /* output bytes for all files */ static unsigned insize; /* valid bytes in inbuf */
struct stat istat; /* status for input file */ static unsigned inptr; /* index of next byte to be processed in inbuf */
int ifd; /* input file descriptor */ static unsigned outcnt; /* bytes in output buffer */
int ofd; /* output file descriptor */
unsigned insize; /* valid bytes in inbuf */
unsigned inptr; /* index of next byte to be processed in inbuf */
unsigned outcnt; /* bytes in output buffer */
unsigned hufts; /* track memory usage */ unsigned hufts; /* track memory usage */
ulg bb; /* bit buffer */ ulg bb; /* bit buffer */

39
gzip.c
View File

@ -1754,34 +1754,23 @@ DECLARE(ush, tab_prefix1, 1L << (BITS - 1));
/* local variables */ /* local variables */
int ascii = 0; /* convert end-of-lines to local OS conventions */ static int foreground; /* set if program run in foreground */
int decompress = 0; /* decompress (-d) */
int no_name = -1; /* don't save or restore the original file name */
int no_time = -1; /* don't save or restore the original file time */
int foreground; /* set if program run in foreground */
char *progname; /* program name */
static int method = DEFLATED; /* compression method */ static int method = DEFLATED; /* compression method */
static int exit_code = OK; /* program exit code */ static int exit_code = OK; /* program exit code */
int save_orig_name; /* set if original name must be saved */ static int part_nb; /* number of parts in .gz file */
int last_member; /* set for .zip and .Z files */ static long time_stamp; /* original time stamp (modification time) */
int part_nb; /* number of parts in .gz file */ static long ifile_size; /* input file size, -1 for devices (debug only) */
long time_stamp; /* original time stamp (modification time) */ static char z_suffix[MAX_SUFFIX + 1]; /* default suffix (can be set with --suffix) */
long ifile_size; /* input file size, -1 for devices (debug only) */ static int z_len; /* strlen(z_suffix) */
char *env; /* contents of GZIP env variable */
char z_suffix[MAX_SUFFIX + 1]; /* default suffix (can be set with --suffix) */
int z_len; /* strlen(z_suffix) */
long bytes_in; /* number of input bytes */ static long bytes_in; /* number of input bytes */
long bytes_out; /* number of output bytes */ static long bytes_out; /* number of output bytes */
char ifname[MAX_PATH_LEN]; /* input file name */ static char ifname[MAX_PATH_LEN]; /* input file name */
char ofname[MAX_PATH_LEN]; /* output file name */ static char ofname[MAX_PATH_LEN]; /* output file name */
int remove_ofname = 0; /* remove output file on error */ static int ifd; /* input file descriptor */
struct stat istat; /* status for input file */ static int ofd; /* output file descriptor */
int ifd; /* input file descriptor */ static unsigned insize; /* valid bytes in inbuf */
int ofd; /* output file descriptor */ static unsigned outcnt; /* bytes in output buffer */
unsigned insize; /* valid bytes in inbuf */
unsigned inptr; /* index of next byte to be processed in inbuf */
unsigned outcnt; /* bytes in output buffer */
/* local functions */ /* local functions */

2
more.c
View File

@ -49,7 +49,7 @@
FILE *cin; FILE *cin;
struct termios initial_settings, new_settings; static struct termios initial_settings, new_settings;
void gotsig(int sig) void gotsig(int sig)
{ {

2
shell/cmdedit.c
View File

@ -69,7 +69,7 @@ static struct history *his_end = NULL; /* Last element in command line list */
#endif #endif
/* Current termio and the previous termio before starting sh */ /* Current termio and the previous termio before starting sh */
struct termios initial_settings, new_settings; static struct termios initial_settings, new_settings;
#ifndef _POSIX_VDISABLE #ifndef _POSIX_VDISABLE

2
util-linux/more.c
View File

@ -49,7 +49,7 @@
FILE *cin; FILE *cin;
struct termios initial_settings, new_settings; static struct termios initial_settings, new_settings;
void gotsig(int sig) void gotsig(int sig)
{ {