From 50952233d0396d00f815a9b9daf924d377f1d8ff Mon Sep 17 00:00:00 2001
From: Peter Howkins <flibble@users.sf.net>
Date: Wed, 7 Nov 2018 01:57:40 +0000
Subject: [PATCH] libcsa: Resolve all strict-prototype and missing-prototype
 warnings

---
 cde/lib/csa/agent.c      | 16 ++++++++++------
 cde/lib/csa/agent_p.h    |  6 +++---
 cde/lib/csa/appt4.h      |  6 +++---
 cde/lib/csa/cmsdata.h    |  2 +-
 cde/lib/csa/cmxdr.c      |  3 +++
 cde/lib/csa/connection.h |  2 --
 cde/lib/csa/debug.c      |  1 +
 cde/lib/csa/free.h       |  2 +-
 cde/lib/csa/hash.c       |  6 +++---
 cde/lib/csa/hash.h       |  2 +-
 cde/lib/csa/lutil.c      |  1 +
 cde/lib/csa/lutil.h      |  6 +++---
 cde/lib/csa/reparser.y   |  2 +-
 cde/lib/csa/rescan.c     |  2 ++
 cde/lib/csa/rtable2.h    |  2 +-
 cde/lib/csa/rtable3.h    |  2 +-
 cde/lib/csa/rtable4.h    |  2 +-
 cde/lib/csa/table.c      |  1 +
 cde/lib/csa/xtclient.c   |  1 +
 19 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/cde/lib/csa/agent.c b/cde/lib/csa/agent.c
index 1f521aa5..216e0ec6 100644
--- a/cde/lib/csa/agent.c
+++ b/cde/lib/csa/agent.c
@@ -48,6 +48,7 @@
 #include <X11/Intrinsic.h>
 
 #include "agent.h"
+#include "agent_p.h"
 #include "cmcb.h"
 #include "entry.h"
 #include "debug.h"
@@ -83,7 +84,7 @@ static u_long gettransient (u_long version);
 #else
 static u_long gettransient (int proto, u_long vers, int *sockp);
 #endif
-static void _DtCm_handle_callback();
+static void _DtCm_handle_callback(void);
 static CSA_return_code _ConvertCallbackData(cmcb_update_callback_args *args,
 					_CallbackInfo **cbi);
 static CSA_return_code _CopyAttributeNames(uint fnum, char **fnames,
@@ -91,6 +92,9 @@ static CSA_return_code _CopyAttributeNames(uint fnum, char **fnames,
 static boolean_t _ProcessV1Callback(_CallbackInfo *ptr);
 static boolean_t _ProcessV2Callback(_CallbackInfo *ptr);
 static void _FreeCallbackInfo(_CallbackInfo *ptr);
+void _DtCm_init_agent(void);
+
+
 
 /*****************************************************************************
  * extern functions used in the library
@@ -99,7 +103,7 @@ static void _FreeCallbackInfo(_CallbackInfo *ptr);
 /*
  * Register rpc service for server callback
  */
-extern void
+void
 _DtCm_init_agent(void)
 {
 	int 		s = RPC_ANYSOCK;
@@ -113,7 +117,7 @@ _DtCm_init_agent(void)
 #if defined(SunOS)
 	extern void (*sigset(int, void (*)(int)))(int);
 #else
-	extern void (*sigset())();
+	extern void (*sigset(void))(void);
 #endif
 
 	/* locking candidate for MT-safe purpose */
@@ -155,14 +159,14 @@ _DtCm_init_agent(void)
 	}
  
 	if (registerrpc(_DtCm_transient, AGENTVERS, update_callback,
-	    (char *(*)())_DtCm_update_callback_1, (xdrproc_t)_DtCm_xdr_Table_Res_4,
+	    (char *(*)(char *))_DtCm_update_callback_1, (xdrproc_t)_DtCm_xdr_Table_Res_4,
 	    (xdrproc_t)_DtCm_xdr_Update_Status) == -1) {
 		_DtCm_print_errmsg("Cannot register v1 callback handler\n");
 		_DtCm_print_errmsg("Callback cannot be enabled.\n");
 	}
 
 	if (registerrpc(_DtCm_transient, AGENTVERS_2, CMCB_UPDATE_CALLBACK,
-	    (char *(*)())cmcb_update_callback_2_svc,
+	    (char *(*)(char *))cmcb_update_callback_2_svc,
 	    (xdrproc_t)xdr_cmcb_update_callback_args, (xdrproc_t)xdr_void) == -1) {
 		_DtCm_print_errmsg("Cannot register v2 callback handler\n");
 		_DtCm_print_errmsg("Callback cannot be enabled.\n");
@@ -177,7 +181,7 @@ _DtCm_init_agent(void)
 /*
  * Unregister with the rpc service.
  */
-extern void
+void
 _DtCm_destroy_agent(void)
 {
 	if (mapped == 0)
diff --git a/cde/lib/csa/agent_p.h b/cde/lib/csa/agent_p.h
index f38d148e..9ed8846c 100644
--- a/cde/lib/csa/agent_p.h
+++ b/cde/lib/csa/agent_p.h
@@ -33,8 +33,8 @@
 
 #include "ansi_c.h"
 
-extern void _DtCm_init_agent P(());
-extern void _DtCm_destroy_agent P(());
-extern void _DtCm_process_updates P(());
+extern void _DtCm_init_agent P((void));
+extern void _DtCm_destroy_agent P((void));
+extern void _DtCm_process_updates P((void));
 
 #endif /* _AGENT_P_H */
diff --git a/cde/lib/csa/appt4.h b/cde/lib/csa/appt4.h
index a02b1c62..852567da 100644
--- a/cde/lib/csa/appt4.h
+++ b/cde/lib/csa/appt4.h
@@ -38,7 +38,7 @@
 #include "rtable4.h"
 #include "ansi_c.h"
 
-extern Appt_4 *_DtCm_make_appt4 P(());
+extern Appt_4 *_DtCm_make_appt4 P((boolean_t alloc));
 
 extern Appt_4 *_DtCm_copy_one_appt4 P((Appt_4 *a4));
 
@@ -56,7 +56,7 @@ extern void _DtCm_free_appt4 P((Appt_4 *a));
 
 extern void _DtCm_free_abbrev_appt4 P((Abb_Appt_4 *a));
 
-extern Attribute_4 * _DtCm_make_attr4 P(());
+extern Attribute_4 * _DtCm_make_attr4 P((void));
 
 extern void _DtCm_free_attr4 P((Attribute_4 *a));
 
@@ -74,6 +74,6 @@ extern void _DtCm_free_access_list4 P((Access_Entry_4 *l));
 
 extern void _DtCm_free_excpt4 P((Except_4 *e));
 
-extern char * _DtCm_get_default_what_string P(());
+extern char * _DtCm_get_default_what_string P((void));
 
 #endif
diff --git a/cde/lib/csa/cmsdata.h b/cde/lib/csa/cmsdata.h
index 57c194c8..b133612f 100644
--- a/cde/lib/csa/cmsdata.h
+++ b/cde/lib/csa/cmsdata.h
@@ -40,7 +40,7 @@
 extern _DtCmNameTable *_DtCm_cal_name_tbl;
 extern _DtCmNameTable *_DtCm_entry_name_tbl;
 
-extern void _DtCm_init_hash P(());
+extern void _DtCm_init_hash P((void));
 
 extern cms_entry *_DtCm_make_cms_entry P((_DtCmNameTable *tbl));
 
diff --git a/cde/lib/csa/cmxdr.c b/cde/lib/csa/cmxdr.c
index 5e6b0128..27781fb3 100644
--- a/cde/lib/csa/cmxdr.c
+++ b/cde/lib/csa/cmxdr.c
@@ -37,6 +37,9 @@
 #include "csa.h" 
 #include "cmxdr.h"
 
+extern bool_t xdr_time_t(XDR *xdrs, time_t *objp);
+bool_t xdr_cms_attribute_value(XDR *xdrs, cms_attribute_value *objp);
+
 /* Functions generated by rtable4.x */
 /*
  * time_t is a typedef which is system dependent
diff --git a/cde/lib/csa/connection.h b/cde/lib/csa/connection.h
index 1cfc4c01..963e3631 100644
--- a/cde/lib/csa/connection.h
+++ b/cde/lib/csa/connection.h
@@ -72,7 +72,6 @@ typedef struct conn {
 	enum clnt_stat	stat;
 } _DtCm_Connection;
 
-#ifdef SunOS
 extern enum clnt_stat _DtCm_clnt_call P((
 				_DtCm_Connection *conn,
 				u_long proc,
@@ -81,7 +80,6 @@ extern enum clnt_stat _DtCm_clnt_call P((
 				xdrproc_t outproc,
 				caddr_t out,
 				struct timeval tout));
-#endif
 
 extern CSA_return_code _DtCm_add_registration P((
 				_DtCm_Client_Info *ci,
diff --git a/cde/lib/csa/debug.c b/cde/lib/csa/debug.c
index 62891773..d04bba47 100644
--- a/cde/lib/csa/debug.c
+++ b/cde/lib/csa/debug.c
@@ -42,6 +42,7 @@
 #endif
 
 #include <syslog.h>
+#include <debug.h>
 
 static int inited = 0;
 
diff --git a/cde/lib/csa/free.h b/cde/lib/csa/free.h
index a05612ef..ce15ab26 100644
--- a/cde/lib/csa/free.h
+++ b/cde/lib/csa/free.h
@@ -45,7 +45,7 @@ extern CSA_entry_handle *_DtCm_alloc_entry_handles(uint num_elem);
 
 extern CSA_reminder_reference *_DtCm_alloc_reminder_references(uint num_elem);
 
-extern void *_DtCm_alloc_entry();
+extern void *_DtCm_alloc_entry(uint size);
 
 extern CSA_return_code _DtCm_free(void *ptr);
 
diff --git a/cde/lib/csa/hash.c b/cde/lib/csa/hash.c
index 826112be..79fa6314 100644
--- a/cde/lib/csa/hash.c
+++ b/cde/lib/csa/hash.c
@@ -101,7 +101,7 @@ Author:  Bart Smaalders 1/89
 #include <string.h>
 #include "hash.h"
 
-static int    hash_string();
+static int    hash_string(const char *s, int modulo);
 
 typedef struct hash_entry {
   struct hash_entry 
@@ -205,7 +205,7 @@ void ** _DtCmFindHash(void * t, const unsigned char * key)
   return(NULL);
 }
 
-void _DtCmDestroyHash(void * t, int (*ptr)(), void * usr_arg)
+void _DtCmDestroyHash(void * t, int (*ptr)(void *, void *, unsigned char *), void * usr_arg)
 {
   hash * tbl = (hash *) t;
   hash_entry * tmp = tbl->start, * prev;
@@ -225,7 +225,7 @@ void _DtCmDestroyHash(void * t, int (*ptr)(), void * usr_arg)
   free(tbl);
 }
 
-static int hash_string(char *s, int modulo)
+static int hash_string(const char *s, int modulo)
 {
 	unsigned result = 0;
 	int i=1;
diff --git a/cde/lib/csa/hash.h b/cde/lib/csa/hash.h
index 47f8862e..df399421 100644
--- a/cde/lib/csa/hash.h
+++ b/cde/lib/csa/hash.h
@@ -39,7 +39,7 @@ extern void ** _DtCmGetHash P((void * tbl, const unsigned char * key));
 
 extern void ** _DtCmFindHash P((void * tbl,const unsigned char * key));
 
-extern void _DtCmDestroyHash P((void * tbl, int (*des_func)(), void * usr_arg));
+extern void _DtCmDestroyHash P((void * tbl, int (*des_func)(void *, void *, unsigned char *), void * usr_arg));
 
 #endif /* _HASH_H */
 
diff --git a/cde/lib/csa/lutil.c b/cde/lib/csa/lutil.c
index 0ec4a31e..b43044b4 100644
--- a/cde/lib/csa/lutil.c
+++ b/cde/lib/csa/lutil.c
@@ -49,6 +49,7 @@
 #if defined(__linux__)
 #define SVR4
 #endif
+#include "lutil.h"
 
 #if !defined(__linux__)
 extern char * strdup(const char *);
diff --git a/cde/lib/csa/lutil.h b/cde/lib/csa/lutil.h
index 0a1ae552..174ccc0b 100644
--- a/cde/lib/csa/lutil.h
+++ b/cde/lib/csa/lutil.h
@@ -35,13 +35,13 @@
 
 extern char *_DtCmGetPrefix P((char *str, char sep));
 
-extern char *_DtCmGetLocalHost P(());
+extern char *_DtCmGetLocalHost P((void));
 
 extern char *_DtCmGetLocalDomain P((char *hostname));
 
-extern char *_DtCmGetHostAtDomain P(());
+extern char *_DtCmGetHostAtDomain P((void));
 
-extern char *_DtCmGetUserName P(());
+extern char *_DtCmGetUserName P((void));
 
 extern boolean_t _DtCmIsUserName P((char *user));
 
diff --git a/cde/lib/csa/reparser.y b/cde/lib/csa/reparser.y
index 8849be8a..2426b53d 100644
--- a/cde/lib/csa/reparser.y
+++ b/cde/lib/csa/reparser.y
@@ -19,7 +19,7 @@
 /* The parsed rule is stored in this structure */
 RepeatEvent	*_DtCm_repeat_info;
 
-extern int		 yylex();
+extern int		 yylex(void);
 extern void		 yyerror(char*);
 
 static int CompareNums(const void *, const void *);
diff --git a/cde/lib/csa/rescan.c b/cde/lib/csa/rescan.c
index 623d0cb4..3f00108e 100644
--- a/cde/lib/csa/rescan.c
+++ b/cde/lib/csa/rescan.c
@@ -67,6 +67,8 @@ char     *_DtCm_rule_buf;
 
 char      _DtCm_yytext[128];
 
+int _DtCm_yylex(void);
+
 int
 _DtCm_yylex(void)
 {
diff --git a/cde/lib/csa/rtable2.h b/cde/lib/csa/rtable2.h
index a1f777e1..2253f24c 100644
--- a/cde/lib/csa/rtable2.h
+++ b/cde/lib/csa/rtable2.h
@@ -58,7 +58,7 @@ extern "C" {
 
 #include "connection.h"
 
-extern bool_t xdr_time_t();
+extern bool_t xdr_time_t(XDR *xdrs, time_t *objp);
 
 typedef char *Buffer_2;
 
diff --git a/cde/lib/csa/rtable3.h b/cde/lib/csa/rtable3.h
index fd077051..b0010090 100644
--- a/cde/lib/csa/rtable3.h
+++ b/cde/lib/csa/rtable3.h
@@ -57,7 +57,7 @@ extern "C" {
 
 #include "connection.h"
 
-extern bool_t xdr_time_t();
+extern bool_t xdr_time_t(XDR *xdrs, time_t *objp);
 
 typedef char *Buffer_3;
 
diff --git a/cde/lib/csa/rtable4.h b/cde/lib/csa/rtable4.h
index bec33176..9fc2f92c 100644
--- a/cde/lib/csa/rtable4.h
+++ b/cde/lib/csa/rtable4.h
@@ -61,7 +61,7 @@ extern "C" {
 
 #include "connection.h"
 
-extern bool_t xdr_time_t();
+extern bool_t xdr_time_t(XDR *xdrs, time_t *objp);
 
 typedef char *Buffer_4;
 
diff --git a/cde/lib/csa/table.c b/cde/lib/csa/table.c
index 454d893a..c797bd7c 100644
--- a/cde/lib/csa/table.c
+++ b/cde/lib/csa/table.c
@@ -53,6 +53,7 @@
 #include "nametbl.h"
 #include "match.h"
 #include "iso8601.h"
+#include "table.h"
 
 extern u_long	_DtCm_transient;
 
diff --git a/cde/lib/csa/xtclient.c b/cde/lib/csa/xtclient.c
index 6f7c1592..7574a6f2 100644
--- a/cde/lib/csa/xtclient.c
+++ b/cde/lib/csa/xtclient.c
@@ -33,6 +33,7 @@
 #include <X11/Intrinsic.h>
 #include <rpc/rpc.h>
 #include "debug.h"
+#include "xtclient.h"
 
 typedef struct _appctlist {
 	XtAppContext	appct;
-- 
2.25.1