diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 1999-11-24 20:24:10 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 1999-11-24 20:24:10 +0000 |
| commit | 7d07feaee38c5b5bf979e63f3a66b7c8a53de734 (patch) | |
| tree | 89eb2c9e755b33917d7ae3da20dbf85fe8e7bc7e /usr.bin/ssh/readconf.c | |
| parent | f9fc2dae0e79015fc83285f9ab174633937ad9b1 (diff) | |
remove dead #ifdef-0-code
Diffstat (limited to 'usr.bin/ssh/readconf.c')
| -rw-r--r-- | usr.bin/ssh/readconf.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c index 1bb3f337108..d5a34042f24 100644 --- a/usr.bin/ssh/readconf.c +++ b/usr.bin/ssh/readconf.c @@ -14,7 +14,7 @@ */ #include "includes.h" -RCSID("$Id: readconf.c,v 1.20 1999/11/24 20:19:37 markus Exp $"); +RCSID("$Id: readconf.c,v 1.21 1999/11/24 20:24:09 markus Exp $"); #include "ssh.h" #include "cipher.h" @@ -229,7 +229,7 @@ process_config_line(Options *options, const char *host, char *line, const char *filename, int linenum, int *activep) { - char buf[256], *cp, *string, **charptr; + char buf[256], *cp, *string, **charptr, *cp2; int opcode, *intptr, value, fwd_port, fwd_host_port; /* Skip leading whitespace. */ @@ -420,17 +420,11 @@ parse_int: fatal("%.200s line %d: Missing argument.", filename, linenum); if (cp[0] < '0' || cp[0] > '9') fatal("%.200s line %d: Bad number.", filename, linenum); -#if 0 - value = atoi(cp); -#else - { - char *ptr; - /* Octal, decimal, or hex format? */ - value = strtol(cp, &ptr, 0); - if (cp == ptr) - fatal("%.200s line %d: Bad number.", filename, linenum); - } -#endif + + /* Octal, decimal, or hex format? */ + value = strtol(cp, &cp2, 0); + if (cp == cp2) + fatal("%.200s line %d: Bad number.", filename, linenum); if (*activep && *intptr == -1) *intptr = value; break; |