diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-16 07:22:14 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-16 07:22:14 +0000 |
| commit | bd9874db7485e827a2b9af6d7066c02692cef46d (patch) | |
| tree | fef8728a85fef7666676a3e94b165f0d9c476ced /include | |
| parent | 018bee6afb0a7b9e09616a52f2f24f65fcf07322 (diff) | |
| download | busybox-w32-bd9874db7485e827a2b9af6d7066c02692cef46d.tar.gz busybox-w32-bd9874db7485e827a2b9af6d7066c02692cef46d.tar.bz2 busybox-w32-bd9874db7485e827a2b9af6d7066c02692cef46d.zip | |
od,hexdump: fix bug where xrealloc may move pointer,
leaving other pointers dangling (bug 4104).
+ many style fixes in libbb/dump.c.
Diffstat (limited to 'include')
| -rw-r--r-- | include/dump.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/dump.h b/include/dump.h index a060c1479..da3e66da9 100644 --- a/include/dump.h +++ b/include/dump.h | |||
| @@ -22,7 +22,7 @@ enum _vflag { 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 int 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 */ |
| 28 | char *fmt; /* printf format */ | 28 | char *fmt; /* printf format */ |
| @@ -32,7 +32,7 @@ typedef struct _pr { | |||
| 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 int 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 */ |
| @@ -48,11 +48,11 @@ extern void bb_dump_add(const char *fmt) FAST_FUNC; | |||
| 48 | extern int bb_dump_dump(char **argv) FAST_FUNC; | 48 | extern int bb_dump_dump(char **argv) FAST_FUNC; |
| 49 | extern int bb_dump_size(FS * fs) FAST_FUNC; | 49 | extern int bb_dump_size(FS * fs) FAST_FUNC; |
| 50 | 50 | ||
| 51 | extern FS *bb_dump_fshead; /* head of format strings */ | 51 | extern FS *bb_dump_fshead; /* head of format strings */ |
| 52 | extern int bb_dump_blocksize; /* data block size */ | 52 | extern int bb_dump_blocksize; /* data block size */ |
| 53 | extern int bb_dump_length; /* max bytes to read */ | 53 | extern int bb_dump_length; /* max bytes to read */ |
| 54 | extern enum _vflag bb_dump_vflag; | 54 | extern smallint /*enum _vflag*/ bb_dump_vflag; |
| 55 | extern off_t bb_dump_skip; /* bytes to skip */ | 55 | extern off_t bb_dump_skip; /* bytes to skip */ |
| 56 | 56 | ||
| 57 | #if __GNUC_PREREQ(4,1) | 57 | #if __GNUC_PREREQ(4,1) |
| 58 | # pragma GCC visibility pop | 58 | # pragma GCC visibility pop |