Add support for K&R C

6 files changed, 83 insertions, 4 deletions

diff --git a/server/access.c b/server/access.c
index 4482176..c2891e6 100644
--- a/server/access.c
+++ b/server/access.c
@@ -179,9 +179,13 @@ check_acl_type(acl, accesstype, typeflag)
  * the acl_types field will be left at zero, since there will be no
  * acl files for the (non-)restricted class.
  */
-
 static void
+#ifdef __STDC__
 access_setup (int first)
+#else
+access_setup(first)
+     int first;
+#endif
 {
 	char buf[MAXPATHLEN];
 	char class_name[512];		/* assume class names <= 511 bytes */
@@ -240,13 +244,21 @@ access_setup (int first)
 }
 
 void
+#ifdef __STDC__
 access_init (void)
+#else
+access_init()
+#endif
 {
     access_setup (1);
 }
 
 void
+#ifdef __STDC__
 access_reinit (void)
+#else
+access_reinit()
+#endif
 {
     acl_cache_reset ();
     access_setup (0);
diff --git a/server/bdump.c b/server/bdump.c
index 70da0ab..95497a9 100644
--- a/server/bdump.c
+++ b/server/bdump.c
@@ -218,7 +218,11 @@ bdump_offer(who)
  */
  
 void
+#ifdef __STDC__
 bdump_send(void)
+#else
+bdump_send()
+#endif
 {
 	struct sockaddr_in from;
 	ZServerDesc_t *server;
diff --git a/server/common.c b/server/common.c
index 7d74ca5..6ae0a13 100644
--- a/server/common.c
+++ b/server/common.c
@@ -32,7 +32,12 @@ static char rcsid_common_c[] =
 /* copy the string into newly allocated area */
 
 char *
+#ifdef __STDC__
 strsave (Zconst char *sp)
+#else
+strsave (sp)
+     Zconst char *sp;
+#endif
 {
     register char *ret;
 
@@ -47,7 +52,12 @@ strsave (Zconst char *sp)
 /* generic string hash function */
 
 unsigned long
+#ifdef __STDC__
 hash (Zconst char *string)
+#else
+hash (string)
+     Zconst char *string;
+#endif
 {
 	register unsigned long hval = 0;
 	register char cp;
diff --git a/server/kopt.c b/server/kopt.c
index 8a74ed4..fafac36 100644
--- a/server/kopt.c
+++ b/server/kopt.c
@@ -97,7 +97,13 @@ typedef struct {
 } KeySchedRec;
 static KeySchedRec scheds[HASH_SIZE_1][HASH_SIZE_2];
 
-static Sched* check_key_sched_cache (des_cblock key) {
+#ifdef __STDC__
+static Sched* check_key_sched_cache (des_cblock key)
+#else
+static Sched* check_key_sched_cache (key)
+     des_cblock key;
+#endif
+{
     unsigned int hash_value = key[0] + key[1] * 256;
     KeySchedRec *rec = scheds[hash_value % HASH_SIZE_1];
     int i;
@@ -112,7 +118,14 @@ static Sched* check_key_sched_cache (des_cblock key) {
     return 0;
 }
 
-static void add_to_key_sched_cache (des_cblock key, Sched* sched) {
+#ifdef __STDC__
+static void add_to_key_sched_cache (des_cblock key, Sched* sched)
+#else
+static void add_to_key_sched_cache (key, sched)
+     des_cblock key;
+     Sched* sched;
+#endif
+{
     unsigned int hash_value = key[0] + key[1] * 256;
     KeySchedRec *rec = scheds[hash_value % HASH_SIZE_1];
     int i, oldest = HASH_SIZE_2 - 1;
diff --git a/server/main.c b/server/main.c
index c9ac3d8..ac7680a 100644
--- a/server/main.c
+++ b/server/main.c
@@ -532,7 +532,12 @@ usage()
  */
 
 static SIGNAL_RETURN_TYPE
+#ifdef __STDC__
 bye(int sig)
+#else
+bye(sig)
+     int sig;
+#endif
 {
 	server_shutdown();		/* tell other servers */
 	hostm_shutdown();		/* tell our hosts */
@@ -545,7 +550,12 @@ bye(int sig)
 }
 
 static SIGNAL_RETURN_TYPE
+#ifdef __STDC__
 dbug_on(int sig)
+#else
+dbug_on(sig)
+     int sig;
+#endif
 {
 	syslog(LOG_DEBUG, "debugging turned on");
 #ifdef DEBUG_MALLOC
@@ -556,7 +566,12 @@ dbug_on(int sig)
 }
 
 static SIGNAL_RETURN_TYPE
+#ifdef __STDC__
 dbug_off(int sig)
+#else
+dbug_off(sig)
+     int sig;
+#endif
 {
 	syslog(LOG_DEBUG, "debugging turned off");
 #ifdef DEBUG_MALLOC
@@ -569,7 +584,13 @@ dbug_off(int sig)
 int fork_for_dump = 0;
 
 static SIGNAL_RETURN_TYPE
-dump_strings (int sig) {
+#ifdef __STDC__
+dump_strings (int sig)
+#else
+dump_strings(sig)
+     int sig;
+#endif
+{
     FILE *fp;
     int oerrno = errno;
     fp = fopen ("/usr/tmp/zephyr.strings", "w");
@@ -589,7 +610,12 @@ dump_strings (int sig) {
 }
 
 static SIGNAL_RETURN_TYPE
+#ifdef __STDC__
 dump_db(int sig)
+#else
+dump_db(sig)
+     int sig;
+#endif
 {
 	/* dump the in-core database to human-readable form on disk */
 	FILE *fp;
@@ -629,7 +655,12 @@ dump_db(int sig)
 }
 
 static SIGNAL_RETURN_TYPE
+#ifdef __STDC__
 reset(int sig)
+#else
+reset(sig)
+     int sig;
+#endif
 {
 #if 1
 	zdbug((LOG_DEBUG,"reset()"));
@@ -643,7 +674,12 @@ reset(int sig)
 #endif
 
 static SIGNAL_RETURN_TYPE
+#ifdef __STDC__
 reap(int sig)
+#else
+reap(sig)
+     int sig;
+#endif
 {
 #ifdef _POSIX_SOURCE
   int waitb;
diff --git a/server/timer.c b/server/timer.c
index c625e44..c671c8b 100644
--- a/server/timer.c
+++ b/server/timer.c
@@ -90,7 +90,11 @@ static void timer_botch P((void*)), insert_timer P((timer)),
 
 timer timer_set_rel (time_rel, proc, arg)
      long time_rel;
+#ifdef __STDC__
      void (*proc)(void*);
+#else
+     void (*proc)();
+#endif
      void *arg;
 {
 	timer new_t;