diff options
| -rw-r--r-- | text-utils/display.c | 38 | ||||
| -rw-r--r-- | text-utils/hexdump.c | 2 | ||||
| -rw-r--r-- | text-utils/hexsyntax.c | 13 |
3 files changed, 27 insertions, 26 deletions
diff --git a/text-utils/display.c b/text-utils/display.c index 1800f2a10..1b82d3fe4 100644 --- a/text-utils/display.c +++ b/text-utils/display.c @@ -58,16 +58,16 @@ print(PR *pr, unsigned char *bp) { switch(pr->flags) { case F_ADDRESS: - (void)printf(pr->fmt, (int64_t)address); + printf(pr->fmt, (int64_t)address); break; case F_BPAD: - (void)printf(pr->fmt, ""); + printf(pr->fmt, ""); break; case F_C: conv_c(pr, bp); break; case F_CHAR: - (void)printf(pr->fmt, *bp); + printf(pr->fmt, *bp); break; case F_DBL: { @@ -76,11 +76,11 @@ print(PR *pr, unsigned char *bp) { switch(pr->bcnt) { case 4: memmove(&fval, bp, sizeof(fval)); - (void)printf(pr->fmt, fval); + printf(pr->fmt, fval); break; case 8: memmove(&dval, bp, sizeof(dval)); - (void)printf(pr->fmt, dval); + printf(pr->fmt, dval); break; } break; @@ -93,31 +93,31 @@ print(PR *pr, unsigned char *bp) { switch(pr->bcnt) { case 1: - (void)printf(pr->fmt, (int64_t)*bp); + printf(pr->fmt, (int64_t)*bp); break; case 2: memmove(&sval, bp, sizeof(sval)); - (void)printf(pr->fmt, (int64_t)sval); + printf(pr->fmt, (int64_t)sval); break; case 4: memmove(&ival, bp, sizeof(ival)); - (void)printf(pr->fmt, (int64_t)ival); + printf(pr->fmt, (int64_t)ival); break; case 8: memmove(&Lval, bp, sizeof(Lval)); - (void)printf(pr->fmt, (int64_t)Lval); + printf(pr->fmt, (int64_t)Lval); break; } break; } case F_P: - (void)printf(pr->fmt, isprint(*bp) ? *bp : '.'); + printf(pr->fmt, isprint(*bp) ? *bp : '.'); break; case F_STR: - (void)printf(pr->fmt, (char *)bp); + printf(pr->fmt, (char *)bp); break; case F_TEXT: - (void)printf("%s", pr->fmt); + printf("%s", pr->fmt); break; case F_U: conv_u(pr, bp); @@ -130,19 +130,19 @@ print(PR *pr, unsigned char *bp) { switch(pr->bcnt) { case 1: - (void)printf(pr->fmt, (uint64_t)*bp); + printf(pr->fmt, (uint64_t)*bp); break; case 2: memmove(&sval, bp, sizeof(sval)); - (void)printf(pr->fmt, (uint64_t)sval); + printf(pr->fmt, (uint64_t)sval); break; case 4: memmove(&ival, bp, sizeof(ival)); - (void)printf(pr->fmt, (uint64_t)ival); + printf(pr->fmt, (uint64_t)ival); break; case 8: memmove(&Lval, bp, sizeof(Lval)); - (void)printf(pr->fmt, (uint64_t)Lval); + printf(pr->fmt, (uint64_t)Lval); break; } break; @@ -169,7 +169,7 @@ static void bpad(PR *pr) void display(void) { - struct list_head *fs; + register struct list_head *fs; register FS *fss; register FU *fu; register PR *pr; @@ -265,7 +265,7 @@ get(void) if (!need && vflag != ALL && !memcmp(curp, savp, nread)) { if (vflag != DUP) - (void)printf("*\n"); + printf("*\n"); return(NULL); } if (need > 0) @@ -296,7 +296,7 @@ get(void) return(curp); } if (vflag == WAIT) - (void)printf("*\n"); + printf("*\n"); vflag = DUP; address += blocksize; need = blocksize; diff --git a/text-utils/hexdump.c b/text-utils/hexdump.c index 18b3ec23f..cbf87dcb4 100644 --- a/text-utils/hexdump.c +++ b/text-utils/hexdump.c @@ -83,7 +83,7 @@ int main(int argc, char **argv) rewrite(tfs); } - (void)next(argv); + next(argv); display(); return exitval; } diff --git a/text-utils/hexsyntax.c b/text-utils/hexsyntax.c index 9b6a1e2fc..53ca13575 100644 --- a/text-utils/hexsyntax.c +++ b/text-utils/hexsyntax.c @@ -56,6 +56,7 @@ newsyntax(int argc, char ***argvp) { int ch; char **argv; + char *hex_offt_fmt = "\"%07.7_Ax\n\""; static const struct option longopts[] = { {"one-byte-octal", no_argument, NULL, 'b'}, @@ -78,11 +79,11 @@ newsyntax(int argc, char ***argvp) while ((ch = getopt_long(argc, argv, "bcCde:f:n:os:vxhV", longopts, NULL)) != -1) { switch (ch) { case 'b': - add("\"%07.7_Ax\n\""); + add(hex_offt_fmt); add("\"%07.7_ax \" 16/1 \"%03o \" \"\\n\""); break; case 'c': - add("\"%07.7_Ax\n\""); + add(hex_offt_fmt); add("\"%07.7_ax \" 16/1 \"%3_c \" \"\\n\""); break; case 'C': @@ -91,7 +92,7 @@ newsyntax(int argc, char ***argvp) add("\" |\" 16/1 \"%_p\" \"|\\n\""); break; case 'd': - add("\"%07.7_Ax\n\""); + add(hex_offt_fmt); add("\"%07.7_ax \" 8/2 \" %05u \" \"\\n\""); break; case 'e': @@ -104,7 +105,7 @@ newsyntax(int argc, char ***argvp) length = strtosize_or_err(optarg, _("failed to parse length")); break; case 'o': - add("\"%07.7_Ax\n\""); + add(hex_offt_fmt); add("\"%07.7_ax \" 8/2 \" %06o \" \"\\n\""); break; case 's': @@ -114,7 +115,7 @@ newsyntax(int argc, char ***argvp) vflag = ALL; break; case 'x': - add("\"%07.7_Ax\n\""); + add(hex_offt_fmt); add("\"%07.7_ax \" 8/2 \" %04x \" \"\\n\""); break; case 'h': @@ -129,7 +130,7 @@ newsyntax(int argc, char ***argvp) } if (list_empty(&fshead)) { - add("\"%07.7_Ax\n\""); + add(hex_offt_fmt); add("\"%07.7_ax \" 8/2 \"%04x \" \"\\n\""); } |