diff options
| author | Ondrej Oprala | 2013-09-23 15:39:22 +0200 |
|---|---|---|
| committer | Karel Zak | 2013-11-08 12:54:53 +0100 |
| commit | 2f83c8f032f71fb6ab5d01ad81e805e078dd7fd8 (patch) | |
| tree | 8c039bad419e561ad75e40f3ed2f196ea5cd99d5 | |
| parent | hexdump: minor formatting improvements (diff) | |
| download | kernel-qcow2-util-linux-2f83c8f032f71fb6ab5d01ad81e805e078dd7fd8.tar.gz kernel-qcow2-util-linux-2f83c8f032f71fb6ab5d01ad81e805e078dd7fd8.tar.xz kernel-qcow2-util-linux-2f83c8f032f71fb6ab5d01ad81e805e078dd7fd8.zip | |
hexdump: simplify newsyntax arguments
Signed-off-by: Ondrej Oprala <ooprala@redhat.com>
| -rw-r--r-- | text-utils/hexdump.c | 2 | ||||
| -rw-r--r-- | text-utils/hexdump.h | 2 | ||||
| -rw-r--r-- | text-utils/hexsyntax.c | 8 |
3 files changed, 5 insertions, 7 deletions
diff --git a/text-utils/hexdump.c b/text-utils/hexdump.c index d5b9992e0..47853a882 100644 --- a/text-utils/hexdump.c +++ b/text-utils/hexdump.c @@ -64,7 +64,7 @@ int main(int argc, char **argv) atexit(close_stdout); if (!(c = strrchr(argv[0], 'o')) || strcmp(c, "od")) { - newsyntax(argc, &argv); + argv += newsyntax(argc, argv); } else errx(EXIT_FAILURE, _("calling hexdump as od has been deprecated " "in favour to GNU coreutils od.")); diff --git a/text-utils/hexdump.h b/text-utils/hexdump.h index f81b3bd13..3fc3b6401 100644 --- a/text-utils/hexdump.h +++ b/text-utils/hexdump.h @@ -91,4 +91,4 @@ void __attribute__((__noreturn__)) usage(FILE *out); void conv_c(PR *, u_char *); void conv_u(PR *, u_char *); int next(char **); -void newsyntax(int, char ***); +int newsyntax(int, char **); diff --git a/text-utils/hexsyntax.c b/text-utils/hexsyntax.c index f7a96c5b7..83f687017 100644 --- a/text-utils/hexsyntax.c +++ b/text-utils/hexsyntax.c @@ -51,11 +51,10 @@ off_t skip; /* bytes to skip */ -void -newsyntax(int argc, char ***argvp) +int +newsyntax(int argc, char **argv) { int ch; - char **argv; char *hex_offt = "\"%07.7_Ax\n\""; static const struct option longopts[] = { @@ -75,7 +74,6 @@ newsyntax(int argc, char ***argvp) {NULL, no_argument, NULL, 0} }; - argv = *argvp; while ((ch = getopt_long(argc, argv, "bcCde:f:n:os:vxhV", longopts, NULL)) != -1) { switch (ch) { case 'b': @@ -134,7 +132,7 @@ newsyntax(int argc, char ***argvp) add("\"%07.7_ax \" 8/2 \"%04x \" \"\\n\""); } - *argvp += optind; + return optind; } void __attribute__((__noreturn__)) usage(FILE *out) |