hexdump: remove unnecessary global variables

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2013-06-16 19:53:55 +01:00 committed by Karel Zak
parent ee919d37c3
commit f2a037fb7b
3 changed files with 5 additions and 7 deletions

View File

@ -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)

View File

@ -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;
}

View File

@ -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 */