From f4eb62fa6999f8f07700474dc024b1637016be8e Mon Sep 17 00:00:00 2001 From: Peter Howkins Date: Sat, 1 Aug 2020 22:45:55 +0100 Subject: [PATCH] libcsa: Resolve all strict-prototype warnings --- cde/lib/csa/agent.c | 12 +++--------- cde/lib/csa/agent_p.h | 6 +++--- cde/lib/csa/appt4.h | 6 ++---- cde/lib/csa/cmsdata.h | 2 +- cde/lib/csa/free.h | 2 +- cde/lib/csa/hash.c | 6 +++--- cde/lib/csa/hash.h | 2 +- cde/lib/csa/lutil.h | 6 +++--- cde/lib/csa/reparser.y | 2 +- cde/lib/csa/rtable2.h | 2 +- cde/lib/csa/rtable3.h | 2 +- cde/lib/csa/rtable4.h | 2 +- 12 files changed, 21 insertions(+), 29 deletions(-) diff --git a/cde/lib/csa/agent.c b/cde/lib/csa/agent.c index 1f521aa5f..7f6210efe 100644 --- a/cde/lib/csa/agent.c +++ b/cde/lib/csa/agent.c @@ -83,7 +83,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, @@ -110,12 +110,6 @@ _DtCm_init_agent(void) const char *); #endif -#if defined(SunOS) - extern void (*sigset(int, void (*)(int)))(int); -#else - extern void (*sigset())(); -#endif - /* locking candidate for MT-safe purpose */ if (mapped == 1) return; @@ -155,14 +149,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"); diff --git a/cde/lib/csa/agent_p.h b/cde/lib/csa/agent_p.h index f38d148e5..9ed8846c9 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 a02b1c62d..9a2dda97f 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,4 @@ 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(()); - #endif diff --git a/cde/lib/csa/cmsdata.h b/cde/lib/csa/cmsdata.h index 57c194c82..b133612f8 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/free.h b/cde/lib/csa/free.h index a05612ef0..a90a2b800 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 num_elem); extern CSA_return_code _DtCm_free(void *ptr); diff --git a/cde/lib/csa/hash.c b/cde/lib/csa/hash.c index 826112be8..79fa6314f 100644 --- a/cde/lib/csa/hash.c +++ b/cde/lib/csa/hash.c @@ -101,7 +101,7 @@ Author: Bart Smaalders 1/89 #include #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 47f8862e1..8597b3a5d 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 * t, int (*ptr)(void *, void *, unsigned char *), void * usr_arg)); #endif /* _HASH_H */ diff --git a/cde/lib/csa/lutil.h b/cde/lib/csa/lutil.h index 0a1ae552c..174ccc0b2 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 8849be8a9..2426b53d4 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/rtable2.h b/cde/lib/csa/rtable2.h index a1f777e12..2253f24c6 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 fd0770515..b00100902 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 bec331762..9fc2f92c8 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;