Don't conditionalize prototypes; delete macros supporting it. (Maybe overdone;

don't worry about restoring them when importing new versions of code.)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13792 dc483132-0cff-0310-8789-dd5450dbe970

9 files changed, 135 insertions, 137 deletions

diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog
index 5d774f5..d831b2a 100644
--- a/src/appl/gssftp/ftp/ChangeLog
+++ b/src/appl/gssftp/ftp/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* cmds.c, ftp.c, ftp_var.h, glob.c, main.c, ruserpass.c, secure.c,
+	secure.h: Make prototypes unconditional.  Don't define PROTOTYPE
+	macro.
+
 2001-08-21  Ken Raeburn  <raeburn@mit.edu>
 
 	* glob.c (amatch, case '*'): Treat multiple asterisks the same as
diff --git a/src/appl/gssftp/ftp/cmds.c b/src/appl/gssftp/ftp/cmds.c
index 4a242d6..807da58 100644
--- a/src/appl/gssftp/ftp/cmds.c
+++ b/src/appl/gssftp/ftp/cmds.c
@@ -92,13 +92,13 @@ jmp_buf jabort;
 extern	char *auth_type;
 extern int do_auth();
 
-static int globulize PROTOTYPE((char **));
-static int confirm PROTOTYPE((char *, char *));
-static int getit PROTOTYPE((int, char **, int, char *));
-static sigtype mabort PROTOTYPE((int));
-static void quote1 PROTOTYPE((char *, int, char **));
-static char *dotrans PROTOTYPE((char *));
-static char *domap PROTOTYPE((char *));
+static int globulize (char **);
+static int confirm (char *, char *);
+static int getit (int, char **, int, char *);
+static sigtype mabort (int);
+static void quote1 (char *, int, char **);
+static char *dotrans (char *);
+static char *domap (char *);
 
 /*
  * `Another' gets another argument, and stores the new argc and argv.
diff --git a/src/appl/gssftp/ftp/ftp.c b/src/appl/gssftp/ftp/ftp.c
index e5027da..610318b 100644
--- a/src/appl/gssftp/ftp/ftp.c
+++ b/src/appl/gssftp/ftp/ftp.c
@@ -154,15 +154,15 @@ unsigned char *ucbuf;
 #include "secure.h"
 
 #ifdef GSSAPI
-void user_gss_error PROTOTYPE((OM_uint32, OM_uint32, char *));
+void user_gss_error (OM_uint32, OM_uint32, char *);
 #endif
 
-static void proxtrans PROTOTYPE((char *, char *, char *));
-static int initconn PROTOTYPE((void));
-static void ptransfer PROTOTYPE((char *, long, struct timeval *, struct timeval *));
-static void abort_remote PROTOTYPE((FILE *));
-static void tvsub PROTOTYPE((struct timeval *, struct timeval *, struct timeval *));
-static char *gunique PROTOTYPE((char *));
+static void proxtrans (char *, char *, char *);
+static int initconn (void);
+static void ptransfer (char *, long, struct timeval *, struct timeval *);
+static void abort_remote (FILE *);
+static void tvsub (struct timeval *, struct timeval *, struct timeval *);
+static char *gunique (char *);
 
 struct	sockaddr_in hisctladdr;
 struct	sockaddr_in hisdataaddr;
@@ -190,7 +190,7 @@ extern int connected;
 #define herror()	printf("unknown host\n")
 
 FILE	*cin, *cout;
-FILE	*dataconn PROTOTYPE((char *));
+FILE	*dataconn (char *);
 
 char *
 hookup(host, port)
diff --git a/src/appl/gssftp/ftp/ftp_var.h b/src/appl/gssftp/ftp/ftp_var.h
index 0f95ca4..469e506 100644
--- a/src/appl/gssftp/ftp/ftp_var.h
+++ b/src/appl/gssftp/ftp/ftp_var.h
@@ -173,114 +173,110 @@ extern	char *mktemp();
 
 extern int command(char *, ...);
 
-#ifndef PROTOTYPE
-#define PROTOTYPE(x) x
-#endif
-
-char *remglob PROTOTYPE((char **, int));
-int another PROTOTYPE((int *, char ***, char *));
-void makeargv PROTOTYPE((void));
-void setpeer PROTOTYPE((int, char **));
-void setclevel PROTOTYPE((int, char **));
-void setdlevel PROTOTYPE((int, char **));
-void ccc PROTOTYPE((void));
-void setclear PROTOTYPE((void));
-void setsafe PROTOTYPE((void));
-void setprivate PROTOTYPE((void));
-void settype PROTOTYPE((int, char **));
-void changetype PROTOTYPE((int, int));
-void setbinary PROTOTYPE((void));
-void setascii PROTOTYPE((void));
-void settenex PROTOTYPE((void));
-void set_mode  PROTOTYPE((int, char **));
-void setform  PROTOTYPE((int, char **));
-void setstruct  PROTOTYPE((int, char **));
-void siteidle  PROTOTYPE((int, char **));
-void put  PROTOTYPE((int, char **));
-void mput  PROTOTYPE((int, char **));
-void reget  PROTOTYPE((int, char **));
-void get  PROTOTYPE((int, char **));
-void mget  PROTOTYPE((int, char **));
-void status  PROTOTYPE((int, char **));
-void setbell PROTOTYPE((void));
-void settrace PROTOTYPE((void));
-void sethash PROTOTYPE((void));
-void setverbose PROTOTYPE((void));
-void setport PROTOTYPE((void));
-void setprompt PROTOTYPE((void));
-void setglob PROTOTYPE((void));
-void setdebug PROTOTYPE((int, char **));
-void cd PROTOTYPE((int, char **));
-void lcd PROTOTYPE((int, char **));
-void delete_file PROTOTYPE((int, char **));
-void mdelete PROTOTYPE((int, char **));
-void renamefile PROTOTYPE((int, char **));
-void ls PROTOTYPE((int, char **));
-void mls PROTOTYPE((int, char **));
-void shell PROTOTYPE((int, char **));
-void user PROTOTYPE((int, char **));
-void pwd PROTOTYPE((void));
-void makedir PROTOTYPE((int, char **));
-void removedir PROTOTYPE((int, char **));
-void quote PROTOTYPE((int, char **));
-void site PROTOTYPE((int, char **));
-void do_chmod PROTOTYPE((int, char **));
-void do_umask PROTOTYPE((int, char **));
-void setidle PROTOTYPE((int, char **));
-void rmthelp PROTOTYPE((int, char **));
-void quit PROTOTYPE((void));
-void disconnect PROTOTYPE((void));
-void fatal PROTOTYPE((char *));
-void account PROTOTYPE((int, char **));
-void doproxy PROTOTYPE((int, char **));
-void setcase PROTOTYPE((void));
-void setcr PROTOTYPE((void));
-void setntrans PROTOTYPE((int, char **));
-void setnmap PROTOTYPE((int, char **));
-void setsunique PROTOTYPE((void));
-void setrunique PROTOTYPE((void));
-void cdup PROTOTYPE((void));
-void restart PROTOTYPE((int, char **));
-void syst PROTOTYPE((void));
-void macdef PROTOTYPE((int, char **));
-void sizecmd PROTOTYPE((int, char **));
-void modtime PROTOTYPE((int, char **));
-void rmtstatus PROTOTYPE((int, char **));
-void newer PROTOTYPE((int, char **));
-void setpassive PROTOTYPE((void));
+char *remglob (char **, int);
+int another (int *, char ***, char *);
+void makeargv (void);
+void setpeer (int, char **);
+void setclevel (int, char **);
+void setdlevel (int, char **);
+void ccc (void);
+void setclear (void);
+void setsafe (void);
+void setprivate (void);
+void settype (int, char **);
+void changetype (int, int);
+void setbinary (void);
+void setascii (void);
+void settenex (void);
+void set_mode  (int, char **);
+void setform  (int, char **);
+void setstruct  (int, char **);
+void siteidle  (int, char **);
+void put  (int, char **);
+void mput  (int, char **);
+void reget  (int, char **);
+void get  (int, char **);
+void mget  (int, char **);
+void status  (int, char **);
+void setbell (void);
+void settrace (void);
+void sethash (void);
+void setverbose (void);
+void setport (void);
+void setprompt (void);
+void setglob (void);
+void setdebug (int, char **);
+void cd (int, char **);
+void lcd (int, char **);
+void delete_file (int, char **);
+void mdelete (int, char **);
+void renamefile (int, char **);
+void ls (int, char **);
+void mls (int, char **);
+void shell (int, char **);
+void user (int, char **);
+void pwd (void);
+void makedir (int, char **);
+void removedir (int, char **);
+void quote (int, char **);
+void site (int, char **);
+void do_chmod (int, char **);
+void do_umask (int, char **);
+void setidle (int, char **);
+void rmthelp (int, char **);
+void quit (void);
+void disconnect (void);
+void fatal (char *);
+void account (int, char **);
+void doproxy (int, char **);
+void setcase (void);
+void setcr (void);
+void setntrans (int, char **);
+void setnmap (int, char **);
+void setsunique (void);
+void setrunique (void);
+void cdup (void);
+void restart (int, char **);
+void syst (void);
+void macdef (int, char **);
+void sizecmd (int, char **);
+void modtime (int, char **);
+void rmtstatus (int, char **);
+void newer (int, char **);
+void setpassive (void);
 
 /* ftp.c */
-void sendrequest PROTOTYPE((char *, char *, char *, int));
-void recvrequest PROTOTYPE((char *, char *volatile, char *, char *, int));
-int login PROTOTYPE((char *));
-void setpbsz PROTOTYPE((unsigned int));
-void pswitch PROTOTYPE((int));
-int getreply PROTOTYPE((int));
-void reset PROTOTYPE((void));
-char *hookup PROTOTYPE((char *, int));
-int do_auth PROTOTYPE((void));
+void sendrequest (char *, char *, char *, int);
+void recvrequest (char *, char *volatile, char *, char *, int);
+int login (char *);
+void setpbsz (unsigned int);
+void pswitch (int);
+int getreply (int);
+void reset (void);
+char *hookup (char *, int);
+int do_auth (void);
 
 /* glob.c */
-void blkfree PROTOTYPE((char **));
+void blkfree (char **);
 
 /* domacro.c */
-void domacro PROTOTYPE((int, char **));
+void domacro (int, char **);
 
 
 /* main.c */
-void help PROTOTYPE((int, char **));
-struct cmd *getcmd PROTOTYPE((char *));
+void help (int, char **);
+struct cmd *getcmd (char *);
 
 
 /* ruserpass.c */
-int ruserpass PROTOTYPE((char *, char **, char **, char **));
+int ruserpass (char *, char **, char **, char **);
 
 /* radix.h */
-int radix_encode PROTOTYPE((unsigned char *, unsigned char *, int *, int));
-char *radix_error PROTOTYPE((int));
+int radix_encode (unsigned char *, unsigned char *, int *, int);
+char *radix_error (int);
 
 /* getpass.c */
-char *mygetpass PROTOTYPE((char *));
+char *mygetpass (char *);
 
 /* glob.c */
-char **ftpglob PROTOTYPE((char *));
+char **ftpglob (char *);
diff --git a/src/appl/gssftp/ftp/glob.c b/src/appl/gssftp/ftp/glob.c
index 4b760f2..b33de3a 100644
--- a/src/appl/gssftp/ftp/glob.c
+++ b/src/appl/gssftp/ftp/glob.c
@@ -81,22 +81,22 @@ static	short gflag;
 char	**ftpglob();
 char	*globerr;
 char	*home;
-static	char *strspl PROTOTYPE((char *, char *)), *strend PROTOTYPE((char *));
-char	**copyblk PROTOTYPE((char **));
-
-static void acollect PROTOTYPE((char *)), addpath PROTOTYPE((int)), 
-  collect PROTOTYPE((char *)), expand PROTOTYPE((char *)), 
-  Gcat PROTOTYPE((char *, char *));
-static void ginit PROTOTYPE((char **)), matchdir PROTOTYPE((char *)),
-  rscan PROTOTYPE((char **, int (*f)())), sort PROTOTYPE((void));
-static int amatch PROTOTYPE((char *, char *)), 
-  execbrc PROTOTYPE((char *, char *)), match PROTOTYPE((char *, char *));
-static int digit PROTOTYPE((int)), letter PROTOTYPE((int)),
-  any PROTOTYPE((int, char *));
+static	char *strspl (char *, char *), *strend (char *);
+char	**copyblk (char **);
+
+static void acollect (char *), addpath (int), 
+  collect (char *), expand (char *), 
+  Gcat (char *, char *);
+static void ginit (char **), matchdir (char *),
+  rscan (char **, int (*f)()), sort (void);
+static int amatch (char *, char *), 
+  execbrc (char *, char *), match (char *, char *);
+static int digit (int), letter (int),
+  any (int, char *);
 #ifndef _WIN32
-static int gethdir PROTOTYPE((char *));
+static int gethdir (char *);
 #endif
-static int tglob PROTOTYPE((int ));
+static int tglob (int );
 
 static	int globcnt;
 
diff --git a/src/appl/gssftp/ftp/main.c b/src/appl/gssftp/ftp/main.c
index 4f2cc59..1b0ae85 100644
--- a/src/appl/gssftp/ftp/main.c
+++ b/src/appl/gssftp/ftp/main.c
@@ -82,7 +82,7 @@ static char sccsid[] = "@(#)main.c	5.18 (Berkeley) 3/1/91";
 uid_t	getuid();
 #endif
 
-sigtype	intr PROTOTYPE((int)), lostpeer PROTOTYPE((int));
+sigtype	intr (int), lostpeer (int);
 extern	char *home;
 char	*getlogin();
 #ifdef KRB5_KRB4_COMPAT
@@ -91,8 +91,8 @@ struct servent staticsp;
 extern char realm[];
 #endif /* KRB5_KRB4_COMPAT */
 
-static void cmdscanner PROTOTYPE((int));
-static char *slurpstring PROTOTYPE((void));
+static void cmdscanner (int);
+static char *slurpstring (void);
 
 
 int 
diff --git a/src/appl/gssftp/ftp/ruserpass.c b/src/appl/gssftp/ftp/ruserpass.c
index fb9c723..acfabfa 100644
--- a/src/appl/gssftp/ftp/ruserpass.c
+++ b/src/appl/gssftp/ftp/ruserpass.c
@@ -57,7 +57,7 @@ static char sccsid[] = "@(#)ruserpass.c	5.3 (Berkeley) 3/1/91";
 #define MAXHOSTNAMELEN 64
 #endif
 
-static int token PROTOTYPE((void));
+static int token (void);
 static	FILE *cfile;
 
 #define	DEFAULT	1
diff --git a/src/appl/gssftp/ftp/secure.c b/src/appl/gssftp/ftp/secure.c
index 95c6ec8..d23e358 100644
--- a/src/appl/gssftp/ftp/secure.c
+++ b/src/appl/gssftp/ftp/secure.c
@@ -58,7 +58,7 @@ typedef unsigned long ftp_uint32;
 typedef long ftp_int32;
 #endif
 
-static int secure_putbuf PROTOTYPE((int, unsigned char *, unsigned int));
+static int secure_putbuf (int, unsigned char *, unsigned int);
 
 extern struct	sockaddr_in hisaddr;
 extern struct	sockaddr_in myaddr;
diff --git a/src/appl/gssftp/ftp/secure.h b/src/appl/gssftp/ftp/secure.h
index 458daef..5d1bd0b 100644
--- a/src/appl/gssftp/ftp/secure.h
+++ b/src/appl/gssftp/ftp/secure.h
@@ -5,15 +5,11 @@
 #define myaddr		data_addr
 #define hisaddr		hisdataaddr
 
-#ifndef PROTOTYPE
-#define PROTOTYPE(x) x
-#endif
-
-int secure_flush PROTOTYPE((int));
-int secure_putc PROTOTYPE((int, FILE *));
-int secure_getc PROTOTYPE((FILE *));
-int secure_write PROTOTYPE((int, unsigned char *, unsigned int));
-int secure_read PROTOTYPE((int, char *, unsigned int));
-void secure_gss_error PROTOTYPE((OM_uint32 maj_stat, OM_uint32 min_stat, char *s));
+int secure_flush (int);
+int secure_putc (int, FILE *);
+int secure_getc (FILE *);
+int secure_write (int, unsigned char *, unsigned int);
+int secure_read (int, char *, unsigned int);
+void secure_gss_error (OM_uint32 maj_stat, OM_uint32 min_stat, char *s);
 
 void secure_error(char *, ...);