diff options
| author | dg <dg@FreeBSD.org> | 1998-10-30 16:17:50 +0000 |
|---|---|---|
| committer | dg <dg@FreeBSD.org> | 1998-10-30 16:17:50 +0000 |
| commit | 49185b19a87ee1c77eddf4260925a3741f866b62 (patch) | |
| tree | 0513d4004e668b1a3feaa6e80f85e0375c72ae3d /usr.bin/tftp | |
| parent | 8de37805c02dd4ad678aca8584084fe426626dea (diff) | |
| download | FreeBSD-src-49185b19a87ee1c77eddf4260925a3741f866b62.zip FreeBSD-src-49185b19a87ee1c77eddf4260925a3741f866b62.tar.gz | |
Rename a function name so that it doesn't conflict with a future system call.
Diffstat (limited to 'usr.bin/tftp')
| -rw-r--r-- | usr.bin/tftp/extern.h | 2 | ||||
| -rw-r--r-- | usr.bin/tftp/main.c | 6 | ||||
| -rw-r--r-- | usr.bin/tftp/tftp.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/tftp/extern.h b/usr.bin/tftp/extern.h index 9174cb1..d64cf29 100644 --- a/usr.bin/tftp/extern.h +++ b/usr.bin/tftp/extern.h @@ -34,4 +34,4 @@ */ void recvfile __P((int, char *, char *)); -void sendfile __P((int, char *, char *)); +void xmitfile __P((int, char *, char *)); diff --git a/usr.bin/tftp/main.c b/usr.bin/tftp/main.c index d767463..3c6a151 100644 --- a/usr.bin/tftp/main.c +++ b/usr.bin/tftp/main.c @@ -42,7 +42,7 @@ static const char copyright[] = static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = - "$Id: main.c,v 1.5 1997/08/14 06:47:39 charnier Exp $"; + "$Id: main.c,v 1.6 1998/06/09 04:31:02 imp Exp $"; #endif /* not lint */ /* Many bug fixes are from Jim Guyton <guyton@rand-unix> */ @@ -373,7 +373,7 @@ put(argc, argv) printf("putting %s to %s:%s [%s]\n", cp, hostname, targ, mode); peeraddr.sin_port = port; - sendfile(fd, targ, mode); + xmitfile(fd, targ, mode); return; } /* this assumes the target is a directory */ @@ -391,7 +391,7 @@ put(argc, argv) printf("putting %s to %s:%s [%s]\n", argv[n], hostname, targ, mode); peeraddr.sin_port = port; - sendfile(fd, targ, mode); + xmitfile(fd, targ, mode); } } diff --git a/usr.bin/tftp/tftp.c b/usr.bin/tftp/tftp.c index cd3ecd3..ae517a4 100644 --- a/usr.bin/tftp/tftp.c +++ b/usr.bin/tftp/tftp.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)tftp.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = - "$Id: tftp.c,v 1.2 1997/08/14 06:47:40 charnier Exp $"; + "$Id: tftp.c,v 1.3 1998/02/20 04:30:34 jb Exp $"; #endif /* not lint */ /* Many bug fixes are from Jim Guyton <guyton@rand-unix> */ @@ -88,7 +88,7 @@ static void tpacket __P((const char *, struct tftphdr *, int)); * Send the requested file. */ void -sendfile(fd, name, mode) +xmitfile(fd, name, mode) int fd; char *name; char *mode; |
