debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dtcm: Change to ANSI function definitions

Browse Source
This commit is contained in:
Peter Howkins
2018-06-28 04:10:42 +01:00
parent 7936fae07b
commit 35dc4283e4
20 changed files with 101 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cde/programs/dtcm/server/cmscalendar.c
View File

@@ -612,7 +612,7 @@ _DtCmsRbToCsaStat(Rb_Status rb_stat)
}
extern void
garbage_collect()
garbage_collect(void)
{
unsigned remain;
_DtCmsCalendar *clist = calendar_list;
@@ -644,7 +644,7 @@ garbage_collect()
}
extern void
debug_switch()
debug_switch(void)
{
_DtCmsCalendar *clist = calendar_list;
Access_Entry_4 *l;

2
cde/programs/dtcm/server/cmsconvert.c
View File

@@ -839,7 +839,7 @@ _AttrsToAbbrAppt(uint size, cms_attribute *attrs, Abb_Appt_4 *appt)
}
static Abb_Appt_4 *
_MakeAbbrAppt()
_MakeAbbrAppt(void)
{
Abb_Appt_4 *a;

4
cde/programs/dtcm/server/lexit.c
View File

@@ -193,7 +193,7 @@ static u_int sendit_value[255];
*/
static void
init()
init(void)
{
int i;
@@ -264,7 +264,7 @@ init()
}
extern int
yyylex()
yyylex(void)
{
static int first_time=1;

4
cde/programs/dtcm/server/programtable.c
View File

@@ -56,7 +56,7 @@ program_object po = {
program_handle program = &po;
program_handle newph()
program_handle newph(void)
{
extern void initrtable2();
extern void initrtable3();
@@ -71,7 +71,7 @@ program_handle newph()
return(program);
}
program_handle getph()
program_handle getph(void)
{
return(program);
}

2
cde/programs/dtcm/server/repeat.c
View File

@@ -123,7 +123,7 @@ static time_t prevdaysofweek(time_t t, int weekmask);
* of the routines in this file and the caller of these routines.
*/
extern void
init_time()
init_time(void)
{
struct tm tm, gm;
time_t t;

79
cde/programs/dtcm/server/rtable2.c
View File

@@ -50,18 +50,14 @@
/*************** V2 PROTOCOL IMPLEMENTATION PROCS *****************/
extern void *
_DtCm_rtable_ping_2_svc(args, svcrq)
void *args;
struct svc_req *svcrq;
_DtCm_rtable_ping_2_svc(void *args, struct svc_req *svcrq)
{
return(NULL); /* for RPC reply */
}
/* PROC #1 */
extern Table_Res_2 *
_DtCm_rtable_lookup_2_svc (args, svcrq)
Table_Args_2 *args;
struct svc_req *svcrq;
_DtCm_rtable_lookup_2_svc (Table_Args_2 *args, struct svc_req *svcrq)
{
static Table_Res_2 *res = NULL;
Table_Args_4 *newargs;
@@ -81,9 +77,7 @@ struct svc_req *svcrq;
/* PROC #2 */
extern Table_Res_2 *
_DtCm_rtable_lookup_next_larger_2_svc(args, svcrq)
Table_Args_2 *args;
struct svc_req *svcrq;
_DtCm_rtable_lookup_next_larger_2_svc(Table_Args_2 *args, struct svc_req *svcrq)
{
static Table_Res_2 *res = NULL;
Table_Args_4 *newargs;
@@ -104,9 +98,7 @@ struct svc_req *svcrq;
/* PROC #3 */
extern Table_Res_2 *
_DtCm_rtable_lookup_next_smaller_2_svc(args, svcrq)
Table_Args_2 *args;
struct svc_req *svcrq;
_DtCm_rtable_lookup_next_smaller_2_svc(Table_Args_2 *args, struct svc_req *svcrq)
{
static Table_Res_2 *res = NULL;
Table_Args_4 *newargs;
@@ -127,9 +119,7 @@ struct svc_req *svcrq;
/* PROC #4 */
extern Table_Res_2 *
_DtCm_rtable_lookup_range_2_svc(args, svcrq)
Table_Args_2 *args;
struct svc_req *svcrq;
_DtCm_rtable_lookup_range_2_svc(Table_Args_2 *args, struct svc_req *svcrq)
{
static Table_Res_2 *res = NULL;
Table_Args_4 *newargs;
@@ -149,9 +139,7 @@ struct svc_req *svcrq;
/* PROC #5 */
extern Table_Res_2 *
_DtCm_rtable_abbreviated_lookup_range_2_svc(args, svcrq)
Table_Args_2 *args;
struct svc_req *svcrq;
_DtCm_rtable_abbreviated_lookup_range_2_svc(Table_Args_2 *args, struct svc_req *svcrq)
{
static Table_Res_2 *res = NULL;
Table_Args_4 *newargs;
@@ -171,9 +159,7 @@ struct svc_req *svcrq;
/* PROC #6 */
extern Table_Res_2 *
_DtCm_rtable_insert_2_svc(args, svcrq)
Table_Args_2 *args;
struct svc_req *svcrq;
_DtCm_rtable_insert_2_svc(Table_Args_2 *args, struct svc_req *svcrq)
{
static Table_Res_2 *res = NULL;
Table_Args_4 *newargs;
@@ -193,9 +179,7 @@ struct svc_req *svcrq;
/* PROC #7 */
extern Table_Res_2 *
_DtCm_rtable_delete_2_svc(args, svcrq)
Table_Args_2 *args;
struct svc_req *svcrq;
_DtCm_rtable_delete_2_svc(Table_Args_2 *args, struct svc_req *svcrq)
{
static Table_Res_2 *res = NULL;
Table_Args_4 *newargs;
@@ -214,9 +198,7 @@ struct svc_req *svcrq;
/* PROC #8 */
extern Table_Res_2 *
_DtCm_rtable_delete_instance_2_svc(args, svcrq)
Table_Args_2 *args;
struct svc_req *svcrq;
_DtCm_rtable_delete_instance_2_svc(Table_Args_2 *args, struct svc_req *svcrq)
{
static Table_Res_2 *res = NULL;
Table_Args_4 *newargs;
@@ -235,9 +217,7 @@ struct svc_req *svcrq;
/* PROC #9 */
extern Table_Res_2 *
_DtCm_rtable_change_2_svc(args, svcrq)
Table_Args_2 *args;
struct svc_req *svcrq;
_DtCm_rtable_change_2_svc(Table_Args_2 *args, struct svc_req *svcrq)
{
static Table_Res_2 *res = NULL;
Table_Args_4 *newargs;
@@ -257,9 +237,7 @@ struct svc_req *svcrq;
/* PROC #10 */
extern Table_Res_2 *
_DtCm_rtable_change_instance_2_svc(args, svcrq)
Table_Args_2 *args;
struct svc_req *svcrq;
_DtCm_rtable_change_instance_2_svc(Table_Args_2 *args, struct svc_req *svcrq)
{
static Table_Res_2 *res = NULL;
Table_Args_4 *newargs;
@@ -279,9 +257,7 @@ struct svc_req *svcrq;
/* PROC #11 */
extern Table_Res_2 *
_DtCm_rtable_lookup_next_reminder_2_svc(args, svcrq)
Table_Args_2 *args;
struct svc_req *svcrq;
_DtCm_rtable_lookup_next_reminder_2_svc(Table_Args_2 *args, struct svc_req *svcrq)
{
static Table_Res_2 *res = NULL;
Table_Args_4 *newargs;
@@ -301,9 +277,7 @@ struct svc_req *svcrq;
/* PROC #12 */
extern Table_Status_2 *
_DtCm_rtable_check_2_svc(args, svcrq)
Table_Args_2 *args;
struct svc_req *svcrq;
_DtCm_rtable_check_2_svc(Table_Args_2 *args, struct svc_req *svcrq)
{
static Table_Status_2 res;
Table_Args_4 *newargs;
@@ -321,9 +295,7 @@ struct svc_req *svcrq;
/* PROC #13 */
extern Table_Status_2 *
_DtCm_rtable_flush_table_2_svc(args, svcrq)
Table_Args_2 *args;
struct svc_req *svcrq;
_DtCm_rtable_flush_table_2_svc(Table_Args_2 *args, struct svc_req *svcrq)
{
static Table_Status_2 res;
Table_Args_4 *newargs;
@@ -341,9 +313,7 @@ struct svc_req *svcrq;
/* PROC #14 */
extern int *
_DtCm_rtable_size_2_svc(args, svcrq)
Table_Args_2 *args;
struct svc_req *svcrq;
_DtCm_rtable_size_2_svc(Table_Args_2 *args, struct svc_req *svcrq)
{
static int size;
Table_Args_4 *newargs;
@@ -358,9 +328,7 @@ struct svc_req *svcrq;
/* PROC #15 */
Registration_Status_2 *
_DtCm_register_callback_2_svc(r, svcrq)
Registration_2 *r;
struct svc_req *svcrq;
_DtCm_register_callback_2_svc(Registration_2 *r, struct svc_req *svcrq)
{
static Registration_Status_2 stat;
Registration_4 *newreg;
@@ -377,9 +345,7 @@ struct svc_req *svcrq;
/* PROC #16 */
Registration_Status_2 *
_DtCm_deregister_callback_2_svc(r, svcrq)
Registration_2 *r;
struct svc_req *svcrq;
_DtCm_deregister_callback_2_svc(Registration_2 *r, struct svc_req *svcrq)
{
static Registration_Status_2 stat;
Registration_4 *newreg;
@@ -396,9 +362,7 @@ struct svc_req *svcrq;
/* PROC #17 */
extern Access_Status_2 *
_DtCm_rtable_set_access_2_svc(args, svcrq)
Access_Args_2 *args;
struct svc_req *svcrq;
_DtCm_rtable_set_access_2_svc(Access_Args_2 *args, struct svc_req *svcrq)
{
static Access_Status_2 stat;
Access_Args_4 *newargs;
@@ -415,9 +379,7 @@ struct svc_req *svcrq;
/* PROC #18 */
extern Access_Args_2 *
_DtCm_rtable_get_access_2_svc(args, svcrq)
Access_Args_2 *args;
struct svc_req *svcrq;
_DtCm_rtable_get_access_2_svc(Access_Args_2 *args, struct svc_req *svcrq)
{
static Access_Args_2 *res = NULL;
Access_Args_4 *newargs;
@@ -435,8 +397,7 @@ struct svc_req *svcrq;
return(res);
}
void initrtable2(ph)
program_handle ph;
void initrtable2(program_handle ph)
{
int ver = TABLEVERS_2;
ph->program_num = TABLEPROG;

87
cde/programs/dtcm/server/rtable3.c
View File

@@ -50,18 +50,14 @@
/*************** V3 PROTOCOL IMPLEMENTATION PROCS *****************/
extern void *
_DtCm_rtable_ping_3_svc(args, svcrq)
void *args;
struct svc_req *svcrq;
_DtCm_rtable_ping_3_svc(void *args, struct svc_req *svcrq)
{
return(NULL); /* for RPC reply */
}
/* PROC #1 */
extern Table_Res_3 *
_DtCm_rtable_lookup_3_svc (args, svcrq)
Table_Args_3 *args;
struct svc_req *svcrq;
_DtCm_rtable_lookup_3_svc (Table_Args_3 *args, struct svc_req *svcrq)
{
static Table_Res_3 *res = NULL;
Table_Args_4 *newargs;
@@ -80,9 +76,7 @@ struct svc_req *svcrq;
/* PROC #2 */
extern Table_Res_3 *
_DtCm_rtable_lookup_next_larger_3_svc(args, svcrq)
Table_Args_3 *args;
struct svc_req *svcrq;
_DtCm_rtable_lookup_next_larger_3_svc(Table_Args_3 *args, struct svc_req *svcrq)
{
static Table_Res_3 *res = NULL;
Table_Args_4 *newargs;
@@ -101,9 +95,7 @@ struct svc_req *svcrq;
/* PROC #3 */
extern Table_Res_3 *
_DtCm_rtable_lookup_next_smaller_3_svc(args, svcrq)
Table_Args_3 *args;
struct svc_req *svcrq;
_DtCm_rtable_lookup_next_smaller_3_svc(Table_Args_3 *args, struct svc_req *svcrq)
{
static Table_Res_3 *res = NULL;
Table_Args_4 *newargs;
@@ -122,9 +114,7 @@ struct svc_req *svcrq;
/* PROC #4 */
extern Table_Res_3 *
_DtCm_rtable_lookup_range_3_svc(args, svcrq)
Table_Args_3 *args;
struct svc_req *svcrq;
_DtCm_rtable_lookup_range_3_svc(Table_Args_3 *args, struct svc_req *svcrq)
{
static Table_Res_3 *res = NULL;
Table_Args_4 *newargs;
@@ -143,9 +133,7 @@ struct svc_req *svcrq;
/* PROC #5 */
extern Table_Res_3 *
_DtCm_rtable_abbreviated_lookup_range_3_svc(args, svcrq)
Table_Args_3 *args;
struct svc_req *svcrq;
_DtCm_rtable_abbreviated_lookup_range_3_svc(Table_Args_3 *args, struct svc_req *svcrq)
{
static Table_Res_3 *res = NULL;
Table_Args_4 *newargs;
@@ -164,9 +152,7 @@ struct svc_req *svcrq;
/* PROC #6 */
extern Table_Res_3 *
_DtCm_rtable_insert_3_svc(args, svcrq)
Table_Args_3 *args;
struct svc_req *svcrq;
_DtCm_rtable_insert_3_svc(Table_Args_3 *args, struct svc_req *svcrq)
{
static Table_Res_3 *res = NULL;
Table_Args_4 *newargs;
@@ -185,9 +171,7 @@ struct svc_req *svcrq;
/* PROC #7 */
extern Table_Res_3 *
_DtCm_rtable_delete_3_svc(args, svcrq)
Table_Args_3 *args;
struct svc_req *svcrq;
_DtCm_rtable_delete_3_svc(Table_Args_3 *args, struct svc_req *svcrq)
{
static Table_Res_3 *res = NULL;
Table_Args_4 *newargs;
@@ -206,9 +190,7 @@ struct svc_req *svcrq;
/* PROC #8 */
extern Table_Res_3 *
_DtCm_rtable_delete_instance_3_svc(args, svcrq)
Table_Args_3 *args;
struct svc_req *svcrq;
_DtCm_rtable_delete_instance_3_svc(Table_Args_3 *args, struct svc_req *svcrq)
{
static Table_Res_3 *res = NULL;
Table_Args_4 *newargs;
@@ -227,9 +209,7 @@ struct svc_req *svcrq;
/* PROC #9 */
extern Table_Res_3 *
_DtCm_rtable_change_3_svc(args, svcrq)
Table_Args_3 *args;
struct svc_req *svcrq;
_DtCm_rtable_change_3_svc(Table_Args_3 *args, struct svc_req *svcrq)
{
static Table_Res_3 *res = NULL;
Table_Args_4 *newargs;
@@ -249,9 +229,7 @@ struct svc_req *svcrq;
/* PROC #10 */
extern Table_Res_3 *
_DtCm_rtable_change_instance_3_svc(args, svcrq)
Table_Args_3 *args;
struct svc_req *svcrq;
_DtCm_rtable_change_instance_3_svc(Table_Args_3 *args, struct svc_req *svcrq)
{
static Table_Res_3 *res = NULL;
Table_Args_4 *newargs;
@@ -271,9 +249,7 @@ struct svc_req *svcrq;
/* PROC #11 */
extern Table_Res_3 *
_DtCm_rtable_lookup_next_reminder_3_svc(args, svcrq)
Table_Args_3 *args;
struct svc_req *svcrq;
_DtCm_rtable_lookup_next_reminder_3_svc(Table_Args_3 *args, struct svc_req *svcrq)
{
static Table_Res_3 *res = NULL;
Table_Args_4 *newargs;
@@ -292,9 +268,7 @@ struct svc_req *svcrq;
/* PROC #12 */
extern Table_Status_3 *
_DtCm_rtable_check_3_svc(args, svcrq)
Table_Args_3 *args;
struct svc_req *svcrq;
_DtCm_rtable_check_3_svc(Table_Args_3 *args, struct svc_req *svcrq)
{
static Table_Status_3 res;
Table_Args_4 *newargs;
@@ -311,9 +285,7 @@ struct svc_req *svcrq;
/* PROC #13 */
extern Table_Status_3 *
_DtCm_rtable_flush_table_3_svc(args, svcrq)
Table_Args_3 *args;
struct svc_req *svcrq;
_DtCm_rtable_flush_table_3_svc(Table_Args_3 *args, struct svc_req *svcrq)
{
static Table_Status_3 res;
Table_Args_4 *newargs;
@@ -330,9 +302,7 @@ struct svc_req *svcrq;
/* PROC #14 */
extern int *
_DtCm_rtable_size_3_svc(args, svcrq)
Table_Args_3 *args;
struct svc_req *svcrq;
_DtCm_rtable_size_3_svc(Table_Args_3 *args, struct svc_req *svcrq)
{
static int size;
Table_Args_4 *newargs;
@@ -347,9 +317,7 @@ struct svc_req *svcrq;
/* PROC #15 */
Registration_Status_3 *
_DtCm_register_callback_3_svc(r, svcrq)
Registration_3 *r;
struct svc_req *svcrq;
_DtCm_register_callback_3_svc(Registration_3 *r, struct svc_req *svcrq)
{
static Registration_Status_3 stat;
Registration_4 *newreg;
@@ -365,9 +333,7 @@ struct svc_req *svcrq;
/* PROC #16 */
Registration_Status_3 *
_DtCm_deregister_callback_3_svc(r, svcrq)
Registration_3 *r;
struct svc_req *svcrq;
_DtCm_deregister_callback_3_svc(Registration_3 *r, struct svc_req *svcrq)
{
static Registration_Status_3 stat;
Registration_4 *newreg;
@@ -383,9 +349,7 @@ struct svc_req *svcrq;
/* PROC #17 */
extern Access_Status_3 *
_DtCm_rtable_set_access_3_svc(args, svcrq)
Access_Args_3 *args;
struct svc_req *svcrq;
_DtCm_rtable_set_access_3_svc(Access_Args_3 *args, struct svc_req *svcrq)
{
static Access_Status_3 stat;
Access_Args_4 *newargs;
@@ -401,9 +365,7 @@ struct svc_req *svcrq;
/* PROC #18 */
extern Access_Args_3 *
_DtCm_rtable_get_access_3_svc(args, svcrq)
Access_Args_3 *args;
struct svc_req *svcrq;
_DtCm_rtable_get_access_3_svc(Access_Args_3 *args, struct svc_req *svcrq)
{
static Access_Args_3 *res = NULL;
Access_Args_4 *newargs;
@@ -421,9 +383,7 @@ struct svc_req *svcrq;
/* PROC #19 */
extern Table_Res_3 *
_DtCm_rtable_abbreviated_lookup_key_range_3_svc(args, svcrq)
Table_Args_3 *args;
struct svc_req *svcrq;
_DtCm_rtable_abbreviated_lookup_key_range_3_svc(Table_Args_3 *args, struct svc_req *svcrq)
{
static Table_Res_3 *res = NULL;
Table_Args_4 *newargs;
@@ -441,9 +401,7 @@ struct svc_req *svcrq;
/* PROC #20 */
extern long *
_DtCm_rtable_gmtoff_3_svc(args, svcrq)
void *args;
struct svc_req *svcrq;
_DtCm_rtable_gmtoff_3_svc(void *args, struct svc_req *svcrq)
{
static long gmtoff;
@@ -452,8 +410,7 @@ struct svc_req *svcrq;
return(&gmtoff);
}
void initrtable3(ph)
program_handle ph;
void initrtable3(program_handle ph)
{
ph->program_num = TABLEPROG;
ph->prog[TABLEVERS_3].vers = &tableprog_3_table[0];

11
cde/programs/dtcm/server/svcmain.c
View File

@@ -201,7 +201,7 @@ error:
}
static void
init_dir()
init_dir(void)
{
char *dir = _DtCMS_DEFAULT_DIR;
char msgbuf[BUFSIZ];
@@ -282,7 +282,7 @@ init_dir()
* send a SIGHUP signal to the rpc.cmsd that is already running
*/
static void
send_hup()
send_hup(void)
{
FILE *fp = NULL;
char buf[BUFSIZ];
@@ -313,7 +313,7 @@ send_hup()
* We only allow one rpc.cmsd to run on each machine.
*/
static int
lock_it()
lock_it(void)
{
char *dir = _DtCMS_DEFAULT_DIR;
char buff [MAXPATHLEN];
@@ -467,7 +467,7 @@ sighup_handler(int sig_num)
* time and now so that the calling routine can set the alarm.
*/
static int
_GetFirstGarbageCollectionTime()
_GetFirstGarbageCollectionTime(void)
{
int n=0, midnight=0, gtime=0;
@@ -487,7 +487,7 @@ _GetFirstGarbageCollectionTime()
}
static void
init_alarm()
init_alarm(void)
{
int next;
extern void garbage_collect();
@@ -508,6 +508,7 @@ init_alarm()
alarm((unsigned) next);
}
int
main(int argc, char **argv)
{
u_long version;