diff options
| -rw-r--r-- | include/dump.h | 24 | ||||
| -rw-r--r-- | libbb/dump.c | 24 |
2 files changed, 23 insertions, 25 deletions
diff --git a/include/dump.h b/include/dump.h index f4759c193..9193a6925 100644 --- a/include/dump.h +++ b/include/dump.h @@ -4,7 +4,29 @@ PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN enum dump_vflag_t { ALL, DUP, FIRST, WAIT }; /* -v values */ -typedef struct FS FS; +typedef struct PR { + struct PR *nextpr; /* next print unit */ + unsigned flags; /* flag values */ + int bcnt; /* byte count */ + char *cchar; /* conversion character */ + char *fmt; /* printf format */ + char *nospace; /* no whitespace version */ +} PR; + +typedef struct FU { + struct FU *nextfu; /* next format unit */ + struct PR *nextpr; /* next print unit */ + unsigned flags; /* flag values */ + int reps; /* repetition count */ + int bcnt; /* byte count */ + char *fmt; /* format string */ +} FU; + +typedef struct FS { /* format strings */ + struct FS *nextfs; /* linked list of format strings */ + struct FU *nextfu; /* linked list of format units */ + int bcnt; +} FS; typedef struct dumper_t { off_t dump_skip; /* bytes to skip */ diff --git a/libbb/dump.c b/libbb/dump.c index 7a07d6605..1ba1132b3 100644 --- a/libbb/dump.c +++ b/libbb/dump.c @@ -27,30 +27,6 @@ #define F_UINT 0x200 /* %[ouXx] */ #define F_TEXT 0x400 /* no conversions */ -typedef struct PR { - struct PR *nextpr; /* next print unit */ - unsigned flags; /* flag values */ - int bcnt; /* byte count */ - char *cchar; /* conversion character */ - char *fmt; /* printf format */ - char *nospace; /* no whitespace version */ -} PR; - -typedef struct FU { - struct FU *nextfu; /* next format unit */ - struct PR *nextpr; /* next print unit */ - unsigned flags; /* flag values */ - int reps; /* repetition count */ - int bcnt; /* byte count */ - char *fmt; /* format string */ -} FU; - -typedef struct FS { /* format strings */ - struct FS *nextfs; /* linked list of format strings */ - struct FU *nextfu; /* linked list of format units */ - int bcnt; -} FS; - typedef struct priv_dumper_t { dumper_t pub; |