summaryrefslogtreecommitdiff
path: root/usr.bin/tftp/tftp.c
diff options
context:
space:
mode:
authorRay Lai <ray@cvs.openbsd.org>2007-05-11 01:47:49 +0000
committerRay Lai <ray@cvs.openbsd.org>2007-05-11 01:47:49 +0000
commit6d27a7ecb506e06b25b5a52b13613373056df2ed (patch)
tree9b4f83e43451b71673dee0eccc18210152d34a25 /usr.bin/tftp/tftp.c
parente0ed39a3f5d15955ea3ac17cf5a9e9be4ae730fe (diff)
Delinting from tbert <bret dot lambert at gmail dot com>
OK moritz@
Diffstat (limited to 'usr.bin/tftp/tftp.c')
-rw-r--r--usr.bin/tftp/tftp.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/usr.bin/tftp/tftp.c b/usr.bin/tftp/tftp.c
index 3638b2731fe..e13af0c0a49 100644
--- a/usr.bin/tftp/tftp.c
+++ b/usr.bin/tftp/tftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tftp.c,v 1.20 2006/07/26 09:10:03 mglocker Exp $ */
+/* $OpenBSD: tftp.c,v 1.21 2007/05/11 01:47:48 ray Exp $ */
/* $NetBSD: tftp.c,v 1.5 1995/04/29 05:55:25 cgd Exp $ */
/*
@@ -35,7 +35,7 @@
static char sccsid[] = "@(#)tftp.c 8.1 (Berkeley) 6/6/93";
#endif
static const char rcsid[] =
- "$OpenBSD: tftp.c,v 1.20 2006/07/26 09:10:03 mglocker Exp $";
+ "$OpenBSD: tftp.c,v 1.21 2007/05/11 01:47:48 ray Exp $";
#endif /* not lint */
/*
@@ -135,8 +135,9 @@ sendfile(int fd, char *name, char *mode)
struct sockaddr_in from;
struct pollfd pfd[1];
unsigned long amount;
+ socklen_t fromlen;
int convert; /* true if converting crlf -> lf */
- int n, nfds, error, fromlen, timeouts, block, size;
+ int n, nfds, error, timeouts, block, size;
startclock(); /* start stat's clock */
dp = r_init(); /* reset fillbuf/read-ahead code */
@@ -266,8 +267,9 @@ recvfile(int fd, char *name, char *mode)
struct sockaddr_in from;
struct pollfd pfd[1];
unsigned long amount;
+ socklen_t fromlen;
int convert; /* true if converting crlf -> lf */
- int n, nfds, error, fromlen, timeouts, block, size;
+ int n, nfds, error, timeouts, block, size;
int firsttrip;
startclock(); /* start stat's clock */