diff options
| author | Ondrej Oprala | 2013-11-08 17:13:10 +0100 |
|---|---|---|
| committer | Karel Zak | 2013-12-02 13:44:21 +0100 |
| commit | 4c73d29c06a858d5cbbe314df570ac03695fae3f (patch) | |
| tree | c75ed8f65277e43d637faedd77bde5c741b31b24 /text-utils/hexdump-parse.c | |
| parent | hexdump: rename rewrite to rewrite_rules (diff) | |
| download | kernel-qcow2-util-linux-4c73d29c06a858d5cbbe314df570ac03695fae3f.tar.gz kernel-qcow2-util-linux-4c73d29c06a858d5cbbe314df570ac03695fae3f.tar.xz kernel-qcow2-util-linux-4c73d29c06a858d5cbbe314df570ac03695fae3f.zip | |
hexdump: Rename struct _pr to struct hexdump_pr and remove it's typedef
Signed-off-by: Ondrej Oprala <ooprala@redhat.com>
Diffstat (limited to 'text-utils/hexdump-parse.c')
| -rw-r--r-- | text-utils/hexdump-parse.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/text-utils/hexdump-parse.c b/text-utils/hexdump-parse.c index 31a82e3ca..38c45131b 100644 --- a/text-utils/hexdump-parse.c +++ b/text-utils/hexdump-parse.c @@ -204,7 +204,7 @@ int block_size(FS *fs) void rewrite_rules(FS *fs) { enum { NOTOKAY, USEBCNT, USEPREC } sokay; - PR *pr; + struct hexdump_pr *pr; FU *fu; struct list_head *p, *q; char *p1, *p2, *fmtp; @@ -220,7 +220,7 @@ void rewrite_rules(FS *fs) nconv = 0; fmtp = fu->fmt; while (*fmtp) { - pr = xcalloc(1, sizeof(PR)); + pr = xcalloc(1, sizeof(struct hexdump_pr)); INIT_LIST_HEAD(&pr->prlist); list_add_tail(&pr->prlist, &fu->prlist); @@ -376,7 +376,7 @@ isint: cs[2] = '\0'; } /* - * Copy to PR format string, set conversion character + * Copy to hexdump_pr format string, set conversion character * pointer, update original. */ savech = *p2; @@ -399,7 +399,8 @@ isint: cs[2] = '\0'; */ if (!fu->bcnt) list_for_each(q, &fu->prlist) - fu->bcnt += (list_entry(q, PR, prlist))->bcnt; + fu->bcnt + += (list_entry(q, struct hexdump_pr, prlist))->bcnt; } /* * If the format string interprets any data at all, and it's @@ -419,7 +420,8 @@ isint: cs[2] = '\0'; fu->reps += (blocksize - fs->bcnt) / fu->bcnt; if (fu->reps > 1) { if (!list_empty(&fu->prlist)) { - pr = list_last_entry(&fu->prlist, PR, prlist); + pr = list_last_entry(&fu->prlist, + struct hexdump_pr, prlist); for (p1 = pr->fmt, p2 = NULL; *p1; ++p1) p2 = isspace(*p1) ? p1 : NULL; if (p2) |