diff options
| author | imp <imp@FreeBSD.org> | 1998-07-26 18:49:36 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 1998-07-26 18:49:36 +0000 |
| commit | 573de313c073e4d75922a344ed07b839b6d268a4 (patch) | |
| tree | 4d4a46a4096a2ff85f630e4e2070191cf1a9c218 /usr.bin/ftp | |
| parent | 0668f6953d2b612c16c813a72ae389004fe733e3 (diff) | |
| download | FreeBSD-src-573de313c073e4d75922a344ed07b839b6d268a4.zip FreeBSD-src-573de313c073e4d75922a344ed07b839b6d268a4.tar.gz | |
fd_set is documented to be a typedef, not a struct. Conform more
closely to the documented interface.
Inspired-by: similar changes in OpenBSD
Diffstat (limited to 'usr.bin/ftp')
| -rw-r--r-- | usr.bin/ftp/extern.h | 6 | ||||
| -rw-r--r-- | usr.bin/ftp/ftp.c | 14 |
2 files changed, 9 insertions, 11 deletions
diff --git a/usr.bin/ftp/extern.h b/usr.bin/ftp/extern.h index b6e4266..a334c0b 100644 --- a/usr.bin/ftp/extern.h +++ b/usr.bin/ftp/extern.h @@ -1,4 +1,4 @@ -/* $Id$ */ +/* $Id: extern.h,v 1.6 1997/12/13 20:38:15 pst Exp $ */ /* $NetBSD: extern.h,v 1.17.2.1 1997/11/18 00:59:50 mellon Exp $ */ /*- @@ -36,8 +36,6 @@ * @(#)extern.h 8.3 (Berkeley) 10/9/94 */ -struct fd_set; - void abort_remote __P((FILE *)); void abortpt __P((int)); void abortrecv __P((int)); @@ -67,7 +65,7 @@ void domacro __P((int, char **)); char *domap __P((char *)); void doproxy __P((int, char **)); char *dotrans __P((char *)); -int empty __P((struct fd_set *, int)); +int empty __P((fd_set *, int)); void get __P((int, char **)); struct cmd *getcmd __P((const char *)); int getit __P((int, char **, int, const char *)); diff --git a/usr.bin/ftp/ftp.c b/usr.bin/ftp/ftp.c index 8d92be24..1378be4 100644 --- a/usr.bin/ftp/ftp.c +++ b/usr.bin/ftp/ftp.c @@ -1,4 +1,4 @@ -/* $Id: ftp.c,v 1.12 1997/12/16 08:22:37 ache Exp $ */ +/* $Id: ftp.c,v 1.13 1998/06/09 04:30:51 imp Exp $ */ /* $NetBSD: ftp.c,v 1.29.2.1 1997/11/18 01:01:04 mellon Exp $ */ /* @@ -39,7 +39,7 @@ #if 0 static char sccsid[] = "@(#)ftp.c 8.6 (Berkeley) 10/27/94"; #else -__RCSID("$Id: ftp.c,v 1.12 1997/12/16 08:22:37 ache Exp $"); +__RCSID("$Id: ftp.c,v 1.13 1998/06/09 04:30:51 imp Exp $"); __RCSID_SOURCE("$NetBSD: ftp.c,v 1.29.2.1 1997/11/18 01:01:04 mellon Exp $"); #endif #endif /* not lint */ @@ -382,14 +382,14 @@ getreply(expecteof) int empty(mask, sec) - struct fd_set *mask; + fd_set *mask; int sec; { struct timeval t; t.tv_sec = (long) sec; t.tv_usec = 0; - return (select(32, mask, (struct fd_set *) 0, (struct fd_set *) 0, &t)); + return (select(32, mask, (fd_set *) 0, (fd_set *) 0, &t)); } jmp_buf sendabort; @@ -1372,7 +1372,7 @@ proxtrans(cmd, local, remote) int prox_type, nfnd; volatile int secndflag; char *cmd2; - struct fd_set mask; + fd_set mask; #ifdef __GNUC__ /* XXX: to shut up gcc warnings */ (void)&oldintr; @@ -1496,7 +1496,7 @@ reset(argc, argv) int argc; char *argv[]; { - struct fd_set mask; + fd_set mask; int nfnd = 1; FD_ZERO(&mask); @@ -1565,7 +1565,7 @@ abort_remote(din) { char buf[BUFSIZ]; int nfnd; - struct fd_set mask; + fd_set mask; if (cout == NULL) { warnx("Lost control connection for abort."); |
