diff options
| -rw-r--r-- | libexec/tftpd/tftpd.c | 8 | ||||
| -rw-r--r-- | usr.bin/tftp/tftpsubs.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c index 5a2fa283947..0aadbcd6e87 100644 --- a/libexec/tftpd/tftpd.c +++ b/libexec/tftpd/tftpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tftpd.c,v 1.49 2006/07/26 09:10:03 mglocker Exp $ */ +/* $OpenBSD: tftpd.c,v 1.50 2006/07/26 12:34:41 mglocker Exp $ */ /* * Copyright (c) 1983 Regents of the University of California. @@ -37,7 +37,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)tftpd.c 5.13 (Berkeley) 2/26/91";*/ -static char rcsid[] = "$OpenBSD: tftpd.c,v 1.49 2006/07/26 09:10:03 mglocker Exp $"; +static char rcsid[] = "$OpenBSD: tftpd.c,v 1.50 2006/07/26 12:34:41 mglocker Exp $"; #endif /* not lint */ /* @@ -382,7 +382,7 @@ void tftp(struct tftphdr *tp, int size) { char *cp; - int i, first = 1, ecode, opcode; + int i, first = 1, ecode, opcode, to; struct formats *pf; char *filename, *mode = NULL, *option, *ccp; char fnbuf[MAXPATHLEN], nicebuf[MAXPATHLEN]; @@ -449,7 +449,7 @@ again: option_fail: if (options[OPT_TIMEOUT].o_request) { - int to = strtonum(options[OPT_TIMEOUT].o_request, + to = strtonum(options[OPT_TIMEOUT].o_request, TIMEOUT_MIN, TIMEOUT_MAX, &errstr); if (errstr) { nak(EBADOP); diff --git a/usr.bin/tftp/tftpsubs.c b/usr.bin/tftp/tftpsubs.c index 15896a78655..38194ae82f7 100644 --- a/usr.bin/tftp/tftpsubs.c +++ b/usr.bin/tftp/tftpsubs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tftpsubs.c,v 1.11 2006/07/20 09:42:44 mglocker Exp $ */ +/* $OpenBSD: tftpsubs.c,v 1.12 2006/07/26 12:34:41 mglocker Exp $ */ /* $NetBSD: tftpsubs.c,v 1.3 1994/12/08 09:51:31 jtc Exp $ */ /* @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)tftpsubs.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = - "$OpenBSD: tftpsubs.c,v 1.11 2006/07/20 09:42:44 mglocker Exp $"; + "$OpenBSD: tftpsubs.c,v 1.12 2006/07/26 12:34:41 mglocker Exp $"; #endif /* not lint */ /* @@ -101,7 +101,7 @@ rw_init(int x) { newline = 0; /* init crlf flag */ prevchar = -1; - bfs[0].counter = BF_ALLOC; /* pass out the first buffer */ + bfs[0].counter = BF_ALLOC; /* pass out the first buffer */ current = 0; bfs[1].counter = BF_FREE; nextone = x; /* ahead or behind? */ |