From e6f38a9910b12825ca6597cbd1762adf0ce95676 Mon Sep 17 00:00:00 2001 From: Peter Howkins Date: Thu, 28 Jun 2018 03:54:49 +0100 Subject: [PATCH] libcsa: Change to ANSI function definitions --- cde/lib/csa/agent.c | 8 ++++---- cde/lib/csa/appt4.c | 2 +- cde/lib/csa/cmsdata.c | 2 +- cde/lib/csa/hash.c | 4 +--- cde/lib/csa/lutil.c | 6 +++--- cde/lib/csa/rescan.c | 2 +- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/cde/lib/csa/agent.c b/cde/lib/csa/agent.c index 888bdf39..1f521aa5 100644 --- a/cde/lib/csa/agent.c +++ b/cde/lib/csa/agent.c @@ -100,7 +100,7 @@ static void _FreeCallbackInfo(_CallbackInfo *ptr); * Register rpc service for server callback */ extern void -_DtCm_init_agent() +_DtCm_init_agent(void) { int s = RPC_ANYSOCK; @@ -178,7 +178,7 @@ _DtCm_init_agent() * Unregister with the rpc service. */ extern void -_DtCm_destroy_agent() +_DtCm_destroy_agent(void) { if (mapped == 0) return; @@ -198,7 +198,7 @@ _DtCm_destroy_agent() } extern void -_DtCm_process_updates() +_DtCm_process_updates(void) { #if defined(CSRG_BASED) || defined(__linux__) int i, nfd; @@ -460,7 +460,7 @@ gettransient (int proto, u_long vers, int *sockp) #endif /* not SunOS */ static void -_DtCm_handle_callback() +_DtCm_handle_callback(void) { _CallbackInfo *ptr, *prev; boolean_t keep = B_FALSE; diff --git a/cde/lib/csa/appt4.c b/cde/lib/csa/appt4.c index b5922bbd..cba01533 100644 --- a/cde/lib/csa/appt4.c +++ b/cde/lib/csa/appt4.c @@ -339,7 +339,7 @@ _DtCm_free_abbrev_appt4(Abb_Appt_4 *a) } Attribute_4 * -_DtCm_make_attr4() +_DtCm_make_attr4(void) { Attribute_4 *a; diff --git a/cde/lib/csa/cmsdata.c b/cde/lib/csa/cmsdata.c index 4581f180..947a0de6 100644 --- a/cde/lib/csa/cmsdata.c +++ b/cde/lib/csa/cmsdata.c @@ -130,7 +130,7 @@ _DtCm_free_cms_entries(cms_entry *entry) } extern void -_DtCm_init_hash() +_DtCm_init_hash(void) { static boolean_t done = B_FALSE; diff --git a/cde/lib/csa/hash.c b/cde/lib/csa/hash.c index c8e8ef88..2b16e017 100644 --- a/cde/lib/csa/hash.c +++ b/cde/lib/csa/hash.c @@ -225,9 +225,7 @@ void _DtCmDestroyHash(void * t, int (*ptr)(), void * usr_arg) free(tbl); } -static int hash_string(s,modulo) -register char *s; -int modulo; +static int hash_string(char *s, int modulo) { register unsigned result = 0; register int i=1; diff --git a/cde/lib/csa/lutil.c b/cde/lib/csa/lutil.c index c7eb6b51..0ec4a31e 100644 --- a/cde/lib/csa/lutil.c +++ b/cde/lib/csa/lutil.c @@ -75,7 +75,7 @@ _DtCmGetPrefix(char *str, char sep) } extern char * -_DtCmGetLocalHost() +_DtCmGetLocalHost(void) { static char *host = NULL; @@ -136,7 +136,7 @@ _DtCmGetLocalDomain(char *hostname) } extern char * -_DtCmGetHostAtDomain() +_DtCmGetHostAtDomain(void) { static char *hostname = NULL; char *host; @@ -157,7 +157,7 @@ _DtCmGetHostAtDomain() } extern char * -_DtCmGetUserName() +_DtCmGetUserName(void) { static char *name = NULL; _Xgetpwparams pwd_buf; diff --git a/cde/lib/csa/rescan.c b/cde/lib/csa/rescan.c index 369dc618..623d0cb4 100644 --- a/cde/lib/csa/rescan.c +++ b/cde/lib/csa/rescan.c @@ -68,7 +68,7 @@ char *_DtCm_rule_buf; char _DtCm_yytext[128]; int -_DtCm_yylex() +_DtCm_yylex(void) { int token = 0; int yylen = 128; -- 2.25.1