From 930cf5e1891b7f1f00902856a275e266fafe97b8 Mon Sep 17 00:00:00 2001 From: Eitan Adler Date: Sat, 6 Jan 2018 21:21:56 -0800 Subject: [PATCH] xtr(1) clean up - clean usage of comma operator - use char instead of int - add brackets Reviewed-by: dillon --- usr.bin/xstr/xstr.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/usr.bin/xstr/xstr.c b/usr.bin/xstr/xstr.c index 14814d7b95..6199972052 100644 --- a/usr.bin/xstr/xstr.c +++ b/usr.bin/xstr/xstr.c @@ -125,10 +125,13 @@ main(int argc, char *argv[]) if (!readstd && freopen(argv[0], "r", stdin) == NULL) err(2, "%s", argv[0]); process("x.c"); - if (readstd == 0) - argc--, argv++; - else + if (readstd == 0) { + argc--; + argv++; + } + else { readstd = 0; + } } flushsh(); if (cflg == 0) @@ -151,7 +154,7 @@ static void process(const char *name) { char *cp; - int c; + char c; int incomm = 0; int ret; @@ -211,15 +214,18 @@ def: } } out: - if (ferror(stdout)) - warn("x.c"), onintr(0); + if (ferror(stdout)) { + warn("x.c"); + onintr(0); + } + } static off_t yankstr(char **cpp) { char *cp = *cpp; - int c, ch; + char c, ch; char dbuf[BUFSIZ]; char *dp = dbuf; char *tp; @@ -260,10 +266,14 @@ yankstr(char **cpp) c -= '0'; if (!octdigit(*cp)) break; - c <<= 3, c += *cp++ - '0'; + c <<= 3; + c += *cp - '0'; + ++cp; if (!octdigit(*cp)) break; - c <<= 3, c += *cp++ - '0'; + c <<= 3; + c += *cp - '0'; + ++cp; break; } gotc: -- 2.11.4.GIT