hexdump: remove unnecessary global variables

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

diff --git a/text-utils/display.c b/text-utils/display.c
index 1f9a11b4c92ce59f3cc867892628b4707a7d1d40..41ddd8db5931072fd381050fac4f5e828546bf45 100644 (file)
--- a/text-utils/display.c
+++ b/text-utils/display.c
@@ -295,7 +295,7 @@ get(void)
 int next(char **argv)
 {
        static int done;
-       int statok;
+       int statok, exitval = 0;
 
        if (argv) {
                _argv = argv;
@@ -305,14 +305,14 @@ int next(char **argv)
                if (*_argv) {
                        if (!(freopen(*_argv, "r", stdin))) {
                                warn("%s", *_argv);
-                               exitval = EXIT_FAILURE;
+                               exitval = 1;
                                ++_argv;
                                continue;
                        }
                        statok = done = 1;
                } else {
                        if (done++)
-                               return(0);
+                               return(exitval);
                        statok = 0;
                }
                if (skip)

diff --git a/text-utils/hexdump.c b/text-utils/hexdump.c
index e966cc313241224448c152a8d2ce42eb62ade6b1..411d8098689ecce516b96041224e9b4e8e46f38e 100644 (file)
--- a/text-utils/hexdump.c
+++ b/text-utils/hexdump.c
@@ -47,11 +47,11 @@
 
 FS *fshead;                            /* head of format strings */
 ssize_t blocksize;                     /* data block size */
-int exitval;                           /* final exit value */
 ssize_t length = -1;                   /* max bytes to read */
 
 int main(int argc, char **argv)
 {
+       int exitval;                    /* final exit value */
        FS *tfs;
        char *p;
 
@@ -76,7 +76,7 @@ int main(int argc, char **argv)
        for (tfs = fshead; tfs; tfs = tfs->nextfs)
                rewrite(tfs);
 
-       (void)next(argv);
+       exitval = next(argv);
        display();
        return exitval;
 }

diff --git a/text-utils/hexdump.h b/text-utils/hexdump.h
index b9e67a1ba3cc78d74c8ca7aec20f7b51de1d8119..b2ea1f152b38114d6d69178a557eee4c40f5f3a0 100644 (file)
--- a/text-utils/hexdump.h
+++ b/text-utils/hexdump.h
@@ -73,8 +73,6 @@ typedef struct _fs {                  /* format strings */
 extern FU *endfu;
 extern FS *fshead;                     /* head of format strings list */
 extern ssize_t blocksize;              /* data block size */
-extern int deprecated;                 /* od compatibility */
-extern int exitval;                    /* final exit value */
 extern ssize_t length;                 /* max bytes to read */
 extern off_t skip;                      /* bytes to skip */