d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename a function name so that it doesn't conflict with a future system call.

Browse Source
This commit is contained in:
dg 1998-10-30 16:17:50 +00:00
parent a34afb514e
commit 3817691886
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libexec/tftpd/tftpd.c
View File

@ -42,7 +42,7 @@ static const char copyright[] =
static char sccsid[] = "@(#)tftpd.c 8.1 (Berkeley) 6/4/93";
#endif
static const char rcsid[] =
"$Id: tftpd.c,v 1.10 1997/12/03 07:19:58 charnier Exp $";
"$Id: tftpd.c,v 1.11 1998/04/12 11:15:54 phk Exp $";
#endif /* not lint */
/*
@ -266,7 +266,7 @@ main(argc, argv)
struct formats;
int validate_access __P((char **, int));
void sendfile __P((struct formats *));
void xmitfile __P((struct formats *));
void recvfile __P((struct formats *));
struct formats {
@ -276,8 +276,8 @@ struct formats {
void (*f_recv) __P((struct formats *));
int f_convert;
} formats[] = {
{ "netascii", validate_access, sendfile, recvfile, 1 },
{ "octet", validate_access, sendfile, recvfile, 0 },
{ "netascii", validate_access, xmitfile, recvfile, 1 },
{ "octet", validate_access, xmitfile, recvfile, 0 },
#ifdef notdef
{ "mail", validate_user, sendmail, recvmail, 1 },
#endif
@ -465,7 +465,7 @@ timer()
* Send the requested file.
*/
void
sendfile(pf)
xmitfile(pf)
struct formats *pf;
{
struct tftphdr *dp, *r_init();

8
sbin/atm/fore_dnld/fore_dnld.c
View File

@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
* @(#) $Id: fore_dnld.c,v 1.15 1998/08/26 23:29:32 mks Exp $
* @(#) $Id: fore_dnld.c,v 1.1 1998/09/15 08:22:47 phk Exp $
*
*/
@ -37,7 +37,7 @@
*/
#ifndef lint
static char *RCSid = "@(#) $Id: fore_dnld.c,v 1.15 1998/08/26 23:29:32 mks Exp $";
static char *RCSid = "@(#) $Id: fore_dnld.c,v 1.1 1998/09/15 08:22:47 phk Exp $";
#endif
#include <sys/types.h>
@ -407,7 +407,7 @@ unsigned short crctab[1<<B] = {
* -1 unable to send file
*/
int
sendfile ( filename )
xmitfile ( filename )
char *filename;
{
int fd;
@ -1202,7 +1202,7 @@ char *argv[];
sndfile = objfile;
if ( ext && !binary )
err = sendfile ( sndfile );
err = xmitfile ( sndfile );
else
err = sendbinfile ( sndfile, ram );

2
usr.bin/tftp/extern.h
View File

@ -34,4 +34,4 @@
*/
void recvfile __P((int, char *, char *));
void sendfile __P((int, char *, char *));
void xmitfile __P((int, char *, char *));

6
usr.bin/tftp/main.c
View File

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

4
usr.bin/tftp/tftp.c
View File

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