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

random shrinkage of statics, -60 bytes saved

Browse Source
This commit is contained in:
Denis Vlasenko 2007-06-21 12:43:45 +00:00
parent a80b4a0fa7
commit 931de892cc
6 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.custom
View File

@ -67,6 +67,7 @@ sizes: busybox_unstripped
.PHONY: bloatcheck .PHONY: bloatcheck
bloatcheck: busybox_old busybox_unstripped bloatcheck: busybox_old busybox_unstripped
@$(srctree)/scripts/bloat-o-meter busybox_old busybox_unstripped @$(srctree)/scripts/bloat-o-meter busybox_old busybox_unstripped
@$(CROSS_COMPILE)size busybox_old busybox_unstripped
.PHONY: baseline .PHONY: baseline
baseline: busybox_unstripped baseline: busybox_unstripped

4
Makefile.flags
View File

@ -79,6 +79,6 @@ SKIP_STRIP = y
endif endif
# Busybox is a stack-fatty so make sure we increase default size # Busybox is a stack-fatty so make sure we increase default size
# TODO: use "make stksizes" to find & fix big stack users; should # TODO: use "make stksizes" to find & fix big stack users
# just steal scripts/checkstack.pl from the kernel ... # (we stole scripts/checkstack.pl from the kernel... thanks guys!)
FLTFLAGS += -s 20000 FLTFLAGS += -s 20000

6
archival/tar.c
View File

@ -417,11 +417,11 @@ static int writeFileToTarball(const char *fileName, struct stat *statbuf,
header_name = fileName; header_name = fileName;
while (header_name[0] == '/') { while (header_name[0] == '/') {
static int alreadyWarned = FALSE; static smallint warned;
if (alreadyWarned == FALSE) { if (!warned) {
bb_error_msg("removing leading '/' from member names"); bb_error_msg("removing leading '/' from member names");
alreadyWarned = TRUE; warned = 1;
} }
header_name++; header_name++;
} }

7
coreutils/fold.c
View File

@ -41,6 +41,8 @@ static int adjust_column(int column, char c)
int fold_main(int argc, char **argv); int fold_main(int argc, char **argv);
int fold_main(int argc, char **argv) int fold_main(int argc, char **argv)
{ {
char *line_out = NULL;
int allocated_out = 0;
char *w_opt; char *w_opt;
int width = 80; int width = 80;
int i; int i;
@ -75,8 +77,6 @@ int fold_main(int argc, char **argv)
int c; int c;
int column = 0; /* Screen column where next char will go. */ int column = 0; /* Screen column where next char will go. */
int offset_out = 0; /* Index in `line_out' for next char. */ int offset_out = 0; /* Index in `line_out' for next char. */
static char *line_out = NULL;
static int allocated_out = 0;
if (istream == NULL) { if (istream == NULL) {
errs |= EXIT_FAILURE; errs |= EXIT_FAILURE;
@ -95,8 +95,7 @@ int fold_main(int argc, char **argv)
column = offset_out = 0; column = offset_out = 0;
continue; continue;
} }
rescan:
rescan:
column = adjust_column(column, c); column = adjust_column(column, c);
if (column > width) { if (column > width) {

16
libbb/dump.c
View File

@ -317,7 +317,8 @@ static void do_skip(const char *fname, int statok)
static int next(char **argv) static int next(char **argv)
{ {
static int done; static smallint done;
int statok; int statok;
if (argv) { if (argv) {
@ -332,10 +333,11 @@ static int next(char **argv)
++_argv; ++_argv;
continue; continue;
} }
statok = done = 1; done = statok = 1;
} else { } else {
if (done++) if (done)
return 0; return 0;
done = 1;
statok = 0; statok = 0;
} }
if (bb_dump_skip) if (bb_dump_skip)
@ -350,8 +352,9 @@ static int next(char **argv)
static unsigned char *get(void) static unsigned char *get(void)
{ {
static int ateof = 1; static smallint ateof = 1;
static unsigned char *curp=NULL, *savp; /*DBU:[dave@cray.com]initialize curp */ static unsigned char *curp = NULL, *savp; /*DBU:[dave@cray.com]initialize curp */
int n; int n;
int need, nread; int need, nread;
unsigned char *tmpp; unsigned char *tmpp;
@ -399,7 +402,8 @@ static unsigned char *get(void)
if (bb_dump_length != -1) { if (bb_dump_length != -1) {
bb_dump_length -= n; bb_dump_length -= n;
} }
if (!(need -= n)) { need -= n;
if (!need) {
if (bb_dump_vflag == ALL || bb_dump_vflag == FIRST if (bb_dump_vflag == ALL || bb_dump_vflag == FIRST
|| memcmp(curp, savp, bb_dump_blocksize)) { || memcmp(curp, savp, bb_dump_blocksize)) {
if (bb_dump_vflag == DUP || bb_dump_vflag == FIRST) { if (bb_dump_vflag == DUP || bb_dump_vflag == FIRST) {

8
modutils/insmod.c
View File

@ -3656,16 +3656,18 @@ static int obj_gpl_license(struct obj_file *f, const char **license)
static void set_tainted(struct obj_file *f, int fd, char *m_name, static void set_tainted(struct obj_file *f, int fd, char *m_name,
int kernel_has_tainted, int taint, const char *text1, const char *text2) int kernel_has_tainted, int taint, const char *text1, const char *text2)
{ {
static smallint printed_info;
char buf[80]; char buf[80];
int oldval; int oldval;
static int first = 1;
if (fd < 0 && !kernel_has_tainted) if (fd < 0 && !kernel_has_tainted)
return; /* New modutils on old kernel */ return; /* New modutils on old kernel */
printf("Warning: loading %s will taint the kernel: %s%s\n", printf("Warning: loading %s will taint the kernel: %s%s\n",
m_name, text1, text2); m_name, text1, text2);
if (first) { if (!printed_info) {
printf(" See %s for information about tainted modules\n", TAINT_URL); printf(" See %s for information about tainted modules\n", TAINT_URL);
first = 0; printed_info = 1;
} }
if (fd >= 0) { if (fd >= 0) {
read(fd, buf, sizeof(buf)-1); read(fd, buf, sizeof(buf)-1);