diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-16 11:00:16 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-16 11:00:16 +0000 |
| commit | 55f7912ddaea7c21068a48841a6eb933e5f286ee (patch) | |
| tree | 8e048772811061a8db2429c3ef99e8205e1de1f6 /include | |
| parent | 8ddb6410edb0c4e87b4c6b9d0887868977c8eff5 (diff) | |
| download | busybox-w32-55f7912ddaea7c21068a48841a6eb933e5f286ee.tar.gz busybox-w32-55f7912ddaea7c21068a48841a6eb933e5f286ee.tar.bz2 busybox-w32-55f7912ddaea7c21068a48841a6eb933e5f286ee.zip | |
libbb: get rid of statics in dump.c; code shrinks a lot too
function old new delta
alloc_dumper - 26 +26
hexdump_main 600 601 +1
static.done 1 - -1
static.ateof 1 - -1
bb_dump_vflag 1 - -1
static.savp 4 - -4
static.nextfs 4 - -4
static.curp 4 - -4
exitval 4 - -4
endfu 4 - -4
bb_dump_length 4 - -4
bb_dump_fshead 4 - -4
bb_dump_blocksize 4 - -4
_argv 4 - -4
bb_dump_add 365 358 -7
savaddress 8 - -8
eaddress 8 - -8
bb_dump_skip 8 - -8
address 8 - -8
bb_dump_dump 2748 2672 -76
next 538 445 -93
------------------------------------------------------------------------------
(add/remove: 1/16 grow/shrink: 1/3 up/down: 27/-247) Total: -220 bytes
text data bss dec hex filename
789458 607 6764 796829 c289d busybox_old
789309 601 6696 796606 c27be busybox_unstripped
Diffstat (limited to 'include')
| -rw-r--r-- | include/dump.h | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/include/dump.h b/include/dump.h index da3e66da9..44f2082b7 100644 --- a/include/dump.h +++ b/include/dump.h | |||
| @@ -18,10 +18,10 @@ | |||
| 18 | #define F_UINT 0x200 /* %[ouXx] */ | 18 | #define F_UINT 0x200 /* %[ouXx] */ |
| 19 | #define F_TEXT 0x400 /* no conversions */ | 19 | #define F_TEXT 0x400 /* no conversions */ |
| 20 | 20 | ||
| 21 | enum _vflag { ALL, DUP, FIRST, WAIT }; /* -v values */ | 21 | enum dump_vflag_t { ALL, DUP, FIRST, WAIT }; /* -v values */ |
| 22 | 22 | ||
| 23 | typedef struct _pr { | 23 | typedef struct PR { |
| 24 | struct _pr *nextpr; /* next print unit */ | 24 | struct PR *nextpr; /* next print unit */ |
| 25 | unsigned flags; /* flag values */ | 25 | unsigned flags; /* flag values */ |
| 26 | int bcnt; /* byte count */ | 26 | int bcnt; /* byte count */ |
| 27 | char *cchar; /* conversion character */ | 27 | char *cchar; /* conversion character */ |
| @@ -29,30 +29,31 @@ typedef struct _pr { | |||
| 29 | char *nospace; /* no whitespace version */ | 29 | char *nospace; /* no whitespace version */ |
| 30 | } PR; | 30 | } PR; |
| 31 | 31 | ||
| 32 | typedef struct _fu { | 32 | typedef struct FU { |
| 33 | struct _fu *nextfu; /* next format unit */ | 33 | struct FU *nextfu; /* next format unit */ |
| 34 | struct _pr *nextpr; /* next print unit */ | 34 | struct PR *nextpr; /* next print unit */ |
| 35 | unsigned flags; /* flag values */ | 35 | unsigned flags; /* flag values */ |
| 36 | int reps; /* repetition count */ | 36 | int reps; /* repetition count */ |
| 37 | int bcnt; /* byte count */ | 37 | int bcnt; /* byte count */ |
| 38 | char *fmt; /* format string */ | 38 | char *fmt; /* format string */ |
| 39 | } FU; | 39 | } FU; |
| 40 | 40 | ||
| 41 | typedef struct _fs { /* format strings */ | 41 | typedef struct FS { /* format strings */ |
| 42 | struct _fs *nextfs; /* linked list of format strings */ | 42 | struct FS *nextfs; /* linked list of format strings */ |
| 43 | struct _fu *nextfu; /* linked list of format units */ | 43 | struct FU *nextfu; /* linked list of format units */ |
| 44 | int bcnt; | 44 | int bcnt; |
| 45 | } FS; | 45 | } FS; |
| 46 | 46 | ||
| 47 | extern void bb_dump_add(const char *fmt) FAST_FUNC; | 47 | typedef struct dumper_t { |
| 48 | extern int bb_dump_dump(char **argv) FAST_FUNC; | 48 | off_t dump_skip; /* bytes to skip */ |
| 49 | extern int bb_dump_size(FS * fs) FAST_FUNC; | 49 | int dump_length; /* max bytes to read */ |
| 50 | smallint dump_vflag; /*enum dump_vflag_t*/ | ||
| 51 | FS *fshead; | ||
| 52 | } dumper_t; | ||
| 50 | 53 | ||
| 51 | extern FS *bb_dump_fshead; /* head of format strings */ | 54 | dumper_t* alloc_dumper(void) FAST_FUNC; |
| 52 | extern int bb_dump_blocksize; /* data block size */ | 55 | extern void bb_dump_add(dumper_t *dumper, const char *fmt) FAST_FUNC; |
| 53 | extern int bb_dump_length; /* max bytes to read */ | 56 | extern int bb_dump_dump(dumper_t *dumper, char **argv) FAST_FUNC; |
| 54 | extern smallint /*enum _vflag*/ bb_dump_vflag; | ||
| 55 | extern off_t bb_dump_skip; /* bytes to skip */ | ||
| 56 | 57 | ||
| 57 | #if __GNUC_PREREQ(4,1) | 58 | #if __GNUC_PREREQ(4,1) |
| 58 | # pragma GCC visibility pop | 59 | # pragma GCC visibility pop |