summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDenis Vlasenko2008-07-16 07:22:14 +0000
committerDenis Vlasenko2008-07-16 07:22:14 +0000
commitbd9874db7485e827a2b9af6d7066c02692cef46d (patch)
treefef8728a85fef7666676a3e94b165f0d9c476ced /include
parent018bee6afb0a7b9e09616a52f2f24f65fcf07322 (diff)
downloadbusybox-bd9874db7485e827a2b9af6d7066c02692cef46d.zip
busybox-bd9874db7485e827a2b9af6d7066c02692cef46d.tar.gz
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.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/include/dump.h b/include/dump.h
index a060c14..da3e66d 100644
--- a/include/dump.h
+++ b/include/dump.h
@@ -22,7 +22,7 @@ enum _vflag { ALL, DUP, FIRST, WAIT }; /* -v values */
typedef struct _pr {
struct _pr *nextpr; /* next print unit */
- unsigned int flags; /* flag values */
+ unsigned flags; /* flag values */
int bcnt; /* byte count */
char *cchar; /* conversion character */
char *fmt; /* printf format */
@@ -32,7 +32,7 @@ typedef struct _pr {
typedef struct _fu {
struct _fu *nextfu; /* next format unit */
struct _pr *nextpr; /* next print unit */
- unsigned int flags; /* flag values */
+ unsigned flags; /* flag values */
int reps; /* repetition count */
int bcnt; /* byte count */
char *fmt; /* format string */
@@ -48,11 +48,11 @@ extern void bb_dump_add(const char *fmt) FAST_FUNC;
extern int bb_dump_dump(char **argv) FAST_FUNC;
extern int bb_dump_size(FS * fs) FAST_FUNC;
-extern FS *bb_dump_fshead; /* head of format strings */
-extern int bb_dump_blocksize; /* data block size */
-extern int bb_dump_length; /* max bytes to read */
-extern enum _vflag bb_dump_vflag;
-extern off_t bb_dump_skip; /* bytes to skip */
+extern FS *bb_dump_fshead; /* head of format strings */
+extern int bb_dump_blocksize; /* data block size */
+extern int bb_dump_length; /* max bytes to read */
+extern smallint /*enum _vflag*/ bb_dump_vflag;
+extern off_t bb_dump_skip; /* bytes to skip */
#if __GNUC_PREREQ(4,1)
# pragma GCC visibility pop