summaryrefslogtreecommitdiffstats
path: root/text-utils/parse.c
diff options
context:
space:
mode:
authorOndrej Oprala2013-09-23 15:39:17 +0200
committerKarel Zak2013-11-08 12:54:52 +0100
commitdabfe2ad7cecaa90a492811f4a95faba726d218f (patch)
treef568f4ed2e6618a31862a1ae465c0013da53f1c7 /text-utils/parse.c
parenthexdump: rewrite escape() (diff)
downloadkernel-qcow2-util-linux-dabfe2ad7cecaa90a492811f4a95faba726d218f.tar.gz
kernel-qcow2-util-linux-dabfe2ad7cecaa90a492811f4a95faba726d218f.tar.xz
kernel-qcow2-util-linux-dabfe2ad7cecaa90a492811f4a95faba726d218f.zip
hexdump: rewrite() formatting improvements
Signed-off-by: Ondrej Oprala <ooprala@redhat.com>
Diffstat (limited to 'text-utils/parse.c')
-rw-r--r--text-utils/parse.c57
1 files changed, 28 insertions, 29 deletions
diff --git a/text-utils/parse.c b/text-utils/parse.c
index 90c600375..544af8799 100644
--- a/text-utils/parse.c
+++ b/text-utils/parse.c
@@ -268,11 +268,10 @@ void rewrite(FS *fs)
/* skip any special chars, field width */
while (strchr(spec + 1, *++p1))
;
- if (*p1 == '.' &&
- isdigit((unsigned char)*++p1)) {
+ if (*p1 == '.' && isdigit(*++p1)) {
sokay = USEPREC;
prec = atoi(p1);
- while (isdigit((unsigned char)*++p1))
+ while (isdigit(*++p1))
;
} else
sokay = NOTOKAY;
@@ -313,18 +312,18 @@ void rewrite(FS *fs)
cs[1] = cs[0];
cs[0] = 'q';
switch(fu->bcnt) {
- case 0:
- pr->bcnt = 4;
- break;
- case 1:
- case 2:
- case 4:
- case 8:
- pr->bcnt = fu->bcnt;
- break;
- default:
- p1[1] = '\0';
- badcnt(p1);
+ case 0:
+ pr->bcnt = 4;
+ break;
+ case 1:
+ case 2:
+ case 4:
+ case 8:
+ pr->bcnt = fu->bcnt;
+ break;
+ default:
+ p1[1] = '\0';
+ badcnt(p1);
}
break;
case 'e':
@@ -334,16 +333,16 @@ void rewrite(FS *fs)
case 'G':
pr->flags = F_DBL;
switch(fu->bcnt) {
- case 0:
- pr->bcnt = 8;
- break;
- case 4:
- case 8:
- pr->bcnt = fu->bcnt;
- break;
- default:
- p1[1] = '\0';
- badcnt(p1);
+ case 0:
+ pr->bcnt = 8;
+ break;
+ case 4:
+ case 8:
+ pr->bcnt = fu->bcnt;
+ break;
+ default:
+ p1[1] = '\0';
+ badcnt(p1);
}
break;
case 's':
@@ -456,10 +455,10 @@ void rewrite(FS *fs)
if (fu->reps > 1) {
if (!list_empty(&fu->nextpr)) {
pr = list_last_entry(&fu->nextpr, PR, nextpr);
- for (p1 = pr->fmt, p2 = NULL; *p1; ++p1)
- p2 = isspace(*p1) ? p1 : NULL;
- if (p2)
- pr->nospace = p2;
+ for (p1 = pr->fmt, p2 = NULL; *p1; ++p1)
+ p2 = isspace(*p1) ? p1 : NULL;
+ if (p2)
+ pr->nospace = p2;
}
}
}