assume ANSI C: delete no-volatile support, and most no-prototype support

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

26 files changed, 68 insertions, 98 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7ae63a66..ef85fce 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-26  Ken Raeburn  <raeburn@mit.edu>
+
+	* acconfig.h (KRB5_NO_PROTOTYPES, KRB5_PROVIDE_PROTOTYPES,
+	KRB5_NO_NESTED_PROTOTYPES): Deleted.
+	* aclocal.m4 (HAS_ANSI_VOLATILE, KRB5_CHECK_PROTOS): Deleted.
+
 2001-04-25  Ken Raeburn  <raeburn@mit.edu>
 
 	* acconfig.h (HAVE_SOCKLEN_T): Add.
diff --git a/src/acconfig.h b/src/acconfig.h
index e71089a..263d00a 100644
--- a/src/acconfig.h
+++ b/src/acconfig.h
@@ -7,9 +7,6 @@
    handle it on some systems.  */
 
 #undef ANSI_STDIO
-#undef KRB5_NO_PROTOTYPES
-#undef KRB5_PROVIDE_PROTOTYPES
-#undef KRB5_NO_NESTED_PROTOTYPES
 
 #undef NO_YYLINENO
 #undef POSIX_FILE_LOCKS
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 012b01e..1a9d38f 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -600,38 +600,6 @@ AC_ARG_WITH([netlib],
 [AC_LIBRARY_NET]
 )])dnl
 dnl
-dnl HAS_ANSI_VOLATILE
-dnl
-define(HAS_ANSI_VOLATILE,[
-AC_MSG_CHECKING([volatile])
-AC_CACHE_VAL(krb5_cv_has_ansi_volatile,
-[AC_TRY_COMPILE(
-[volatile int x();], [],
-krb5_cv_has_ansi_volatile=yes, krb5_cv_has_ansi_volatile=no)])
-AC_MSG_RESULT($krb5_cv_has_ansi_volatile)
-if test $krb5_cv_has_ansi_volatile = no; then
-ADD_DEF(-Dvolatile=)
-fi
-])dnl
-dnl
-dnl
-dnl Check for prototype support - used by application not including k5-int.h
-dnl
-define(KRB5_CHECK_PROTOS,[
-AC_MSG_CHECKING([prototype support])
-AC_CACHE_VAL(krb5_cv_has_prototypes,
-[AC_TRY_COMPILE(
-[int x(double y, int z);], [],
-krb5_cv_has_prototypes=yes, krb5_cv_has_prototypes=no)])
-AC_MSG_RESULT($krb5_cv_has_prototypes)
-if test $krb5_cv_has_prototypes = no; then
-AC_DEFINE(KRB5_NO_PROTOTYPES)
-else
-AC_DEFINE(KRB5_PROVIDE_PROTOTYPES)
-fi
-dnl *never* set NARROW_PROTOTYPES
-])dnl
-dnl
 dnl Check if stdarg or varargs is available *and compiles*; prefer stdarg.
 dnl (This was sent to djm for incorporation into autoconf 3/12/1996.  KR)
 dnl
diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index c752300..c2ae0f4 100644
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-26  Ken Raeburn  <raeburn@mit.edu>
+
+	* configure.in: Don't use KRB5_CHECK_PROTOS.
+
 2001-04-02  Tom Yu  <tlyu@mit.edu>
 
 	* login.M: Don't include "= 0" as part of the "accept_passwd"
diff --git a/src/appl/bsd/configure.in b/src/appl/bsd/configure.in
index ae908c2..058068e 100644
--- a/src/appl/bsd/configure.in
+++ b/src/appl/bsd/configure.in
@@ -169,8 +169,6 @@ dnl
 K5_AC_CHECK_FILES(/etc/environment /etc/TIMEZONE)
 dnl
 dnl
-KRB5_CHECK_PROTOS
-dnl
 ADD_DEF(-DKERBEROS)
 AC_C_CONST
 if test "$krb5_cv_build_krb4_libs" = yes; then
diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog
index 74bfbe6..b23f1d4 100644
--- a/src/appl/gssftp/ftp/ChangeLog
+++ b/src/appl/gssftp/ftp/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-26  Ken Raeburn  <raeburn@mit.edu>
+
+	* ftp_var.h (PROTOTYPE): Always define to use supplied prototype.
+	* secure.h (PROTOTYPE): Likewise.
+
 2001-03-07  Ken Raeburn  <raeburn@mit.edu>
 
 	* cmds.c (strerror): Only define if not HAVE_STRERROR.
diff --git a/src/appl/gssftp/ftp/ftp_var.h b/src/appl/gssftp/ftp/ftp_var.h
index 99c5ea0..7bdc51f 100644
--- a/src/appl/gssftp/ftp/ftp_var.h
+++ b/src/appl/gssftp/ftp/ftp_var.h
@@ -141,11 +141,7 @@ extern	char *mktemp();
 extern int command(char *, ...);
 #endif
 
-#if (defined(__STDC__) || defined(__cplusplus) || defined(_MSDOS) || defined(_WIN32) || defined(KRB5_PROVIDE_PROTOTYPES)) && !defined(KRB5_NO_PROTOTYPES)
 #define PROTOTYPE(x) x
-#else
-#define PROTOTYPE(x) ()
-#endif /* STDC or PROTOTYPES */
 
 char *remglob PROTOTYPE((char **, int));
 int another PROTOTYPE((int *, char ***, char *));
diff --git a/src/appl/gssftp/ftp/secure.h b/src/appl/gssftp/ftp/secure.h
index 0efb612..6a4ee4c 100644
--- a/src/appl/gssftp/ftp/secure.h
+++ b/src/appl/gssftp/ftp/secure.h
@@ -5,11 +5,7 @@
 #define myaddr		data_addr
 #define hisaddr		hisdataaddr
 
-#if (defined(__STDC__) || defined(__cplusplus) || defined(_MSDOS) || defined(_WIN32) || defined(KRB5_PROVIDE_PROTOTYPES)) && !defined(KRB5_NO_PROTOTYPES)
 #define PROTOTYPE(x) x
-#else
-#define PROTOTYPE(x) ()
-#endif /* STDC or PROTOTYPES */
 
 int secure_flush PROTOTYPE((int));
 int secure_putc PROTOTYPE((int, FILE *));
diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 88434bc..25b1497 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,15 @@
+2001-04-26  Ken Raeburn  <raeburn@mit.edu>
+
+	* win-mac.h (HAS_ANSI_VOLATILE, KRB5_PROVIDE_PROTOTYPES): Don't
+	define.
+
+	* configure.in: Don't use KRB5_CHECK_PROTOS.  Don't check for use
+	of prototypes inside structures.
+
+	* syslog.h (syslog, vsyslog, openlog, closelog, setlogmask):
+	Always use prototype versions of declarations; delete
+	non-prototype declarations.
+
 2001-04-25  Ken Raeburn  <raeburn@mit.edu>
 
 	* k5-int.h (socklen_t) [NEED_SOCKETS] [!HAVE_SOCKLEN_T]: Define as
diff --git a/src/include/configure.in b/src/include/configure.in
index faaea12..c4f993e 100644
--- a/src/include/configure.in
+++ b/src/include/configure.in
@@ -38,19 +38,6 @@ if test $krb5_cv_has_ansi_stdio = yes; then
 AC_DEFINE(ANSI_STDIO)
 fi
 dnl
-KRB5_CHECK_PROTOS
-dnl
-AC_MSG_CHECKING([prototypes in structs])
-AC_CACHE_VAL(krb5_cv_struct_prototypes,
-[AC_TRY_COMPILE(
-[typedef int i_t; typedef struct foo { int (*foofn)(i_t, i_t); } *footype;],
-[],
-krb5_cv_struct_prototypes=yes, krb5_cv_struct_prototypes=no)])
-AC_MSG_RESULT($krb5_cv_struct_prototypes)
-if test $krb5_cv_struct_prototypes = no; then
-AC_DEFINE(KRB5_NO_NESTED_PROTOTYPES)
-fi
-dnl
 dnl Word sizes...
 AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(int)
diff --git a/src/include/kerberosIV/ChangeLog b/src/include/kerberosIV/ChangeLog
index b9bd0d7..0ae76c0 100644
--- a/src/include/kerberosIV/ChangeLog
+++ b/src/include/kerberosIV/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-26  Ken Raeburn  <raeburn@mit.edu>
+
+	* krb.h: Make struct sockaddr_in declaration unconditional.
+
 2001-04-10  Ken Raeburn  <raeburn@mit.edu>
 
 	* des.h (des_pcbc_encrypt, des_quad_cksum, des_cbc_cksum,
diff --git a/src/include/kerberosIV/krb.h b/src/include/kerberosIV/krb.h
index 48dd3e7..b2cd939 100644
--- a/src/include/kerberosIV/krb.h
+++ b/src/include/kerberosIV/krb.h
@@ -389,9 +389,7 @@ extern struct _krb5_context FAR * krb5__krb4_context;
  * Function Prototypes for Kerberos V4.
  */
 
-#if (defined(__STDC__) || defined(_WINDOWS)) && !defined(KRB5_NO_PROTOTYPES)
 struct sockaddr_in;
-#endif
 
 /* dest_tkt.c */
 KRB5_DLLIMP int KRB5_CALLCONV dest_tkt
diff --git a/src/include/sys/ChangeLog b/src/include/sys/ChangeLog
index 8cdc381..f7e6e39 100644
--- a/src/include/sys/ChangeLog
+++ b/src/include/sys/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-26  Ken Raeburn  <raeburn@mit.edu>
+
+	* syslog.h (syslog, vsyslog, openlog, closelog, setlogmask):
+	Always use prototype versions of declarations; delete
+	non-prototype declarations.
+
 Wed Jun 12 00:44:07 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* syslog.h: Add #ifdef _WIN32 in places where we had #ifdef _MSDOS
diff --git a/src/include/sys/syslog.h b/src/include/sys/syslog.h
index 6adae5a..9662310 100644
--- a/src/include/sys/syslog.h
+++ b/src/include/sys/syslog.h
@@ -90,7 +90,6 @@
 #define LOG_NOWAIT	0x10	/* if forking to log on console, don't wait() */
 
 #ifndef KERNEL
-#if (defined(__STDC__) || defined(_MSDOS) || defined(_WIN32)) && !defined(KRB5_NO_PROTOTYPES)
 extern void syslog  (int , const char *, ... );
 #ifdef va_start				
 /* XXX depending on #define of va_start in <stdarg.h> */
@@ -99,12 +98,5 @@ extern void vsyslog  (int , const char *, va_list );
 extern void openlog  (const char *, int , int );
 extern void closelog  (void );
 extern int setlogmask  (int );
-#else /* STDC */
-extern void syslog  ();
-extern void vsyslog  ();
-extern void openlog  ();
-extern void closelog  ();
-extern int setlogmask  ();
-#endif /* STDC */
 
 #endif
diff --git a/src/include/syslog.h b/src/include/syslog.h
index c11a960..f587921 100644
--- a/src/include/syslog.h
+++ b/src/include/syslog.h
@@ -90,7 +90,6 @@
 #define LOG_NOWAIT	0x10	/* if forking to log on console, don't wait() */
 
 #ifndef KERNEL
-#if (defined(__STDC__) || defined(_MSDOS) || defined(_WIN32)) && !defined(KRB5_NO_PROTOTYPES)
 extern void syslog  (int , const char *, ... );
 #ifdef va_start				
 /* XXX depending on #define of va_start in <stdarg.h> */
@@ -99,12 +98,5 @@ extern void vsyslog  (int , const char *, va_list );
 extern void openlog  (const char *, int , int );
 extern void closelog  (void );
 extern int setlogmask  (int );
-#else /* STDC */
-extern void syslog  ();
-extern void vsyslog  ();
-extern void openlog  ();
-extern void closelog  ();
-extern int setlogmask  ();
-#endif /* STDC */
 
 #endif
diff --git a/src/include/win-mac.h b/src/include/win-mac.h
index ffd3f63..447dc1a 100644
--- a/src/include/win-mac.h
+++ b/src/include/win-mac.h
@@ -152,9 +152,7 @@ typedef unsigned char	u_char;
 #define INI_RECENT_LOGINS "Recent Logins"    
 #define INI_LOGIN       "Login"
 
-#define HAS_ANSI_VOLATILE
 #define HAS_VOID_TYPE
-#define KRB5_PROVIDE_PROTOTYPES
 #define HAVE_STDARG_H
 #define HAVE_SYS_TYPES_H
 #define HAVE_STDLIB_H
diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog
index 959ac2e..e9dc714 100644
--- a/src/kdc/ChangeLog
+++ b/src/kdc/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-26  Ken Raeburn  <raeburn@mit.edu>
+
+	* configure.in: Don't use HAS_ANSI_VOLATILE.
+
 2001-04-10  Ken Raeburn  <raeburn@mit.edu>
 
 	* do_as_req.c, do_tgs_req.c, kdc_preauth.c, kdc_util.h,
diff --git a/src/kdc/configure.in b/src/kdc/configure.in
index 75f1075..dfcf9ea 100644
--- a/src/kdc/configure.in
+++ b/src/kdc/configure.in
@@ -7,7 +7,6 @@ AC_PROG_AWK
 KRB5_AC_INET6
 KRB5_SOCKADDR_SA_LEN
 CHECK_SIGNALS
-HAS_ANSI_VOLATILE
 dnl
 dnl --with-vague-errors disables useful error messages.
 dnl
diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog
index 028aab4..ec34efe 100644
--- a/src/lib/des425/ChangeLog
+++ b/src/lib/des425/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-26  Ken Raeburn  <raeburn@mit.edu>
+
+	* configure.in: Don't use HAS_ANSI_VOLATILE.
+
 2001-04-12  Danilo Almeida  <dalmeida@mit.edu>
 
 	* cksum.c (des_cbc_cksum): Gee, a consistent calling convntion.
diff --git a/src/lib/des425/configure.in b/src/lib/des425/configure.in
index 291b449..14b90b7 100644
--- a/src/lib/des425/configure.in
+++ b/src/lib/des425/configure.in
@@ -5,7 +5,6 @@ AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
 dnl
-HAS_ANSI_VOLATILE
 AC_MSG_CHECKING([if pragma weak supported])
 AC_CACHE_VAL(krb5_cv_pragma_weak,
 [AC_TRY_LINK(
diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog
index 0c07e50..e6656bc 100644
--- a/src/lib/krb5/ChangeLog
+++ b/src/lib/krb5/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-26  Ken Raeburn  <raeburn@mit.edu>
+
+	* configure.in: Don't use HAS_ANSI_VOLATILE.
+
 2001-04-25  Ken Raeburn  <raeburn@mit.edu>
 
 	* configure.in: Moved test for socklen_t to include directory.
diff --git a/src/lib/krb5/configure.in b/src/lib/krb5/configure.in
index 88ff70e..aaecffa 100644
--- a/src/lib/krb5/configure.in
+++ b/src/lib/krb5/configure.in
@@ -8,7 +8,6 @@ AC_TYPE_UID_T
 AC_TYPE_OFF_T
 dnl
 dnl
-HAS_ANSI_VOLATILE
 AC_HEADER_STDARG
 AC_CHECK_HEADERS(unistd.h paths.h regex.h regexp.h regexpr.h fcntl.h memory.h ifaddrs.h sys/filio.h)
 AC_CHECK_FUNCS(flock fchmod chmod strftime strptime geteuid setenv unsetenv getenv setsid gethostbyname2 getifaddrs)
diff --git a/src/mac/libraries/ChangeLog b/src/mac/libraries/ChangeLog
index 844ba30..f33d71c 100644
--- a/src/mac/libraries/ChangeLog
+++ b/src/mac/libraries/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-26  Ken Raeburn  <raeburn@mit.edu>
+
+	* autoconf.h (KRB5_PROVIDE_PROTOTYPES): Don't define.
+
 Wed Oct  21 17:40:00 1998  Miro Jurisic <meeroh@mit.edu>
 
 	* Metrowerks: Added CodeWarrior Pro4 projects and docs
diff --git a/src/mac/libraries/autoconf.h b/src/mac/libraries/autoconf.h
index 3341630..6fbbd7c 100644
--- a/src/mac/libraries/autoconf.h
+++ b/src/mac/libraries/autoconf.h
@@ -4,7 +4,6 @@
 #define HAS_ANSI_CONST 1
 #define HAVE_STDLIB_H 1
 #define HAS_VOID_TYPE 1
-#define KRB5_PROVIDE_PROTOTYPES 1
 #define NO_NESTED_PROTOTYPES 1
 #define NO_YYLINENO 1
 #define USE_DIRENT_H 1
diff --git a/src/tests/asn.1/ChangeLog b/src/tests/asn.1/ChangeLog
index 9de5842..f5b262b 100644
--- a/src/tests/asn.1/ChangeLog
+++ b/src/tests/asn.1/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-26  Ken Raeburn  <raeburn@mit.edu>
+
+	* trval.c (decode_len, do_prim, do_cons, do_prim_bitstring,
+	do_prim_int, do_prim_string, print_tag_type, trval, trval2):
+	Always use prototype declarations.
+
 Sun Feb 18 15:33:50 2001  Ezra Peisach  <epeisach@mit.edu>
 
 	* trval.c: Add prototypes for trval() and trval2().
diff --git a/src/tests/asn.1/trval.c b/src/tests/asn.1/trval.c
index 475a5fd..94c0774 100644
--- a/src/tests/asn.1/trval.c
+++ b/src/tests/asn.1/trval.c
@@ -105,22 +105,15 @@ int print_krb5_types = 0;
 
 int current_appl_type = -1;
 
-#if (defined(__STDC__) || defined(__cplusplus) || defined(_MSDOS) || defined(_WIN32) || defined(KRB5_PROVIDE_PROTOTYPES)) && !defined(KRB5_NO_PROTOTYPES)
-#define PROTOTYPE(x) x
-#else
-#define PROTOTYPE(x) ()
-#endif
-
-
-int decode_len PROTOTYPE((FILE *, unsigned char *, int));
-int do_prim PROTOTYPE((FILE *, int, unsigned char *, int, int));
-int do_cons PROTOTYPE((FILE *, unsigned char *, int, int, int *));
-int do_prim_bitstring PROTOTYPE((FILE *, int, unsigned char *, int, int));
-int do_prim_int PROTOTYPE((FILE *, int, unsigned char *, int, int));
-int do_prim_string PROTOTYPE((FILE *, int, unsigned char *, int, int));
-void print_tag_type PROTOTYPE((FILE *, int, int));
-int trval PROTOTYPE((FILE *, FILE *));
-int trval2 PROTOTYPE((FILE *, unsigned char *, int, int, int *));
+int decode_len (FILE *, unsigned char *, int);
+int do_prim (FILE *, int, unsigned char *, int, int);
+int do_cons (FILE *, unsigned char *, int, int, int *);
+int do_prim_bitstring (FILE *, int, unsigned char *, int, int);
+int do_prim_int (FILE *, int, unsigned char *, int, int);
+int do_prim_string (FILE *, int, unsigned char *, int, int);
+void print_tag_type (FILE *, int, int);
+int trval (FILE *, FILE *);
+int trval2 (FILE *, unsigned char *, int, int, int *);
 
 
 /****************************************************************************/