diff --git a/.gitmodules b/.gitmodules index 22bb8f04e..e69de29bb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "cde/programs/dtksh/ksh93"] - path = cde/programs/dtksh/ksh93 - url = https://github.com/ksh93/ksh.git diff --git a/cde/Makefile b/cde/Makefile index fcc8639c5..bf78ae66e 100644 --- a/cde/Makefile +++ b/cde/Makefile @@ -1,5 +1,5 @@ # $TOG: Makefile /main/15 1999/10/12 09:33:30 mgreess $ - RELEASE = Release 2.3.1a + RELEASE = Release 2.3.2a PRODUCT = CDE SHELL = /bin/sh RM = rm -f diff --git a/cde/admin/IntegTools/dbTools/udbParseLib.awk b/cde/admin/IntegTools/dbTools/udbParseLib.awk index 0156ba384..74f04247d 100644 --- a/cde/admin/IntegTools/dbTools/udbParseLib.awk +++ b/cde/admin/IntegTools/dbTools/udbParseLib.awk @@ -350,9 +350,10 @@ function tokenize() { # allow escaping of significant syntax characters # gsub("[\\][{]","{") - gsub("\\:",":") - gsub("\\;",";") - gsub("\\=","=") + # These cause warnings in newer nawk, and aren't really necessary. + # gsub("\\:",":") + # gsub("\\;",";") + # gsub("\=","=") gsub("[\\][}]","}") # diff --git a/cde/config/imake/imake.c b/cde/config/imake/imake.c index 574af7c74..83834aa75 100644 --- a/cde/config/imake/imake.c +++ b/cde/config/imake/imake.c @@ -242,19 +242,6 @@ extern int errno; #include #include "imakemdep.h" -/* - * This define of strerror is copied from (and should be identical to) - * Xos.h, which we don't want to include here for bootstrapping reasons. - */ -#if defined(X_NOT_STDC_ENV) || (defined(sun) && !defined(SVR4)) -# ifndef strerror -extern char *sys_errlist[]; -extern int sys_nerr; -# define strerror(n) \ - (((n) >= 0 && (n) < sys_nerr) ? sys_errlist[n] : "unknown error") -# endif -#endif - #define TRUE 1 #define FALSE 0 diff --git a/cde/copyright b/cde/copyright index 401e14749..e639713ba 100644 --- a/cde/copyright +++ b/cde/copyright @@ -1,10 +1,10 @@ - Common Desktop Environment Version 2.3.1a (devel) + Common Desktop Environment Version 2.3.2a (devel) (c) Copyright 1993-2012 The Open Group -(c) Copyright 2012-2020 CDE Project contributors, see CONTRIBUTORS for details +(c) Copyright 2012-2021 CDE Project contributors, see CONTRIBUTORS for details Project Website: http://cdesktopenv.sourceforge.net/ diff --git a/cde/doc/common/help/HELPEnt.sgm b/cde/doc/common/help/HELPEnt.sgm index 7fd21043b..b5186d9fb 100644 --- a/cde/doc/common/help/HELPEnt.sgm +++ b/cde/doc/common/help/HELPEnt.sgm @@ -1,5 +1,5 @@ -Common Desktop Environment 2.3.1a, +Common Desktop Environment 2.3.2a, © Copyright 1993-2012 The Open Group © Copyright 2012-2020 CDE Project contributors, see CONTRIBUTORS for details diff --git a/cde/lib/DtHelp/AccessI.h b/cde/lib/DtHelp/AccessI.h index 4dcc62708..d2e4449ec 100644 --- a/cde/lib/DtHelp/AccessI.h +++ b/cde/lib/DtHelp/AccessI.h @@ -44,6 +44,7 @@ #ifndef _DtHelpAccessI_h #define _DtHelpAccessI_h +#include #ifndef _XtIntrinsic_h /* diff --git a/cde/lib/DtSearch/raima/dbtype.h b/cde/lib/DtSearch/raima/dbtype.h index 5c7eea81e..dfd25215f 100644 --- a/cde/lib/DtSearch/raima/dbtype.h +++ b/cde/lib/DtSearch/raima/dbtype.h @@ -405,7 +405,11 @@ typedef struct {struct CNTRY_TBL_S *ptr; LOCK_DESC} CNTRY_TBL_P; struct sk { INT sk_fld; CHAR_P sk_val; -} __SK__; +}; + +/* PJH 20201124 unused struct variable declaration in header causing issues +struct sk __SK__; +*/ typedef struct { struct sk *ptr; LOCK_DESC } SK_P; /* node key search path stack entry: one per level per key field */ diff --git a/cde/lib/DtSvc/DtUtil1/Dt.h b/cde/lib/DtSvc/DtUtil1/Dt.h index 34d2e914a..7888fe4a9 100644 --- a/cde/lib/DtSvc/DtUtil1/Dt.h +++ b/cde/lib/DtSvc/DtUtil1/Dt.h @@ -52,13 +52,13 @@ extern "C" { #define DtVERSION 2 #define DtREVISION 3 -#define DtUPDATE_LEVEL 1 +#define DtUPDATE_LEVEL 2 #define DtVERSION_NUMBER (DtVERSION * 10000 + \ DtREVISION * 100 + \ DtUPDATE_LEVEL) -#define DtVERSION_STRING "CDE Version 2.3.1a" +#define DtVERSION_STRING "CDE Version 2.3.2a" /* diff --git a/cde/lib/DtSvc/DtUtil2/XlationSvc.c b/cde/lib/DtSvc/DtUtil2/XlationSvc.c index a7298c0ac..c36f97dee 100644 --- a/cde/lib/DtSvc/DtUtil2/XlationSvc.c +++ b/cde/lib/DtSvc/DtUtil2/XlationSvc.c @@ -2199,18 +2199,15 @@ int _DtXlateGetXlateEnv( /* then look up version number of execution host */ if (ret_AppExecEnvVersion) { -#if defined(sun) || defined(_AIX) || defined(__linux__) || defined(CSRG_BASED) - char version[SYS_NMLN+SYS_NMLN+2]; -#else - char version[UTSLEN+UTSLEN+2]; -#endif + char version[sizeof(names.release)+sizeof(names.version)-1]; char * stdVer = NULL; int verNum = MATCHALL_VER; /* cat release version and do a translation on it to a std value */ /* then convert the std value to a integer */ - strcpy(version,names.release); - strcat(version,names.version); + strncpy(version,names.release,sizeof(names.release)-1); + version[sizeof(names.release)-1] = EOS; + strncat(version,names.version,sizeof(names.version)-1); ret = _DtXlateOpToStdValue(db,names.sysname,0, _DtXLATE_OPER_VERSION,version,&stdVer,NULL); if (ret == 0) diff --git a/cde/lib/DtSvc/DtUtil2/XlationSvc.h b/cde/lib/DtSvc/DtUtil2/XlationSvc.h index ab2763e59..4cbf865ba 100644 --- a/cde/lib/DtSvc/DtUtil2/XlationSvc.h +++ b/cde/lib/DtSvc/DtUtil2/XlationSvc.h @@ -109,14 +109,15 @@ platforms as part of a translation. /*================================================$SKIP$==*/ #endif /* $DEF$, Platform constants */ -#if defined(SVR4) || defined(_AIX) +#if defined(SVR4) || defined(_AIX) || defined(SYS_NMLN) #define _DtPLATFORM_MAX_LEN SYS_NMLN -#else -#if defined(SYS_NMLN) -#define _DtPLATFORM_MAX_LEN SYS_NMLN -#else +#elif defined(UTSLEN) #define _DtPLATFORM_MAX_LEN UTSLEN -#endif +#else +/* POSIX guarantees that hostnames are limited to 255 bytes, + * but SVR4 platforms commonly allow for 256. + */ +#define _DtPLATFORM_MAX_LEN 257 #endif #define _DtPLATFORM_UNKNOWN ((const char *)0) diff --git a/cde/lib/csa/agent_p.h b/cde/lib/csa/agent_p.h index f38d148e5..6f6142cf8 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(void); +extern void _DtCm_destroy_agent(void); +extern void _DtCm_process_updates(void); #endif /* _AGENT_P_H */ diff --git a/cde/lib/csa/ansi_c.h b/cde/lib/csa/ansi_c.h index 56178ad4c..c3969391c 100644 --- a/cde/lib/csa/ansi_c.h +++ b/cde/lib/csa/ansi_c.h @@ -36,28 +36,19 @@ #include -/* -** For all function declarations, if ANSI, then use a prototype -*/ -#if defined(__STDC__) -#define P(args) args -#else -#define P(args) () -#endif - #ifdef SunOS -extern char *fconvert P((double, int, int*, int*, char*)); -extern int isascii P((int)); -extern int kill P((long, int)); -extern char *mktemp P((char*)); -extern int strcasecmp P((const char*, const char*)); -extern int strncasecmp P((const char*, const char*, size_t)); -extern char *strdup P((const char*)); +extern char *fconvert(double, int, int*, int*, char*)) +extern int isascii(int); +extern int kill(long, int); +extern char *mktemp(char*); +extern int strcasecmp(const char*, const char*); +extern int strncasecmp(const char*, const char*, size_t); +extern char *strdup (const char*); #endif #ifdef NEED_STRCASECMP -int strcasecmp P((const char*, const char*)); -int strncasecmp P((const char*, const char*, size_t)); +int strcasecmp(const char*, const char*); +int strncasecmp(const char*, const char*, size_t); #endif #endif diff --git a/cde/lib/csa/appt4.h b/cde/lib/csa/appt4.h index a02b1c62d..e72feb51b 100644 --- a/cde/lib/csa/appt4.h +++ b/cde/lib/csa/appt4.h @@ -38,42 +38,42 @@ #include "rtable4.h" #include "ansi_c.h" -extern Appt_4 *_DtCm_make_appt4 P(()); +extern Appt_4 *_DtCm_make_appt4(); -extern Appt_4 *_DtCm_copy_one_appt4 P((Appt_4 *a4)); +extern Appt_4 *_DtCm_copy_one_appt4(Appt_4 *a4); -extern Appt_4 *_DtCm_copy_appt4 P((Appt_4 *a4)); +extern Appt_4 *_DtCm_copy_appt4(Appt_4 *a4); -extern Appt_4 *_DtCm_copy_semiprivate_appt4 P((Appt_4 *original)); +extern Appt_4 *_DtCm_copy_semiprivate_appt4(Appt_4 *original); -extern Except_4 *_DtCm_copy_excpt4 P((Except_4 *e4)); +extern Except_4 *_DtCm_copy_excpt4(Except_4 *e4); -extern Abb_Appt_4 *_DtCm_appt_to_abbrev4 P((Appt_4 *original)); +extern Abb_Appt_4 *_DtCm_appt_to_abbrev4(Appt_4 *original); -extern Abb_Appt_4 *_DtCm_appt_to_semiprivate_abbrev4 P((Appt_4 *original)); +extern Abb_Appt_4 *_DtCm_appt_to_semiprivate_abbrev4(Appt_4 *original); -extern void _DtCm_free_appt4 P((Appt_4 *a)); +extern void _DtCm_free_appt4(Appt_4 *a); -extern void _DtCm_free_abbrev_appt4 P((Abb_Appt_4 *a)); +extern void _DtCm_free_abbrev_appt4(Abb_Appt_4 *a); -extern Attribute_4 * _DtCm_make_attr4 P(()); +extern Attribute_4 * _DtCm_make_attr4(); -extern void _DtCm_free_attr4 P((Attribute_4 *a)); +extern void _DtCm_free_attr4(Attribute_4 *a); -extern Reminder_4 *_DtCm_copy_reminder4 P((Reminder_4 *r4)); +extern Reminder_4 *_DtCm_copy_reminder4(Reminder_4 *r4); -extern void _DtCm_free_reminder4 P((Reminder_4 *r)); +extern void _DtCm_free_reminder4(Reminder_4 *r); -extern void _DtCm_free_keyentry4 P((Uid_4 *k)); +extern void _DtCm_free_keyentry4(Uid_4 *k); -extern Access_Entry_4 *_DtCm_make_access_entry4 P((char *who, int perms)); +extern Access_Entry_4 *_DtCm_make_access_entry4(char *who, int perms); -extern Access_Entry_4 *_DtCm_copy_access_list4 P((Access_Entry_4 *l4)); +extern Access_Entry_4 *_DtCm_copy_access_list4(Access_Entry_4 *l4); -extern void _DtCm_free_access_list4 P((Access_Entry_4 *l)); +extern void _DtCm_free_access_list4(Access_Entry_4 *l); -extern void _DtCm_free_excpt4 P((Except_4 *e)); +extern void _DtCm_free_excpt4(Except_4 *e); -extern char * _DtCm_get_default_what_string P(()); +extern char * _DtCm_get_default_what_string(); #endif diff --git a/cde/lib/csa/attr.h b/cde/lib/csa/attr.h index 8ffc77f92..c98057fd3 100644 --- a/cde/lib/csa/attr.h +++ b/cde/lib/csa/attr.h @@ -110,16 +110,16 @@ extern _DtCmAttrInfo _CSA_entry_attr_info[]; * external function declarations */ -extern CSA_return_code _DtCm_check_cal_csa_attributes P(( +extern CSA_return_code _DtCm_check_cal_csa_attributes( int fvers, uint num_attrs, CSA_attribute *attrs, char *cname, boolean_t checkreadonly, boolean_t firsttime, - boolean_t checkattrnum)); + boolean_t checkattrnum); -extern CSA_return_code _DtCm_check_cal_cms_attributes P(( +extern CSA_return_code _DtCm_check_cal_cms_attributes( int fvers, uint num_attrs, cms_attribute *attrs, @@ -127,154 +127,154 @@ extern CSA_return_code _DtCm_check_cal_cms_attributes P(( char *cname, boolean_t checkreadonly, boolean_t firsttime, - boolean_t checkattrnum)); + boolean_t checkattrnum); -extern CSA_return_code _DtCm_check_entry_attributes P(( +extern CSA_return_code _DtCm_check_entry_attributes( int fversion, uint size, CSA_attribute *attrs, CSA_flags utype, - boolean_t checkattrnum)); + boolean_t checkattrnum); -extern CSA_return_code _DtCm_check_entry_cms_attributes P(( +extern CSA_return_code _DtCm_check_entry_cms_attributes( int fvers, uint num_attrs, cms_attribute *attrs, CSA_flags utype, - boolean_t checkattrnum)); + boolean_t checkattrnum); -extern CSA_return_code _DtCm_copy_cms_attributes P(( +extern CSA_return_code _DtCm_copy_cms_attributes( uint srcsize, cms_attribute *srcattrs, uint *dstsize, - cms_attribute **dstattrs)); + cms_attribute **dstattrs); -extern CSA_return_code _DtCm_copy_cms_attribute P(( +extern CSA_return_code _DtCm_copy_cms_attribute( cms_attribute *to, cms_attribute *from, - boolean_t copyname)); + boolean_t copyname); -extern CSA_return_code _DtCm_copy_cms_attr_val P(( +extern CSA_return_code _DtCm_copy_cms_attr_val( cms_attribute_value *from, - cms_attribute_value **to)); + cms_attribute_value **to); -extern cms_access_entry *_DtCm_copy_cms_access_list P(( - cms_access_entry *alist)); +extern cms_access_entry *_DtCm_copy_cms_access_list( + cms_access_entry *alist); -extern CSA_date_time_list _DtCm_copy_date_time_list P(( - CSA_date_time_list dlist)); +extern CSA_date_time_list _DtCm_copy_date_time_list( + CSA_date_time_list dlist); -extern CSA_return_code _DtCm_cms2csa_attribute P(( +extern CSA_return_code _DtCm_cms2csa_attribute( cms_attribute from, - CSA_attribute *to)); + CSA_attribute *to); -extern CSA_return_code _DtCm_cms2csa_attrval P(( +extern CSA_return_code _DtCm_cms2csa_attrval( cms_attribute_value *from, - CSA_attribute_value **to)); + CSA_attribute_value **to); -extern CSA_return_code _DtCm_cms2csa_access_list P(( +extern CSA_return_code _DtCm_cms2csa_access_list( cms_access_entry *cmslist, - CSA_access_rights **csalist)); + CSA_access_rights **csalist); -extern CSA_return_code _DtCm_csa2cms_access_list P(( +extern CSA_return_code _DtCm_csa2cms_access_list( CSA_access_rights *csalist, - cms_access_entry **cmslist)); + cms_access_entry **cmslist); -extern CSA_return_code _DtCm_copy_reminder P(( +extern CSA_return_code _DtCm_copy_reminder( CSA_reminder *from, - CSA_reminder **to)); + CSA_reminder **to); -extern CSA_return_code _DtCm_copy_opaque_data P(( +extern CSA_return_code _DtCm_copy_opaque_data( CSA_opaque_data *from, - CSA_opaque_data **to)); + CSA_opaque_data **to); -extern void _DtCm_free_csa_access_list P((CSA_access_list alist)); +extern void _DtCm_free_csa_access_list(CSA_access_list alist); -extern void _DtCm_free_cms_attributes P(( +extern void _DtCm_free_cms_attributes( uint size, - cms_attribute *attrs)); + cms_attribute *attrs); -extern void _DtCm_free_attributes P(( +extern void _DtCm_free_attributes( uint size, - CSA_attribute * attrs)); + CSA_attribute * attrs); -extern void _DtCm_free_cms_attribute_values P(( +extern void _DtCm_free_cms_attribute_values( uint size, - cms_attribute *attrs)); + cms_attribute *attrs); -extern void _DtCm_free_attribute_values P(( +extern void _DtCm_free_attribute_values( uint size, - CSA_attribute *attrs)); + CSA_attribute *attrs); -extern void _DtCm_free_cms_attribute_value P(( - cms_attribute_value *val)); +extern void _DtCm_free_cms_attribute_value( + cms_attribute_value *val); -extern void _DtCm_free_attribute_value P(( - CSA_attribute_value *val)); +extern void _DtCm_free_attribute_value( + CSA_attribute_value *val); -extern void _DtCm_free_cms_access_entry P((cms_access_entry *list)); +extern void _DtCm_free_cms_access_entry(cms_access_entry *list); -extern void _DtCm_free_date_time_list P((CSA_date_time_list list)); +extern void _DtCm_free_date_time_list(CSA_date_time_list list); -extern void _DtCm_free_reminder P((CSA_reminder *val)); +extern void _DtCm_free_reminder(CSA_reminder *val); -extern void _DtCm_free_opaque_data P((CSA_opaque_data *val)); +extern void _DtCm_free_opaque_data(CSA_opaque_data *val); -extern char *_DtCm_old_reminder_name_to_name P(( - char *oldname)); +extern char *_DtCm_old_reminder_name_to_name( + char *oldname); -extern int _DtCm_old_reminder_name_to_index P(( - char *name)); +extern int _DtCm_old_reminder_name_to_index( + char *name); -extern CSA_return_code _DtCm_get_old_attr_by_name P(( +extern CSA_return_code _DtCm_get_old_attr_by_name( char *name, - _DtCm_old_attrs *attr)); + _DtCm_old_attrs *attr); -extern CSA_return_code _DtCm_get_old_attr_by_index P(( +extern CSA_return_code _DtCm_get_old_attr_by_index( int index, - _DtCm_old_attrs *attr)); + _DtCm_old_attrs *attr); -extern CSA_return_code _DtCm_set_uint32_attrval P(( +extern CSA_return_code _DtCm_set_uint32_attrval( uint numval, - cms_attribute_value **val)); + cms_attribute_value **val); -extern CSA_return_code _DtCm_set_sint32_attrval P(( +extern CSA_return_code _DtCm_set_sint32_attrval( int numval, - cms_attribute_value **val)); + cms_attribute_value **val); -extern CSA_return_code _DtCm_set_string_attrval P(( +extern CSA_return_code _DtCm_set_string_attrval( char *strval, cms_attribute_value **val, - CSA_enum type)); + CSA_enum type); -extern CSA_return_code _DtCm_set_user_attrval P(( +extern CSA_return_code _DtCm_set_user_attrval( char *user, - cms_attribute_value **val)); + cms_attribute_value **val); -extern CSA_return_code _DtCm_set_reminder_attrval P(( +extern CSA_return_code _DtCm_set_reminder_attrval( CSA_reminder *remval, - cms_attribute_value **val)); + cms_attribute_value **val); -extern CSA_return_code _DtCm_set_access_attrval P(( +extern CSA_return_code _DtCm_set_access_attrval( cms_access_entry *aval, - cms_attribute_value **val)); + cms_attribute_value **val); -extern CSA_return_code _DtCm_set_opaque_attrval P(( +extern CSA_return_code _DtCm_set_opaque_attrval( CSA_opaque_data *opqval, - cms_attribute_value **val)); + cms_attribute_value **val); -extern CSA_return_code _DtCm_set_csa_access_attrval P(( +extern CSA_return_code _DtCm_set_csa_access_attrval( cms_access_entry *aval, - CSA_attribute_value **val)); + CSA_attribute_value **val); -extern CSA_return_code _DtCm_set_csa_uint32_attrval P(( +extern CSA_return_code _DtCm_set_csa_uint32_attrval( uint numval, - CSA_attribute_value **attrval)); + CSA_attribute_value **attrval); -extern CSA_return_code _DtCm_set_csa_string_attrval P(( +extern CSA_return_code _DtCm_set_csa_string_attrval( char *strval, CSA_attribute_value **attrval, - CSA_enum type)); + CSA_enum type); extern void _DtCm_get_attribute_types(uint size, int *types); diff --git a/cde/lib/csa/calendar.h b/cde/lib/csa/calendar.h index b7ab181e1..68bd39366 100644 --- a/cde/lib/csa/calendar.h +++ b/cde/lib/csa/calendar.h @@ -82,49 +82,49 @@ extern Calendar *_DtCm_active_cal_list; /* function prototypes */ -extern Calendar * _DtCm_new_Calendar P(( - const char *calenadr)); +extern Calendar * _DtCm_new_Calendar( + const char *calenadr); -extern void _DtCm_free_Calendar P(( - Calendar *cal)); +extern void _DtCm_free_Calendar( + Calendar *cal); -extern Calendar *_DtCm_get_Calendar P(( - CSA_session_handle calhandle)); +extern Calendar *_DtCm_get_Calendar( + CSA_session_handle calhandle); -extern uint _DtCm_add_to_entry_list P(( +extern uint _DtCm_add_to_entry_list( Calendar *cal, - caddr_t elist)); + caddr_t elist); -extern void _DtCm_remove_from_entry_list P(( +extern void _DtCm_remove_from_entry_list( Calendar *cal, caddr_t head, - caddr_t tail)); + caddr_t tail); -extern CSA_return_code _DtCm_list_old_cal_attr_names P(( +extern CSA_return_code _DtCm_list_old_cal_attr_names( Calendar *cal, CSA_uint32 *num_names_r, - char **names_r[])); + char **names_r[]); -extern CSA_return_code _DtCm_set_cal_attr P(( +extern CSA_return_code _DtCm_set_cal_attr( Calendar *cal, - CSA_attribute attr)); + CSA_attribute attr); -extern CSA_return_code _DtCm_get_all_cal_attrs P(( +extern CSA_return_code _DtCm_get_all_cal_attrs( Calendar *cal, CSA_uint32 *num_attrs, - CSA_attribute **attrs)); + CSA_attribute **attrs); -extern CSA_return_code _DtCm_get_cal_attrs_by_name P(( +extern CSA_return_code _DtCm_get_cal_attrs_by_name( Calendar *cal, CSA_uint32 num_names, CSA_attribute_reference *names, CSA_uint32 *num_attrs, - CSA_attribute **attrs)); + CSA_attribute **attrs); -extern void _DtCm_reset_cal_attrs P(( - Calendar *cal)); +extern void _DtCm_reset_cal_attrs( + Calendar *cal); -extern void _DtCm_count_entry_in_list P(( - caddr_t elist)); +extern void _DtCm_count_entry_in_list( + caddr_t elist); #endif diff --git a/cde/lib/csa/cmsdata.h b/cde/lib/csa/cmsdata.h index 57c194c82..3fc472811 100644 --- a/cde/lib/csa/cmsdata.h +++ b/cde/lib/csa/cmsdata.h @@ -40,21 +40,21 @@ extern _DtCmNameTable *_DtCm_cal_name_tbl; extern _DtCmNameTable *_DtCm_entry_name_tbl; -extern void _DtCm_init_hash P(()); +extern void _DtCm_init_hash(void); -extern cms_entry *_DtCm_make_cms_entry P((_DtCmNameTable *tbl)); +extern cms_entry *_DtCm_make_cms_entry(_DtCmNameTable *tbl); -extern CSA_return_code _DtCm_copy_cms_entry P(( +extern CSA_return_code _DtCm_copy_cms_entry( cms_entry *e, - cms_entry **e_r)); + cms_entry **e_r); -extern void _DtCm_free_cms_entry P((cms_entry *entry)); +extern void _DtCm_free_cms_entry(cms_entry *entry); -extern void _DtCm_free_cms_entries P((cms_entry *entry)); +extern void _DtCm_free_cms_entries(cms_entry *entry); -extern CSA_return_code _DtCmGrowAttrArray P(( +extern CSA_return_code _DtCmGrowAttrArray( uint *num_attr, cms_attribute **attrs, - cms_attribute *attr)); + cms_attribute *attr); #endif diff --git a/cde/lib/csa/cmxdr.h b/cde/lib/csa/cmxdr.h index e983646ba..0c58b8e01 100644 --- a/cde/lib/csa/cmxdr.h +++ b/cde/lib/csa/cmxdr.h @@ -39,27 +39,27 @@ * xdr routines for xapia csa data structures */ -bool_t xdr_CSA_extension P((XDR *xdrs, CSA_extension *objp)); +bool_t xdr_CSA_extension(XDR *xdrs, CSA_extension *objp); -bool_t xdr_CSA_date_time_entry P((XDR *xdrs, CSA_date_time_entry *objp)); +bool_t xdr_CSA_date_time_entry(XDR *xdrs, CSA_date_time_entry *objp); -bool_t xdr_CSA_date_time_list P((XDR *xdrs, CSA_date_time_list *objp)); +bool_t xdr_CSA_date_time_list(XDR *xdrs, CSA_date_time_list *objp); -bool_t xdr_CSA_calendar_user P((XDR *xdrs, CSA_calendar_user *objp)); +bool_t xdr_CSA_calendar_user(XDR *xdrs, CSA_calendar_user *objp); -bool_t xdr_CSA_access_rights P((XDR *xdrs, CSA_access_rights *objp)); +bool_t xdr_CSA_access_rights(XDR *xdrs, CSA_access_rights *objp); -bool_t xdr_CSA_access_list P((XDR *xdrs, CSA_access_list *objp)); +bool_t xdr_CSA_access_list(XDR *xdrs, CSA_access_list *objp); -bool_t xdr_CSA_attendee P((XDR *xdrs, CSA_attendee *objp)); +bool_t xdr_CSA_attendee(XDR *xdrs, CSA_attendee *objp); -bool_t xdr_CSA_attendee_list P((XDR *xdrs, CSA_attendee_list *objp)); +bool_t xdr_CSA_attendee_list(XDR *xdrs, CSA_attendee_list *objp); -bool_t xdr_CSA_opaque_data P((XDR *xdrs, CSA_opaque_data *objp)); +bool_t xdr_CSA_opaque_data(XDR *xdrs, CSA_opaque_data *objp); -bool_t xdr_CSA_reminder P((XDR *xdrs, CSA_reminder *objp)); +bool_t xdr_CSA_reminder(XDR *xdrs, CSA_reminder *objp); -bool_t xdr_CSA_attribute_value P((XDR *xdrs, CSA_attribute_value *objp)); +bool_t xdr_CSA_attribute_value(XDR *xdrs, CSA_attribute_value *objp); #endif diff --git a/cde/lib/csa/connection.h b/cde/lib/csa/connection.h index 1cfc4c012..4267be1e5 100644 --- a/cde/lib/csa/connection.h +++ b/cde/lib/csa/connection.h @@ -73,40 +73,40 @@ typedef struct conn { } _DtCm_Connection; #ifdef SunOS -extern enum clnt_stat _DtCm_clnt_call P(( +extern enum clnt_stat _DtCm_clnt_call( _DtCm_Connection *conn, u_long proc, xdrproc_t inproc, caddr_t in, xdrproc_t outproc, caddr_t out, - struct timeval tout)); + struct timeval tout); #endif -extern CSA_return_code _DtCm_add_registration P(( +extern CSA_return_code _DtCm_add_registration( _DtCm_Client_Info *ci, char *cal, - unsigned long update_type)); + unsigned long update_type); -extern void _DtCm_remove_registration P(( +extern void _DtCm_remove_registration( _DtCm_Client_Info *ci, - char *cal)); + char *cal); -extern CSA_return_code _DtCm_create_udp_client P(( +extern CSA_return_code _DtCm_create_udp_client( char *host, int version, int timeout, - _DtCm_Client_Info **clnt)); + _DtCm_Client_Info **clnt); -extern CSA_return_code _DtCm_create_tcp_client P(( +extern CSA_return_code _DtCm_create_tcp_client( char *host, int version, int timeout, - _DtCm_Client_Info **clnt)); + _DtCm_Client_Info **clnt); -extern CSA_return_code _DtCm_get_server_rpc_version P((char *host, int *vers)); +extern CSA_return_code _DtCm_get_server_rpc_version(char *host, int *vers); -extern CSA_return_code _DtCm_clntstat_to_csastat P((enum clnt_stat clntstat)); +extern CSA_return_code _DtCm_clntstat_to_csastat(enum clnt_stat clntstat); #endif diff --git a/cde/lib/csa/convert2-4.h b/cde/lib/csa/convert2-4.h index 3890b5fdc..5be873b52 100644 --- a/cde/lib/csa/convert2-4.h +++ b/cde/lib/csa/convert2-4.h @@ -37,13 +37,13 @@ rpc.cmsd version 4 data types */ -extern Table_Args_4 *_DtCm_tableargs2_to_tableargs4 P((Table_Args_2*)); -extern Table_Args_4 *_DtCm_tabledelargs2_to_tabledelargs4 P((Table_Args_2*, Options_4)); -extern Registration_4 *_DtCm_reg2_to_reg4 P((Registration_2*)); -extern Access_Args_4 *_DtCm_accargs2_to_accargs4 P((Access_Args_2*)); -extern Table_Res_4 *_DtCm_tableres2_to_tableres4 P((Table_Res_2*)); -extern Table_Status_4 _DtCm_tablestat2_to_tablestat4 P((Table_Status_2)); -extern Access_Status_4 _DtCm_accstat2_to_accstat4 P((Access_Status_2)); -extern Registration_Status_4 _DtCm_regstat2_to_regstat4 P((Registration_Status_2)); +extern Table_Args_4 *_DtCm_tableargs2_to_tableargs4(Table_Args_2*); +extern Table_Args_4 *_DtCm_tabledelargs2_to_tabledelargs4(Table_Args_2*, Options_4); +extern Registration_4 *_DtCm_reg2_to_reg4(Registration_2*); +extern Access_Args_4 *_DtCm_accargs2_to_accargs4(Access_Args_2*); +extern Table_Res_4 *_DtCm_tableres2_to_tableres4(Table_Res_2*); +extern Table_Status_4 _DtCm_tablestat2_to_tablestat4(Table_Status_2); +extern Access_Status_4 _DtCm_accstat2_to_accstat4(Access_Status_2); +extern Registration_Status_4 _DtCm_regstat2_to_regstat4(Registration_Status_2); #endif diff --git a/cde/lib/csa/convert3-4.h b/cde/lib/csa/convert3-4.h index 015a0a3c3..a80bf19fd 100644 --- a/cde/lib/csa/convert3-4.h +++ b/cde/lib/csa/convert3-4.h @@ -37,13 +37,13 @@ rpc.cmsd version 4 data types */ -extern Table_Args_4 *_DtCm_tableargs3_to_tableargs4 P((Table_Args_3*)); -extern Table_Args_4 *_DtCm_tabledelargs3_to_tabledelargs4 P((Table_Args_3*, Options_4)); -extern Registration_4 *_DtCm_reg3_to_reg4 P((Registration_3*)); -extern Access_Args_4 *_DtCm_accargs3_to_accargs4 P((Access_Args_3*)); -extern Table_Res_4 *_DtCm_tableres3_to_tableres4 P((Table_Res_3*)); -extern Table_Status_4 _DtCm_tablestat3_to_tablestat4 P((Table_Status_3)); -extern Access_Status_4 _DtCm_accstat3_to_accstat4 P((Access_Status_3)); -extern Registration_Status_4 _DtCm_regstat3_to_regstat4 P((Registration_Status_3)); +extern Table_Args_4 *_DtCm_tableargs3_to_tableargs4(Table_Args_3*); +extern Table_Args_4 *_DtCm_tabledelargs3_to_tabledelargs4(Table_Args_3*, Options_4); +extern Registration_4 *_DtCm_reg3_to_reg4(Registration_3*); +extern Access_Args_4 *_DtCm_accargs3_to_accargs4(Access_Args_3*); +extern Table_Res_4 *_DtCm_tableres3_to_tableres4(Table_Res_3*); +extern Table_Status_4 _DtCm_tablestat3_to_tablestat4(Table_Status_3); +extern Access_Status_4 _DtCm_accstat3_to_accstat4(Access_Status_3); +extern Registration_Status_4 _DtCm_regstat3_to_regstat4(Registration_Status_3); #endif diff --git a/cde/lib/csa/convert4-2.h b/cde/lib/csa/convert4-2.h index 177195719..ca973b1cc 100644 --- a/cde/lib/csa/convert4-2.h +++ b/cde/lib/csa/convert4-2.h @@ -37,18 +37,18 @@ rpc.cmsd version 2 data types */ -extern Table_Res_2 *_DtCm_tableres4_to_tableres2 P((Table_Res_4 *)); -extern Table_Status_2 _DtCm_tablestat4_to_tablestat2 P((Table_Status_4)); -extern Registration_Status_2 _DtCm_regstat4_to_regstat2 P((Registration_Status_4)); -extern Access_Status_2 _DtCm_accstat4_to_accstat2 P((Access_Status_4)); -extern Access_Args_2 *_DtCm_accargs4_to_accargs2 P((Access_Args_4*)); -extern Uid_2 *_DtCm_uid4_to_uid2 P((Uid_4*)); -extern Range_2 *_DtCm_range4_to_range2 P((Range_4*)); -extern Appt_2 *_DtCm_appt4_to_appt2 P((Appt_4*)); -extern void _DtCm_id4_to_id2 P((Id_4*, Id_2*)); -extern Access_Entry_2 *_DtCm_acclist4_to_acclist2 P((Access_Entry_4*)); -extern Uid_2 *_DtCm_uidopt4_to_uid2 P((Uidopt_4*)); -extern void _DtCm_free_attr2 P((Attribute_2 *a)); -extern void _DtCm_free_appt2 P((Appt_2 *a)); +extern Table_Res_2 *_DtCm_tableres4_to_tableres2(Table_Res_4 *); +extern Table_Status_2 _DtCm_tablestat4_to_tablestat2(Table_Status_4); +extern Registration_Status_2 _DtCm_regstat4_to_regstat2(Registration_Status_4); +extern Access_Status_2 _DtCm_accstat4_to_accstat2(Access_Status_4); +extern Access_Args_2 *_DtCm_accargs4_to_accargs2(Access_Args_4*); +extern Uid_2 *_DtCm_uid4_to_uid2(Uid_4*); +extern Range_2 *_DtCm_range4_to_range2(Range_4*); +extern Appt_2 *_DtCm_appt4_to_appt2(Appt_4*); +extern void _DtCm_id4_to_id2(Id_4*, Id_2*); +extern Access_Entry_2 *_DtCm_acclist4_to_acclist2(Access_Entry_4*); +extern Uid_2 *_DtCm_uidopt4_to_uid2(Uidopt_4*); +extern void _DtCm_free_attr2(Attribute_2 *a); +extern void _DtCm_free_appt2(Appt_2 *a); #endif diff --git a/cde/lib/csa/convert4-3.h b/cde/lib/csa/convert4-3.h index 177408622..216d281ea 100644 --- a/cde/lib/csa/convert4-3.h +++ b/cde/lib/csa/convert4-3.h @@ -37,19 +37,19 @@ rpc.cmsd version 3 data types */ -extern Table_Res_3 *_DtCm_tableres4_to_tableres3 P((Table_Res_4*)); -extern Table_Status_3 _DtCm_tablestat4_to_tablestat3 P((Table_Status_4)); -extern Registration_Status_3 _DtCm_regstat4_to_regstat3 P((Registration_Status_4)); -extern Access_Status_3 _DtCm_accstat4_to_accstat3 P((Access_Status_4)); -extern Access_Args_3 *_DtCm_accargs4_to_accargs3 P((Access_Args_4*)); -extern Uid_3 *_DtCm_uid4_to_uid3 P((Uid_4*)); -extern Range_3 *_DtCm_range4_to_range3 P((Range_4*)); -extern Appt_3 *_DtCm_appt4_to_appt3 P((Appt_4*)); -extern void _DtCm_id4_to_id3 P((Id_4*, Id_3*)); -extern Access_Entry_3 *_DtCm_acclist4_to_acclist3 P((Access_Entry_4*)); -extern Keyrange_3 *_DtCm_keyrange4_to_keyrange3 P((Keyrange_4*)); -extern Uid_3 *_DtCm_uidopt4_to_uid3 P((Uidopt_4*)); -extern void _DtCm_free_attr3 P((Attribute_3 *a)); -extern void _DtCm_free_appt3 P((Appt_3 *appts)); +extern Table_Res_3 *_DtCm_tableres4_to_tableres3(Table_Res_4*); +extern Table_Status_3 _DtCm_tablestat4_to_tablestat3(Table_Status_4); +extern Registration_Status_3 _DtCm_regstat4_to_regstat3(Registration_Status_4); +extern Access_Status_3 _DtCm_accstat4_to_accstat3(Access_Status_4); +extern Access_Args_3 *_DtCm_accargs4_to_accargs3(Access_Args_4*); +extern Uid_3 *_DtCm_uid4_to_uid3(Uid_4*); +extern Range_3 *_DtCm_range4_to_range3(Range_4*); +extern Appt_3 *_DtCm_appt4_to_appt3(Appt_4*); +extern void _DtCm_id4_to_id3(Id_4*, Id_3*); +extern Access_Entry_3 *_DtCm_acclist4_to_acclist3(Access_Entry_4*); +extern Keyrange_3 *_DtCm_keyrange4_to_keyrange3(Keyrange_4*); +extern Uid_3 *_DtCm_uidopt4_to_uid3(Uidopt_4*); +extern void _DtCm_free_attr3(Attribute_3 *a); +extern void _DtCm_free_appt3(Appt_3 *appts); #endif diff --git a/cde/lib/csa/convert4-5.h b/cde/lib/csa/convert4-5.h index 611e2c666..68f24755a 100644 --- a/cde/lib/csa/convert4-5.h +++ b/cde/lib/csa/convert4-5.h @@ -39,29 +39,29 @@ /* * functions to convert v4 data structures */ -extern CSA_return_code _DtCm_accessentry4_to_cmsaccesslist P(( +extern CSA_return_code _DtCm_accessentry4_to_cmsaccesslist( Access_Entry_4 *a4, - cms_access_entry **alist)); + cms_access_entry **alist); -extern CSA_return_code _DtCm_appt4_to_attrs P(( +extern CSA_return_code _DtCm_appt4_to_attrs( char *calname, Appt_4 *a4, uint num_attrs, cms_attribute *attrs, - boolean_t rerule)); + boolean_t rerule); -extern int _DtCm_eventtype4_to_type P((Event_Type_4 tag)); +extern int _DtCm_eventtype4_to_type(Event_Type_4 tag); -extern char *_DtCm_eventtype4_to_subtype P((Event_Type_4 tag)); +extern char *_DtCm_eventtype4_to_subtype(Event_Type_4 tag); -extern CSA_sint32 _DtCm_interval4_to_rtype P((Interval_4 val)); +extern CSA_sint32 _DtCm_interval4_to_rtype(Interval_4 val); -extern CSA_sint32 _DtCm_apptstatus4_to_status P((Appt_Status_4 stat)); +extern CSA_sint32 _DtCm_apptstatus4_to_status(Appt_Status_4 stat); -extern CSA_sint32 _DtCm_privacy4_to_classification P((Privacy_Level_4 p)); +extern CSA_sint32 _DtCm_privacy4_to_classification(Privacy_Level_4 p); -extern CSA_return_code _DtCmAttr4ToReminderValue P(( +extern CSA_return_code _DtCmAttr4ToReminderValue( Attribute_4 *remval, - cms_attribute_value **attrval)); + cms_attribute_value **attrval); #endif diff --git a/cde/lib/csa/convert5-4.h b/cde/lib/csa/convert5-4.h index 2d8021d6c..c99e2de7f 100644 --- a/cde/lib/csa/convert5-4.h +++ b/cde/lib/csa/convert5-4.h @@ -39,61 +39,61 @@ /* * conversion routines for rpc.cmsd version 5 to rpc.cmsd version 4 data types */ -extern CSA_return_code _DtCm_cmsattrs_to_apptdata P(( +extern CSA_return_code _DtCm_cmsattrs_to_apptdata( uint num_attrs, cms_attribute *attrs, - Appt_4 *appt4)); + Appt_4 *appt4); -extern CSA_return_code _DtCm_attrs_to_apptdata P(( +extern CSA_return_code _DtCm_attrs_to_apptdata( uint size, CSA_attribute *attrs, - Appt_4 *appt)); + Appt_4 *appt); -extern CSA_return_code _DtCm_cms_entry_to_appt4 P(( +extern CSA_return_code _DtCm_cms_entry_to_appt4( cms_entry *entry, - Appt_4 **appt4)); + Appt_4 **appt4); -extern CSA_return_code _DtCm_attrs_to_appt4 P(( +extern CSA_return_code _DtCm_attrs_to_appt4( uint num_attrs, CSA_attribute *attrs, - Appt_4 **appt4_r)); + Appt_4 **appt4_r); -extern CSA_return_code _DtCm_scope_to_options4 P(( +extern CSA_return_code _DtCm_scope_to_options4( CSA_enum scope, - Options_4 *opt)); + Options_4 *opt); -extern CSA_return_code _DtCm_csaaccesslist_toaccessentry4 P(( +extern CSA_return_code _DtCm_csaaccesslist_toaccessentry4( CSA_access_list alist, - Access_Entry_4 **a4)); + Access_Entry_4 **a4); -extern int _DtCm_string_to_eventtype4 P(( +extern int _DtCm_string_to_eventtype4( char *val, - Event_Type_4 *tag)); + Event_Type_4 *tag); -extern int _DtCm_rtype_to_interval4 P(( +extern int _DtCm_rtype_to_interval4( int val, - Interval_4 *period)); + Interval_4 *period); -extern int _DtCm_status_to_apptstatus4 P(( +extern int _DtCm_status_to_apptstatus4( int val, - Appt_Status_4 *astat)); + Appt_Status_4 *astat); -extern int _DtCm_classification_to_privacy4 P(( +extern int _DtCm_classification_to_privacy4( int val, - Privacy_Level_4 *privacy)); + Privacy_Level_4 *privacy); -extern CSA_return_code _DtCm_attrs_to_eventtype4 P(( +extern CSA_return_code _DtCm_attrs_to_eventtype4( cms_attribute_value *type, cms_attribute_value *stype, - Tag_4 *tag)); + Tag_4 *tag); -extern CSA_return_code _DtCm_remove_reminder P((char *rem, Appt_4 *appt)); +extern CSA_return_code _DtCm_remove_reminder(char *rem, Appt_4 *appt); -extern CSA_return_code _DtCm_add_reminder P(( +extern CSA_return_code _DtCm_add_reminder( char *rem, CSA_reminder * val, - Appt_4 *appt)); + Appt_4 *appt); -extern int _DtCmAccessRightToV4AccessType P((unsigned int access)); +extern int _DtCmAccessRightToV4AccessType(unsigned int access); #endif diff --git a/cde/lib/csa/debug.h b/cde/lib/csa/debug.h index 26fb5d266..c42385819 100644 --- a/cde/lib/csa/debug.h +++ b/cde/lib/csa/debug.h @@ -39,8 +39,8 @@ #define DP(a) #endif /* CM_DEBUG */ -extern void _DtCm_print_tick P((long)); +extern void _DtCm_print_tick(long); -extern void _DtCm_print_errmsg P((const char *)); +extern void _DtCm_print_errmsg(const char *); #endif /* _DEBUG_H */ diff --git a/cde/lib/csa/entry.h b/cde/lib/csa/entry.h index d3085e0a0..d8e09ac18 100644 --- a/cde/lib/csa/entry.h +++ b/cde/lib/csa/entry.h @@ -52,76 +52,76 @@ typedef struct _libentry { /* function prototypes */ -extern _DtCm_libentry *_DtCm_get_libentry P((CSA_entry_handle entryh)); +extern _DtCm_libentry *_DtCm_get_libentry(CSA_entry_handle entryh); -extern CSA_return_code _DtCm_make_libentry P(( +extern CSA_return_code _DtCm_make_libentry( cms_entry *cmsentry, - _DtCm_libentry **entry_r)); + _DtCm_libentry **entry_r); -extern CSA_return_code _DtCm_get_entry_detail P((_DtCm_libentry *entry)); +extern CSA_return_code _DtCm_get_entry_detail(_DtCm_libentry *entry); -extern CSA_return_code _DtCm_get_entry_attr_names P(( +extern CSA_return_code _DtCm_get_entry_attr_names( _DtCm_libentry *entry, CSA_uint32 *num_names_r, - char **names_r[])); + char **names_r[]); -extern CSA_return_code _DtCm_get_entry_attrs_by_name P(( +extern CSA_return_code _DtCm_get_entry_attrs_by_name( _DtCm_libentry *entry, CSA_uint32 num_names, CSA_attribute_reference *names, CSA_uint32 *num_attrs, - CSA_attribute **attrs)); + CSA_attribute **attrs); -extern CSA_return_code _DtCm_get_all_entry_attrs P(( +extern CSA_return_code _DtCm_get_all_entry_attrs( _DtCm_libentry *entry, CSA_uint32 *num_attrs, - CSA_attribute **attrs)); + CSA_attribute **attrs); -extern CSA_return_code _DtCm_libentry_to_entryh P(( +extern CSA_return_code _DtCm_libentry_to_entryh( _DtCm_libentry *elist, CSA_uint32 *size, - CSA_entry_handle **entries_r)); + CSA_entry_handle **entries_r); -extern CSA_return_code _DtCmCmsentriesToLibentries P(( +extern CSA_return_code _DtCmCmsentriesToLibentries( _DtCmNameTable **tbl, cms_entry *entries, - _DtCm_libentry **libentries)); + _DtCm_libentry **libentries); -extern CSA_return_code _DtCm_appt4_to_libentries P(( +extern CSA_return_code _DtCm_appt4_to_libentries( char *calname, Appt_4 *appt4, - _DtCm_libentry **libentries)); + _DtCm_libentry **libentries); -extern CSA_return_code _DtCm_libentries_to_appt4 P(( +extern CSA_return_code _DtCm_libentries_to_appt4( _DtCm_libentry *libentries, - Appt_4 **appt4)); + Appt_4 **appt4); -extern CSA_return_code _DtCm_reminder4_to_csareminder P(( +extern CSA_return_code _DtCm_reminder4_to_csareminder( Reminder_4 *r4, CSA_uint32 *num_rems, - CSA_reminder_reference **rems)); + CSA_reminder_reference **rems); -extern _DtCm_libentry *_DtCm_convert_entry_wheader P((_DtCm_libentry *entry)); +extern _DtCm_libentry *_DtCm_convert_entry_wheader(_DtCm_libentry *entry); -extern void _DtCm_free_libentries_from_list P(( +extern void _DtCm_free_libentries_from_list( _DtCm_libentry *head, - _DtCm_libentry *tail)); + _DtCm_libentry *tail); -extern void _DtCm_free_libentries P((_DtCm_libentry *entries)); +extern void _DtCm_free_libentries(_DtCm_libentry *entries); -extern void _DtCm_free_entry_handles P(( +extern void _DtCm_free_entry_handles( uint num_entries, - CSA_entry_handle *entries)); + CSA_entry_handle *entries); -extern void _DtCm_free_reminder_references P(( +extern void _DtCm_free_reminder_references( uint num_rems, - CSA_reminder_reference *rems)); + CSA_reminder_reference *rems); -extern void _DtCm_free_entry_content P((uint dummy, _DtCm_libentry *entry)); +extern void _DtCm_free_entry_content(uint dummy, _DtCm_libentry *entry); -extern CSA_return_code _DtCm_cms2csa_reminder_ref P(( +extern CSA_return_code _DtCm_cms2csa_reminder_ref( cms_reminder_ref *cmsrems, CSA_uint32 *num_rems, - CSA_reminder_reference **csarems)); + CSA_reminder_reference **csarems); #endif diff --git a/cde/lib/csa/free.h b/cde/lib/csa/free.h index a05612ef0..b1d5f31f6 100644 --- a/cde/lib/csa/free.h +++ b/cde/lib/csa/free.h @@ -49,7 +49,7 @@ extern void *_DtCm_alloc_entry(); extern CSA_return_code _DtCm_free(void *ptr); -extern void _DtCm_free_character_pointers P((uint num_elem, void *vptr)); +extern void _DtCm_free_character_pointers(uint num_elem, void *vptr); #endif diff --git a/cde/lib/csa/hash.h b/cde/lib/csa/hash.h index 47f8862e1..b692a4b10 100644 --- a/cde/lib/csa/hash.h +++ b/cde/lib/csa/hash.h @@ -33,13 +33,13 @@ #include "ansi_c.h" -extern void * _DtCmMakeHash P((int size)); +extern void * _DtCmMakeHash(int size); -extern void ** _DtCmGetHash P((void * tbl, const unsigned char * key)); +extern void ** _DtCmGetHash(void * tbl, const unsigned char * key); -extern void ** _DtCmFindHash P((void * tbl,const unsigned char * key)); +extern void ** _DtCmFindHash(void * tbl,const unsigned char * key); -extern void _DtCmDestroyHash P((void * tbl, int (*des_func)(), void * usr_arg)); +extern void _DtCmDestroyHash(void * tbl, int (*des_func)(), void * usr_arg); #endif /* _HASH_H */ diff --git a/cde/lib/csa/laccess.h b/cde/lib/csa/laccess.h index f0b808b9d..c06abee09 100644 --- a/cde/lib/csa/laccess.h +++ b/cde/lib/csa/laccess.h @@ -33,8 +33,8 @@ #include "ansi_c.h" -extern boolean_t _DtCmIsSamePath P((char *str1, char *str2)); +extern boolean_t _DtCmIsSamePath(char *str1, char *str2); -extern boolean_t _DtCmIsSameUser P((char *user1, char *user2)); +extern boolean_t _DtCmIsSameUser(char *user1, char *user2); #endif diff --git a/cde/lib/csa/lutil.h b/cde/lib/csa/lutil.h index 0a1ae552c..8d54e14a1 100644 --- a/cde/lib/csa/lutil.h +++ b/cde/lib/csa/lutil.h @@ -33,16 +33,16 @@ #include "ansi_c.h" -extern char *_DtCmGetPrefix P((char *str, char sep)); +extern char *_DtCmGetPrefix(char *str, char sep); -extern char *_DtCmGetLocalHost P(()); +extern char *_DtCmGetLocalHost(); -extern char *_DtCmGetLocalDomain P((char *hostname)); +extern char *_DtCmGetLocalDomain(char *hostname); -extern char *_DtCmGetHostAtDomain P(()); +extern char *_DtCmGetHostAtDomain(); -extern char *_DtCmGetUserName P(()); +extern char *_DtCmGetUserName(); -extern boolean_t _DtCmIsUserName P((char *user)); +extern boolean_t _DtCmIsUserName(char *user); #endif diff --git a/cde/lib/csa/match.h b/cde/lib/csa/match.h index 02d820ba5..857f05ce6 100644 --- a/cde/lib/csa/match.h +++ b/cde/lib/csa/match.h @@ -36,7 +36,7 @@ #include "cm.h" #include "rtable4.h" -extern CSA_return_code _DtCmHashCriteria P(( +extern CSA_return_code _DtCmHashCriteria( _DtCmNameTable *tbl, CSA_uint32 num_attrs, CSA_attribute *csaattrs, @@ -52,14 +52,14 @@ extern CSA_return_code _DtCmHashCriteria P(( long *id, CSA_uint32 *hnum, cms_attribute **hattrs, - CSA_enum **hops)); + CSA_enum **hops); -extern void _DtCmFreeHashedArrays P(( +extern void _DtCmFreeHashedArrays( CSA_uint32 hnum, cms_attribute *hattrs, - CSA_enum *hops)); + CSA_enum *hops); -extern Appt_4 *_DtCm_match_appts P(( +extern Appt_4 *_DtCm_match_appts( Appt_4 *appts, long id, boolean_t no_end_time_range, @@ -67,7 +67,7 @@ extern Appt_4 *_DtCm_match_appts P(( time_t end2, CSA_uint32 num_attrs, cms_attribute *attrs, - CSA_enum *ops)); + CSA_enum *ops); extern boolean_t _DtCm_match_one_appt( Appt_4 *appt, @@ -75,45 +75,45 @@ extern boolean_t _DtCm_match_one_appt( cms_attribute * attrs, CSA_enum *ops); -extern Reminder_4 *_DtCm_match_reminders P(( +extern Reminder_4 *_DtCm_match_reminders( Reminder_4 *rems, uint num_names, - char **names)); + char **names); -extern CSA_return_code _DtCm_check_operator P(( +extern CSA_return_code _DtCm_check_operator( uint size, CSA_attribute *csaattrs, cms_attribute *cmsattrs, - CSA_enum *ops)); + CSA_enum *ops); -extern boolean_t _DtCm_match_sint32_attribute P(( +extern boolean_t _DtCm_match_sint32_attribute( cms_attribute_value *val1, cms_attribute_value *val2, - CSA_enum op)); + CSA_enum op); -extern boolean_t _DtCm_match_uint32_attribute P(( +extern boolean_t _DtCm_match_uint32_attribute( cms_attribute_value *val1, cms_attribute_value *val2, - CSA_enum op)); + CSA_enum op); -extern boolean_t _DtCm_match_time_attribute P(( +extern boolean_t _DtCm_match_time_attribute( cms_attribute_value *val1, cms_attribute_value *val2, - CSA_enum op)); + CSA_enum op); -extern boolean_t _DtCm_match_time_duration_attribute P(( +extern boolean_t _DtCm_match_time_duration_attribute( cms_attribute_value *val1, cms_attribute_value *val2, - CSA_enum op)); + CSA_enum op); -extern boolean_t _DtCm_match_string_attribute P(( +extern boolean_t _DtCm_match_string_attribute( cms_attribute_value *val1, cms_attribute_value *val2, - CSA_enum op)); + CSA_enum op); -extern boolean_t _DtCm_match_reminder_attribute P(( +extern boolean_t _DtCm_match_reminder_attribute( cms_attribute_value *val1, cms_attribute_value *val2, - CSA_enum op)); + CSA_enum op); #endif diff --git a/cde/lib/csa/nametbl.h b/cde/lib/csa/nametbl.h index b948dc951..bcf63beb0 100644 --- a/cde/lib/csa/nametbl.h +++ b/cde/lib/csa/nametbl.h @@ -52,22 +52,22 @@ typedef struct { char **names; } _DtCmNameTable; -extern _DtCmNameTable *_DtCm_make_name_table P(( +extern _DtCmNameTable *_DtCm_make_name_table( int size, - char **names)); + char **names); -extern void _DtCm_free_name_table P((_DtCmNameTable *tbl)); +extern void _DtCm_free_name_table(_DtCmNameTable *tbl); -extern CSA_return_code _DtCm_add_name_to_table P(( +extern CSA_return_code _DtCm_add_name_to_table( _DtCmNameTable *tbl, int index, - char *newname)); + char *newname); -extern int _DtCm_get_index_from_table P(( +extern int _DtCm_get_index_from_table( _DtCmNameTable *tbl, - char *name)); + char *name); -extern CSA_return_code _DtCmExtendNameTable P(( +extern CSA_return_code _DtCmExtendNameTable( char *name, int index, int type, @@ -75,7 +75,7 @@ extern CSA_return_code _DtCmExtendNameTable P(( int basesize, char **basenames, _DtCmNameTable **tbl, - int **types)); + int **types); #endif /* _NAMETBL_H */ diff --git a/cde/lib/csa/rpccalls.h b/cde/lib/csa/rpccalls.h index 43b9f53ff..91d70772d 100644 --- a/cde/lib/csa/rpccalls.h +++ b/cde/lib/csa/rpccalls.h @@ -40,98 +40,98 @@ * interface to cm rpc calls */ -extern CSA_return_code _DtCm_rpc_open_calendar P((Calendar *cal)); +extern CSA_return_code _DtCm_rpc_open_calendar(Calendar *cal); -extern CSA_return_code _DtCm_rpc_create_calendar P(( +extern CSA_return_code _DtCm_rpc_create_calendar( Calendar *cal, CSA_uint32 num_attrs, - CSA_attribute * attrs)); + CSA_attribute * attrs); -extern CSA_return_code _DtCm_rpc_delete_calendar P((Calendar *cal)); +extern CSA_return_code _DtCm_rpc_delete_calendar(Calendar *cal); -extern CSA_return_code _DtCm_rpc_register_client P(( +extern CSA_return_code _DtCm_rpc_register_client( Calendar *cal, - unsigned long type)); + unsigned long type); -extern CSA_return_code _DtCm_rpc_unregister_client P(( +extern CSA_return_code _DtCm_rpc_unregister_client( Calendar *cal, - unsigned long type)); + unsigned long type); -extern CSA_return_code _DtCm_rpc_enumerate_sequence P(( +extern CSA_return_code _DtCm_rpc_enumerate_sequence( Calendar *cal, _DtCm_libentry *entry, time_t start, time_t end, - _DtCm_libentry **elist_r)); + _DtCm_libentry **elist_r); -extern CSA_return_code _DtCm_rpc_lookup_entries P(( +extern CSA_return_code _DtCm_rpc_lookup_entries( Calendar *cal, CSA_uint32 size, CSA_attribute * attrs, CSA_enum *ops, - _DtCm_libentry **entries_r)); + _DtCm_libentry **entries_r); -extern CSA_return_code _DtCm_rpc_lookup_entry_by_id P(( +extern CSA_return_code _DtCm_rpc_lookup_entry_by_id( Calendar *cal, - _DtCm_libentry *entry)); + _DtCm_libentry *entry); -extern CSA_return_code _DtCm_rpc_lookup_reminder P(( +extern CSA_return_code _DtCm_rpc_lookup_reminder( Calendar *cal, time_t tick, CSA_uint32 num_names, char **reminder_names, CSA_uint32 *num_rems, - CSA_reminder_reference **rems)); + CSA_reminder_reference **rems); -extern CSA_return_code _DtCm_rpc_set_cal_attrs P(( +extern CSA_return_code _DtCm_rpc_set_cal_attrs( Calendar *cal, CSA_uint32 num_attrs, - CSA_attribute * attrs)); + CSA_attribute * attrs); -extern CSA_return_code _DtCm_rpc_get_cal_attrs P(( +extern CSA_return_code _DtCm_rpc_get_cal_attrs( Calendar *cal, int index, CSA_uint32 num_attrs, - char **names)); + char **names); -extern CSA_return_code _DtCm_rpc_insert_entry P(( +extern CSA_return_code _DtCm_rpc_insert_entry( Calendar *cal, CSA_uint32 num_attrs, CSA_attribute * attrs, - _DtCm_libentry **entry_r)); + _DtCm_libentry **entry_r); -extern CSA_return_code _DtCm_rpc_delete_entry P(( +extern CSA_return_code _DtCm_rpc_delete_entry( Calendar *cal, _DtCm_libentry *entry, - CSA_enum scope)); + CSA_enum scope); -extern CSA_return_code _DtCm_rpc_update_entry P(( +extern CSA_return_code _DtCm_rpc_update_entry( Calendar *cal, _DtCm_libentry *oentry, CSA_uint32 num_attrs, CSA_attribute * attrs, CSA_enum scope, - _DtCm_libentry **nentry)); + _DtCm_libentry **nentry); -extern CSA_return_code _DtCm_rpc_list_calendar_attributes P(( +extern CSA_return_code _DtCm_rpc_list_calendar_attributes( Calendar *cal, CSA_uint32 *number_names, - char ***names_r)); + char ***names_r); -extern CSA_return_code _DtCm_rpc_list_calendars P(( +extern CSA_return_code _DtCm_rpc_list_calendars( char *location, CSA_uint32 *number_names, - CSA_calendar_user **names_r)); + CSA_calendar_user **names_r); -extern CSA_return_code _DtCm_do_unregistration P(( +extern CSA_return_code _DtCm_do_unregistration( _DtCm_Connection *conn, char *cal, - unsigned long update_type)); + unsigned long update_type); -extern CSA_return_code _DtCm_do_registration P(( +extern CSA_return_code _DtCm_do_registration( _DtCm_Connection *conn, char *cal, - unsigned long update_type)); + unsigned long update_type); #endif diff --git a/cde/lib/csa/table.h b/cde/lib/csa/table.h index 52f1a447e..03352b7d4 100644 --- a/cde/lib/csa/table.h +++ b/cde/lib/csa/table.h @@ -42,24 +42,24 @@ * Interface to rpc calls of version 2-4 */ -extern CSA_return_code _DtCm_table_create P((Calendar *cal)); +extern CSA_return_code _DtCm_table_create(Calendar *cal); -extern CSA_return_code _DtCm_table_get_access P(( +extern CSA_return_code _DtCm_table_get_access( Calendar *cal, - cms_access_entry **acclist)); + cms_access_entry **acclist); -extern CSA_return_code _DtCm_table_set_access P(( +extern CSA_return_code _DtCm_table_set_access( Calendar *cal, - CSA_access_list alist)); + CSA_access_list alist); -extern CSA_return_code _DtCm_table_lookup_reminder P(( +extern CSA_return_code _DtCm_table_lookup_reminder( Calendar *cal, CSA_uint32 num_names, char **reminder_names, CSA_uint32 *num_rems, - CSA_reminder_reference **rems)); + CSA_reminder_reference **rems); -extern CSA_return_code _DtCm_table_lookup_range P(( +extern CSA_return_code _DtCm_table_lookup_range( Calendar *cal, long start1, long start2, @@ -70,11 +70,11 @@ extern CSA_return_code _DtCm_table_lookup_range P(( uint num_attrs, cms_attribute *attrs, CSA_enum *ops, - _DtCm_libentry **appts)); + _DtCm_libentry **appts); -extern CSA_return_code _DtCm_table_lookup P(( +extern CSA_return_code _DtCm_table_lookup( Calendar *cal, - _DtCm_libentry *entry)); + _DtCm_libentry *entry); /* * This routine looks up events of a repeating sequence. @@ -85,44 +85,44 @@ extern CSA_return_code _DtCm_table_lookup P(( * in the key of the first entry which will be returned in the cms_key * structure pointed to by key. */ -extern CSA_return_code _DtCm_table_lookup_key_range P(( +extern CSA_return_code _DtCm_table_lookup_key_range( Calendar *cal, _DtCm_libentry *entry, long id, time_t start, time_t end, cms_key *key, - _DtCm_libentry **elist_r)); + _DtCm_libentry **elist_r); -extern CSA_return_code _DtCm_table_insert P(( +extern CSA_return_code _DtCm_table_insert( Calendar *cal, uint num_attrs, CSA_attribute * attrs, - _DtCm_libentry **entries)); + _DtCm_libentry **entries); -extern CSA_return_code _DtCm_table_delete P(( +extern CSA_return_code _DtCm_table_delete( Calendar *cal, _DtCm_libentry *entry, - CSA_enum scope)); + CSA_enum scope); -extern CSA_return_code _DtCm_table_update P(( +extern CSA_return_code _DtCm_table_update( Calendar *cal, _DtCm_libentry *oentry, uint num_attrs, CSA_attribute * attrs, CSA_enum scope, - _DtCm_libentry **nentry)); + _DtCm_libentry **nentry); -extern CSA_return_code _DtCm_table_size P(( +extern CSA_return_code _DtCm_table_size( Calendar *cal, - int *size)); + int *size); -extern CSA_return_code _DtCm_table_unregister_target P(( +extern CSA_return_code _DtCm_table_unregister_target( _DtCm_Connection *conn, - char *cal)); + char *cal); -extern CSA_return_code _DtCm_table_register_target P(( +extern CSA_return_code _DtCm_table_register_target( _DtCm_Connection *conn, - char *cal)); + char *cal); #endif diff --git a/cde/lib/csa/updateattrs.h b/cde/lib/csa/updateattrs.h index be8791614..638a0d853 100644 --- a/cde/lib/csa/updateattrs.h +++ b/cde/lib/csa/updateattrs.h @@ -37,7 +37,7 @@ #include "cm.h" #include "nametbl.h" -extern CSA_return_code _DtCmUpdateAttributes P(( +extern CSA_return_code _DtCmUpdateAttributes( uint numsrc, cms_attribute *srcattrs, uint *numdst, @@ -45,34 +45,34 @@ extern CSA_return_code _DtCmUpdateAttributes P(( _DtCmNameTable **tbl, boolean_t caltbl, int **types, - boolean_t makecopy)); + boolean_t makecopy); -extern CSA_return_code _DtCmUpdateAttribute P(( +extern CSA_return_code _DtCmUpdateAttribute( cms_attribute *from, - cms_attribute *to)); + cms_attribute *to); -extern CSA_return_code _DtCmUpdateAccessListAttrVal P(( +extern CSA_return_code _DtCmUpdateAccessListAttrVal( cms_attribute_value *newval, - cms_attribute_value **attrval)); + cms_attribute_value **attrval); -extern CSA_return_code _DtCmUpdateSint32AttrVal P(( +extern CSA_return_code _DtCmUpdateSint32AttrVal( cms_attribute_value *newval, - cms_attribute_value **attrval)); + cms_attribute_value **attrval); -extern CSA_return_code _DtCmUpdateStringAttrVal P(( +extern CSA_return_code _DtCmUpdateStringAttrVal( cms_attribute_value *newval, - cms_attribute_value **attrval)); + cms_attribute_value **attrval); -extern CSA_return_code _DtCmUpdateReminderAttrVal P(( +extern CSA_return_code _DtCmUpdateReminderAttrVal( cms_attribute_value *newval, - cms_attribute_value **attrval)); + cms_attribute_value **attrval); -extern CSA_return_code _DtCmUpdateDateTimeListAttrVal P(( +extern CSA_return_code _DtCmUpdateDateTimeListAttrVal( cms_attribute_value *newval, - cms_attribute_value **attrval)); + cms_attribute_value **attrval); -extern CSA_return_code _DtCmUpdateOpaqueDataAttrVal P(( +extern CSA_return_code _DtCmUpdateOpaqueDataAttrVal( cms_attribute_value *newval, - cms_attribute_value **attrval)); + cms_attribute_value **attrval); #endif diff --git a/cde/lib/csa/xtclient.h b/cde/lib/csa/xtclient.h index 077b8d8b3..7be2b5442 100644 --- a/cde/lib/csa/xtclient.h +++ b/cde/lib/csa/xtclient.h @@ -34,6 +34,6 @@ #include #include "ansi_c.h" -extern void _DtCm_register_xtcallback P((XtAppContext appct)); +extern void _DtCm_register_xtcallback(XtAppContext appct); #endif /* _XTCLIENT_H */ diff --git a/cde/lib/tt/bin/dbck/spec.C b/cde/lib/tt/bin/dbck/spec.C index 18bba3fbc..eaf2d6b72 100644 --- a/cde/lib/tt/bin/dbck/spec.C +++ b/cde/lib/tt/bin/dbck/spec.C @@ -44,14 +44,6 @@ #include "ttdbck.h" #include "tt_db_server_consts.h" -#if !defined(OPT_STRERROR) -// No strerror(), fake it -char * -strerror(int e) -{ - return ((edefState = 1 ; i = 0 ; mpcim(&i, v->MPdisp_val) ; - STRCPY(v->display, make_number(v->MPdisp_val, FALSE)) ; + strcpy(v->display, make_number(v->MPdisp_val, FALSE)) ; set_item(DISPLAYITEM, v->display) ; v->hyperbolic = 0 ; @@ -419,7 +419,7 @@ void doerr(char *errmes) { if (!v->started) return ; - STRCPY(v->display, errmes) ; + strcpy(v->display, errmes) ; set_item(DISPLAYITEM, v->display) ; v->error = 1 ; beep() ; @@ -434,7 +434,7 @@ get_bool_resource(enum res_type rtype, int *boolval) int len, n ; if ((val = get_resource(rtype)) == NULL) return(0) ; - STRCPY(tempstr, val) ; + strcpy(tempstr, val) ; len = strlen(tempstr) ; for (n = 0; n < len; n++) if (isupper(tempstr[n])) tempstr[n] = tolower(tempstr[n]) ; @@ -504,9 +504,9 @@ get_label(int n) temp = buttons[n].str; if(temp != NULL) - STRCPY(v->pstr, temp) ; + strcpy(v->pstr, temp) ; else - STRCPY(v->pstr, ""); + strcpy(v->pstr, ""); } /* Extract command line options. */ @@ -546,7 +546,7 @@ get_options(int argc, char *argv[]) sprintf(msg, opts[(int) O_MODE], next); getparam(next, argv, msg) ; XtFree(msg); - STRCPY(strval, next) ; + strcpy(strval, next) ; len = strlen(strval) ; for (i = 0; i < len; i++) { @@ -571,7 +571,7 @@ get_options(int argc, char *argv[]) break ; case 'b' : INC ; getparam(next, argv, opts[(int) O_BASE]) ; - STRCPY(strval, next) ; + strcpy(strval, next) ; len = strlen(strval) ; for (i = 0; i < len; i++) { @@ -605,7 +605,7 @@ get_options(int argc, char *argv[]) sprintf(msg, opts[(int) O_DISPLAY], next); getparam(next, argv, msg) ; XtFree(msg); - STRCPY(strval, next) ; + strcpy(strval, next) ; len = strlen(strval) ; for (i = 0; i < len; i++) { @@ -645,7 +645,7 @@ get_options(int argc, char *argv[]) sprintf(msg, opts[(int) O_TRIG], next); getparam(next, argv, msg) ; XtFree(msg); - STRCPY(strval, next) ; + strcpy(strval, next) ; len = strlen(strval) ; for (i = 0; i < len; i++) { @@ -695,14 +695,14 @@ getparam(char *s, char *argv[], char *errmes) { char *msg; - if (*argv != NULL && argv[0][0] != '-') STRCPY(s, *argv) ; + if (*argv != NULL && argv[0][0] != '-') strcpy(s, *argv) ; else { msg = (char *) XtMalloc(strlen(mess[(int) MESS_PARAM]) + strlen(errmes) + 3); sprintf(msg, mess[(int) MESS_PARAM], errmes); _DtSimpleError (v->appname, DtError, NULL, msg); - FPRINTF(stderr, mess[(int) MESS_PARAM], errmes) ; + fprintf(stderr, mess[(int) MESS_PARAM], errmes) ; exit(1) ; } } @@ -783,8 +783,8 @@ get_rcfile(char *name) } else if (isval == 'f') { - SSCANF(&line[3], "%s", tmp) ; - STRCPY(v->fun_vals[i], convert(tmp)) ; + sscanf(&line[3], "%s", tmp) ; + strcpy(v->fun_vals[i], convert(tmp)) ; } else if (isval == 'r') { @@ -800,18 +800,18 @@ get_rcfile(char *name) line[strlen(line)-1] = '\0' ; if (isval == 'c') { - STRCPY(tmp, make_number(v->MPcon_vals[i], TRUE)) ; - SPRINTF(v->con_names[i], "%1d: %s [%s]", + strcpy(tmp, make_number(v->MPcon_vals[i], TRUE)) ; + sprintf(v->con_names[i], "%1d: %s [%s]", i, tmp, &line[n]) ; } else - SPRINTF(v->fun_names[i], "%1d: %s [%s]", + sprintf(v->fun_names[i], "%1d: %s [%s]", i, tmp, &line[n]) ; break ; } } } - FCLOSE(rcfd) ; + fclose(rcfd) ; } /* Get a string resource from database. */ @@ -822,7 +822,7 @@ get_str_resource(enum res_type rtype, char *strval) int i, len ; if ((val = get_resource(rtype)) == NULL) return(0) ; - STRCPY(strval, val) ; + strcpy(strval, val) ; len = strlen(strval) ; if(rtype != R_TRIG && rtype != R_DISPLAY) { @@ -1013,7 +1013,7 @@ make_eng_sci(int *MPnumber) } } - STRCPY(fixed, make_fixed(MPmant, MAX_DIGITS-6)) ; + strcpy(fixed, make_fixed(MPmant, MAX_DIGITS-6)) ; len = strlen(fixed) ; for (i = 0; i < len; i++) *optr++ = fixed[i] ; @@ -1515,7 +1515,7 @@ process_stack(int startop, int startnum, int n) int i ; int nptr ; /* Pointer to next number from numeric stack. */ - STRCPY(sdisp, v->display) ; /* Save current display. */ + strcpy(sdisp, v->display) ; /* Save current display. */ nptr = startnum ; v->pending = 0 ; v->cur_op = '?' ; /* Current operation is initially undefined. */ @@ -1546,7 +1546,7 @@ process_stack(int startop, int startnum, int n) v->opsptr = startop - 1 ; push_op(-1) ; save_pending_values(KEY_LPAR) ; - STRCPY(v->display, sdisp) ; /* Restore current display. */ + strcpy(v->display, sdisp) ; /* Restore current display. */ } @@ -1557,8 +1557,8 @@ process_str(char *str, enum menu_type mtype) char save[80]; len = strlen(str) ; - STRCPY(save, v->display) ; - STRCPY(v->display, " ") ; + strcpy(save, v->display) ; + strcpy(v->display, " ") ; set_item(DISPLAYITEM, v->display); for (i = 0 ; i < len; i++) { @@ -1568,7 +1568,7 @@ process_str(char *str, enum menu_type mtype) { if(mtype == M_FUN) { - STRCPY(v->display, save); + strcpy(v->display, save); set_item(DISPLAYITEM, v->display); v->error = 0; } @@ -1613,11 +1613,11 @@ read_rcfiles(void) /* Read .dtcalcrc's from home and current directories. */ for (n = 0; n < MAXREGS; n++) { - STRCPY(tmp, make_number(v->MPcon_vals[n], FALSE)) ; - SPRINTF(name, "%1d: %s [%s]", n, tmp, v->con_names[n]) ; + strcpy(tmp, make_number(v->MPcon_vals[n], FALSE)) ; + sprintf(name, "%1d: %s [%s]", n, tmp, v->con_names[n]) ; - STRCPY(v->con_names[n], name) ; - STRCPY(v->fun_vals[n], "") ; /* Initially empty function strings. */ + strcpy(v->con_names[n], name) ; + strcpy(v->fun_vals[n], "") ; /* Initially empty function strings. */ } if ((home = getenv("HOME")) == NULL) @@ -1638,7 +1638,7 @@ show_display(int *MPval) { if (!v->error) { - STRCPY(v->display, make_number(MPval, TRUE)) ; + strcpy(v->display, make_number(MPval, TRUE)) ; set_item(DISPLAYITEM, v->display) ; } } @@ -1647,9 +1647,9 @@ show_display(int *MPval) void usage(char *progname) { - FPRINTF(stderr, ustrs[(int) USAGE1], PATCHLEVEL) ; - FPRINTF(stderr, "%s", ustrs[(int) USAGE2]) ; - FPRINTF(stderr, "%s", ustrs[(int) USAGE3]) ; + fprintf(stderr, ustrs[(int) USAGE1], PATCHLEVEL) ; + fprintf(stderr, "%s", ustrs[(int) USAGE2]) ; + fprintf(stderr, "%s", ustrs[(int) USAGE3]) ; exit(1) ; } @@ -1668,7 +1668,7 @@ write_rcfile(enum menu_type mtype, int exists, int cfno, char *val, char *commen struct passwd *entry ; /* The user's /etc/passwd entry. */ rcexists = 0 ; - SPRINTF(rcname, "%s/%s", getcwd(pathname, MAXPATHLEN), RCNAME) ; + sprintf(rcname, "%s/%s", getcwd(pathname, MAXPATHLEN), RCNAME) ; if (access(rcname, F_OK) == 0) rcexists = 1 ; else { @@ -1677,17 +1677,17 @@ write_rcfile(enum menu_type mtype, int exists, int cfno, char *val, char *commen if ((entry = getpwuid(getuid())) == NULL) return ; home = entry->pw_dir ; } - SPRINTF(rcname, "%s/%s", home, RCNAME) ; + sprintf(rcname, "%s/%s", home, RCNAME) ; if (access(rcname, F_OK) == 0) rcexists = 1 ; } - STRCPY(tmp_filename, "/tmp/.dtcalcrcXXXXXX") ; - MKTEMP(tmp_filename) ; + strcpy(tmp_filename, "/tmp/.dtcalcrcXXXXXX") ; + mktemp(tmp_filename) ; if ((tmpfd = fopen(tmp_filename, "w+")) == NULL) return ; if (rcexists) { rcfd = fopen(rcname, "r") ; - SPRINTF(sval, " %1d", cfno) ; + sprintf(sval, " %1d", cfno) ; while (fgets(str, MAXLINE, rcfd)) { if (exists) @@ -1695,40 +1695,40 @@ write_rcfile(enum menu_type mtype, int exists, int cfno, char *val, char *commen switch (mtype) { case M_CON : sval[0] = 'c' ; - if (!strncmp(str, sval, 2)) FPUTS("#", tmpfd) ; + if (!strncmp(str, sval, 2)) fputs("#", tmpfd) ; sval[0] = 'C' ; - if (!strncmp(str, sval, 2)) FPUTS("#", tmpfd) ; + if (!strncmp(str, sval, 2)) fputs("#", tmpfd) ; break ; case M_FUN : sval[0] = 'f' ; - if (!strncmp(str, sval, 2)) FPUTS("#", tmpfd) ; + if (!strncmp(str, sval, 2)) fputs("#", tmpfd) ; sval[0] = 'F' ; - if (!strncmp(str, sval, 2)) FPUTS("#", tmpfd) ; + if (!strncmp(str, sval, 2)) fputs("#", tmpfd) ; break; default: break; } } - FPRINTF(tmpfd, "%s", str) ; + fprintf(tmpfd, "%s", str) ; } - FCLOSE(rcfd) ; + fclose(rcfd) ; } switch (mtype) { - case M_CON : FPRINTF(tmpfd, "\nC%1d %s %s\n", cfno, val, comment) ; + case M_CON : fprintf(tmpfd, "\nC%1d %s %s\n", cfno, val, comment) ; break ; case M_FUN : if(strcmp(val, "") != 0) - FPRINTF(tmpfd, "\nF%1d %s %s\n", cfno, val, comment) ; + fprintf(tmpfd, "\nF%1d %s %s\n", cfno, val, comment) ; break; default: break; } - UNLINK(rcname) ; + unlink(rcname) ; rcfd = fopen(rcname, "w") ; - REWIND(tmpfd) ; - while (fgets(str, MAXLINE, tmpfd)) FPRINTF(rcfd, "%s", str) ; - FCLOSE(rcfd) ; - FCLOSE(tmpfd); - UNLINK(tmp_filename) ; + rewind(tmpfd) ; + while (fgets(str, MAXLINE, tmpfd)) fprintf(rcfd, "%s", str) ; + fclose(rcfd) ; + fclose(tmpfd); + unlink(tmp_filename) ; } @@ -1738,7 +1738,7 @@ write_resources(char *filename) char intval[5] ; int MPtemp[MP_SIZE]; - SPRINTF(intval, "%d", v->accuracy) ; + sprintf(intval, "%d", v->accuracy) ; put_resource(R_ACCURACY, intval) ; put_resource(R_DISPLAYED, v->display) ; put_resource(R_BASE, base_str[(int) v->base]) ; diff --git a/cde/programs/dtcalc/calctool.h b/cde/programs/dtcalc/calctool.h index c525ea18a..806d0f7e5 100644 --- a/cde/programs/dtcalc/calctool.h +++ b/cde/programs/dtcalc/calctool.h @@ -31,6 +31,9 @@ * (c) Copyright 1993, 1994 Sun Microsystems, Inc. * * (c) Copyright 1993, 1994 Novell, Inc. * */ +#ifndef _calctool_h +#define _calctool_h + #include @@ -88,14 +91,6 @@ extern char *_DtGetMessage(char *filename, int set, int n, char *s); #endif #endif /* sun */ -/* For all function declarations, if ANSI then use a prototype. */ - -#if defined(__STDC__) -#define P(args) args -#else /* ! __STDC__ */ -#define P(args) () -#endif /* STDC */ - #ifdef hpux #define HIL_PC101_KBD 1 #define HIL_ITF_KBD 2 @@ -116,19 +111,6 @@ extern char *_DtGetMessage(char *filename, int set, int n, char *s); #define MP_SIZE 150 /* Size of the multiple precision values. */ -#define FCLOSE (void) fclose /* To make lint happy. */ -#define FPRINTF (void) fprintf -#define FPUTS (void) fputs -#define FREE (void) free -#define MEMCPY (void) memcpy -#define MKTEMP (void) mktemp -#define REWIND (void) rewind -#define SPRINTF (void) sprintf -#define SSCANF (void) sscanf -#define STRCPY (void) strcpy -#define STRNCAT (void) strncat -#define UNLINK (void) unlink - /* Various pseudo events used by the dtcalc program. */ #define KEYBOARD_DOWN 100 /* Keyboard character was pressed. */ #define KEYBOARD_UP 101 /* Keyboard character was released. */ @@ -552,7 +534,9 @@ struct calcVars { /* Calctool variables and options. */ #ifdef hpux int keybdID; #endif -} CalcVars ; +}; + +extern struct calcVars CalcVars; typedef struct calcVars *Vars ; @@ -568,7 +552,7 @@ typedef struct char *session; } ApplicationArgs, *ApplicationArgsPtr; -ApplicationArgs application_args; +extern ApplicationArgs application_args; /* MP definitions. */ @@ -579,205 +563,206 @@ ApplicationArgs application_args; #define dmax(a, b) (double) max(a, b) #define dmin(a, b) (double) min(a, b) -BOOLEAN ibool P((double)) ; -BOOLEAN ibool2 P((double)) ; +BOOLEAN ibool(double); +BOOLEAN ibool2(double); -char *convert P((char *)) ; -char *get_resource P((enum res_type)) ; -char *make_eng_sci P((int *)) ; -char *make_fixed P((int *, int)) ; -char *make_number P((int *, BOOLEAN)) ; +char *convert(char *); +char *get_resource(enum res_type); +char *make_eng_sci(int *); +char *make_fixed(int *, int); +char *make_number(int *, BOOLEAN); -double mppow_di P((double *, int *)) ; -double mppow_ri P((float *, int *)) ; -double setbool P((BOOLEAN)) ; +double mppow_di(double *, int *); +double mppow_ri(float *, int *); +double setbool(BOOLEAN); -int char_val P((char)) ; -int get_bool_resource P((enum res_type, int *)) ; -int get_index P((char)) ; -int get_int_resource P((enum res_type, int *)) ; -int get_str_resource P((enum res_type, char *)) ; -int main P((int, char **)) ; +int char_val(char); +int get_bool_resource(enum res_type, int *); +int get_index(char); +int get_int_resource(enum res_type, int *); +int get_str_resource(enum res_type, char *); +int main(int, char **); -void beep P(()) ; -void check_ow_beep P(()) ; -void clear_display P(()) ; -void doerr P((char *)) ; -void do_accuracy P(()) ; -void do_ascii P(()) ; -void do_base P(()) ; -void set_base P(()) ; -void do_business P(()) ; -void do_calc P(()) ; -void do_dtcalc P((int, char **)) ; -void do_clear P(()) ; -void do_constant P(()) ; -void do_delete P(()) ; -void do_exchange P(()) ; -void do_expno P(()) ; -void do_factorial P((int *, int *)) ; -void do_frame P(()) ; -void do_function P(()) ; -void do_immed P(()) ; -void do_keys P(()) ; -void do_mode P(()) ; -void do_none P(()) ; -void do_number P(()) ; -void do_numtype P(()) ; -void do_paren P(()) ; -void set_numtype P((enum num_type dtype)); -void do_nothing P(()) ; -void do_pending P(()) ; -void do_point P(()) ; -void do_portion P(()) ; -double do_round P((double, int)) ; -void do_shift P(()) ; -void do_sto_rcl P(()) ; -void do_trig P(()) ; -void do_trigtype P(()) ; -void draw_button P((int, enum fcp_type, int, int, int)) ; -void get_display P(()) ; -void get_key_val P((char *, char *)) ; -void get_label P((int)) ; -void get_options P((int, char **)) ; -void getparam P((char *, char **, char *)) ; -void get_rcfile P((char *)) ; -void grey_button P((int, int, int)) ; -void grey_buttons P((enum base_type)) ; -void handle_menu_selection P((int, int)) ; -void handle_selection P(()) ; -void initialize P(()) ; -void init_cmdline_opts P(()) ; -void init_graphics P(()) ; -void init_options P(()) ; -void init_text P(()) ; -void init_vars P(()) ; -void key_init P(()) ; -void load_resources P(()) ; -void make_frames P(()) ; -void make_items P(()) ; -void make_modewin P(()) ; -void make_fin_registers P(()) ; -void make_registers P((int)) ; -void MPstr_to_num P((char *, enum base_type, int *)) ; -void paren_disp P((char)) ; -void process_event P((int)) ; -void process_item P((int)) ; -void process_parens P((char)) ; -void process_stack P((int, int, int)) ; -void process_str P((char *, enum menu_type)) ; -void push_num P((int *)) ; -void push_op P((int)) ; -void put_resource P((enum res_type, char *)) ; -void read_rcfiles P(()) ; -void read_resources P(()) ; -void redraw_buttons P(()) ; -void save_cmdline P((int, char **)) ; -void save_pending_values P((int)) ; -void save_resources P((char *)) ; -void blank_display P(()) ; -void ErrorDialog P((char *string)); -void set_item P((enum item_type, char *)) ; -void set_title P((enum fcp_type, char *)) ; -void show_ascii_frame P(()) ; -void show_display P((int *)) ; -void srand48 P(()) ; -void start_tool P(()) ; -void switch_hands P((int)) ; -void usage P((char *)) ; -void win_display P((enum fcp_type, int)) ; -void write_cmdline P(()) ; -void write_rcfile P((enum menu_type, int, int, char *, char *)) ; -void write_resources P((char *)) ; -void RestoreSession P(()) ; -void TimerEvent P(( XtPointer, XtIntervalId *)) ; -void ErrDialog P(( char *, Widget )); +void beep(void); +void check_ow_beep(void); +void clear_display(void); +void doerr(char *); +void do_accuracy(void); +void do_ascii(void); +void do_base(void); +void set_base(enum base_type type); +void do_business(void); +void do_calc(void); +void do_dtcalc(int, char **); +void do_clear(void); +void do_constant(void); +void do_delete(void); +void do_exchange(void); +void do_expno(void); +void do_factorial(int *, int *); +void do_frame(void); +void do_function(void); +void do_immed(void); +void do_keys(void); +void do_mode(void); +void do_none(void); +void do_number(void); +void do_numtype(void); +void do_paren(void); +void set_numtype(enum num_type dtype); +void do_nothing(void); +void do_pending(void); +void do_point(void); +void do_portion(void); +double do_round(double, int); +void do_shift(void); +void do_sto_rcl(void); +void do_trig(void); +void do_trigtype(void); +void draw_button(int, enum fcp_type, int, int, int); +void get_display(void); +void get_key_val(char *, char *); +void get_label(int); +void get_options(int, char **); +void getparam(char *, char **, char *); +void get_rcfile(char *); +void grey_button(int, int, int); +void grey_buttons(enum base_type); +void handle_menu_selection(int, int); +void handle_selection(void); +void initialize(void); +void init_cmdline_opts(void); +void init_graphics(void); +void init_options(void); +void init_text(void); +void init_vars(void); +void key_init(void); +void load_resources(void); +void make_frames(void); +void make_items(void); +void make_modewin(void); +void make_fin_registers(void); +void make_registers(int); +void MPstr_to_num(char *, enum base_type, int *); +void paren_disp(char); +void process_event(int); +void process_item(int); +void process_parens(char); +void process_stack(int, int, int); +void process_str(char *, enum menu_type); +void push_num(int *); +void push_op(int); +void put_resource(enum res_type, char *); +void read_rcfiles(void); +void read_resources(void); +void redraw_buttons(void); +void save_cmdline(int, char **); +void save_pending_values(int); +void save_resources(char *); +void blank_display(void); +void ErrorDialog(char *string); +void set_item(enum item_type, char *); +void set_title(enum fcp_type, char *); +void show_ascii_frame(void); +void show_display(int *); +void srand48(long); +void start_tool(void); +void switch_hands(int); +void usage(char *); +void win_display(enum fcp_type, int); +void write_cmdline(void); +void write_rcfile(enum menu_type, int, int, char *, char *); +void write_resources(char *); +void RestoreSession(void); +void TimerEvent(XtPointer, XtIntervalId *); +void ErrDialog(char *, Widget ); /* MP routines not found in the Brent FORTRAN package. */ -void mpacos P((int *, int *)) ; -void mpacosh P((int *, int *)) ; -void mpasinh P((int *, int *)) ; -void mpatanh P((int *, int *)) ; -void mplog10 P((int *, int *)) ; +void mpacos(int *, int *); +void mpacosh(int *, int *); +void mpasinh(int *, int *); +void mpatanh(int *, int *); +void mplog10(int *, int *); /* Brent MP routines in mp.c. */ -int mpcmpi P((int *, int *)) ; -int mpcmpr P((int *, float *)) ; -int mpcomp P((int *, int *)) ; -int pow_ii P((int *, int *)) ; +int mpcmpi(int *, int *); +int mpcmpr(int *, float *); +int mpcomp(int *, int *); +int pow_ii(int *, int *); -int mpeq P((int *, int *)) ; -int mpge P((int *, int *)) ; -int mpgt P((int *, int *)) ; -int mple P((int *, int *)) ; -int mplt P((int *, int *)) ; +int mpeq(int *, int *); +int mpge(int *, int *); +int mpgt(int *, int *); +int mple(int *, int *); +int mplt(int *, int *); -void mpabs P((int *, int *)) ; -void mpadd P((int *, int *, int *)) ; -void mpadd2 P((int *, int *, int *, int *, int *)) ; -void mpadd3 P((int *, int *, int *, int *, int *)) ; -void mpaddi P((int *, int *, int *)) ; -void mpaddq P((int *, int *, int *, int *)) ; -void mpart1 P((int *, int *)) ; -void mpasin P((int *, int *)) ; -void mpatan P((int *, int *)) ; -void mpcdm P((double *, int *)) ; -void mpchk P((int *, int *)) ; -void mpcim P((int *, int *)) ; -void mpcmd P((int *, double *)) ; -void mpcmf P((int *, int *)) ; -void mpcmi P((int *, int *)) ; -void mpcmim P((int *, int *)) ; -void mpcmr P((int *, float *)) ; -void mpcos P((int *, int *)) ; -void mpcosh P((int *, int *)) ; -void mpcqm P((int *, int *, int *)) ; -void mpcrm P((float *, int *)) ; -void mpdiv P((int *, int *, int *)) ; -void mpdivi P((int *, int *, int *)) ; -void mperr P(()) ; -void mpexp P((int *, int *)) ; -void mpexp1 P((int *, int *)) ; -void mpext P((int *, int *, int *)) ; -void mpgcd P((int *, int *)) ; -void mpln P((int *, int *)) ; -void mplns P((int *, int *)) ; -void mpmaxr P((int *)) ; -void mpmlp P((int *, int *, int *, int *)) ; -void mpmul P((int *, int *, int *)) ; -void mpmul2 P((int *, int *, int *, int *)) ; -void mpmuli P((int *, int *, int *)) ; -void mpmulq P((int *, int *, int *, int *)) ; -void mpneg P((int *, int *)) ; -void mpnzr P((int *, int *, int *, int *)) ; -void mpovfl P((int *)) ; -void mppi P((int *)) ; -void mppwr P((int *, int *, int *)) ; -void mppwr2 P((int *, int *, int *)) ; -void mprec P((int *, int *)) ; -void mproot P((int *, int *, int *)) ; -void mpset P((int *, int *, int *)) ; -void mpsin P((int *, int *)) ; -void mpsin1 P((int *, int *, int *)) ; -void mpsinh P((int *, int *)) ; -void mpsqrt P((int *, int *)) ; -void mpstr P((int *, int *)) ; -void mpsub P((int *, int *, int *)) ; -void mptanh P((int *, int *)) ; -void mpunfl P((int *)) ; +void mpabs(int *, int *); +void mpadd(int *, int *, int *); +void mpadd2(int *, int *, int *, int *, int *); +void mpadd3(int *, int *, int *, int *, int *); +void mpaddi(int *, int *, int *); +void mpaddq(int *, int *, int *, int *); +void mpart1(int *, int *); +void mpasin(int *, int *); +void mpatan(int *, int *); +void mpcdm(double *, int *); +void mpchk(int *, int *); +void mpcim(int *, int *); +void mpcmd(int *, double *); +void mpcmf(int *, int *); +void mpcmi(int *, int *); +void mpcmim(int *, int *); +void mpcmr(int *, float *); +void mpcos(int *, int *); +void mpcosh(int *, int *); +void mpcqm(int *, int *, int *); +void mpcrm(float *, int *); +void mpdiv(int *, int *, int *); +void mpdivi(int *, int *, int *); +void mperr(void); +void mpexp(int *, int *); +void mpexp1(int *, int *); +void mpext(int *, int *, int *); +void mpgcd(int *, int *); +void mpln(int *, int *); +void mplns(int *, int *); +void mpmaxr(int *); +void mpmlp(int *, int *, int *, int *); +void mpmul(int *, int *, int *); +void mpmul2(int *, int *, int *, int *); +void mpmuli(int *, int *, int *); +void mpmulq(int *, int *, int *, int *); +void mpneg(int *, int *); +void mpnzr(int *, int *, int *, int *); +void mpovfl(int *); +void mppi(int *); +void mppwr(int *, int *, int *); +void mppwr2(int *, int *, int *); +void mprec(int *, int *); +void mproot(int *, int *, int *); +void mpset(int *, int *, int *); +void mpsin(int *, int *); +void mpsin1(int *, int *, int *); +void mpsinh(int *, int *); +void mpsqrt(int *, int *); +void mpstr(int *, int *); +void mpsub(int *, int *, int *); +void mptanh(int *, int *); +void mpunfl(int *); /* Help routines */ -void Help P((char *, char *)) ; -void HelpRequestCB P(()) ; -void HelpModeCB P(()) ; -void HelpCloseCB P(()) ; -void HelpHyperlinkCB P(()) ; -void DisplayHelp P((char *, char *)) ; -void CenterMsgCB P(()) ; -void HelpHelp P(()) ; -void SetWmHnts P(()) ; +void Help(char *, char *); +void HelpRequestCB(Widget, caddr_t, caddr_t); +void HelpModeCB(Widget, caddr_t, caddr_t); +void HelpCloseCB(Widget, caddr_t, caddr_t); +void HelpHyperlinkCB(Widget, caddr_t, caddr_t); +void DisplayHelp(char *, char *); +void CenterMsgCB(Widget, XtPointer, XtPointer); +void HelpHelp(void); +void SetWmHnts(void); -void _DtmapCB P((Widget, XtPointer, XtPointer)) ; +void _DtmapCB(Widget, XtPointer, XtPointer); -void set_option_menu P((int, int)) ; +void set_option_menu(int, int); +#endif /* _calctool_h */ diff --git a/cde/programs/dtcalc/ds_common.c b/cde/programs/dtcalc/ds_common.c index 45076a0e8..478acb147 100644 --- a/cde/programs/dtcalc/ds_common.c +++ b/cde/programs/dtcalc/ds_common.c @@ -36,18 +36,14 @@ #include #include "ds_common.h" -#define FREE (void) free -#define STRCPY (void) strcpy - - void read_str(char **str, char *value) { - if (*str != NULL) FREE(*str) ; + if (*str != NULL) free(*str) ; if (value != NULL && strlen(value)) { *str = (char *) malloc((unsigned) (strlen(value) + 1)) ; - STRCPY(*str, value) ; + strcpy(*str, value) ; } else *str = NULL ; } diff --git a/cde/programs/dtcalc/ds_common.h b/cde/programs/dtcalc/ds_common.h index 80da300bb..6077aa536 100644 --- a/cde/programs/dtcalc/ds_common.h +++ b/cde/programs/dtcalc/ds_common.h @@ -38,16 +38,8 @@ #include #include -/* For all function declarations, if ANSI then use a prototype. */ +char *set_bool(int); -#if defined(__STDC__) -#define P(args) args -#else /* ! __STDC__ */ -#define P(args) () -#endif /* STDC */ - -char *set_bool P((int)) ; - -void read_str P((char **, char *)) ; +void read_str(char **, char *); #endif /*_ds_common_h*/ diff --git a/cde/programs/dtcalc/ds_popup.c b/cde/programs/dtcalc/ds_popup.c index 39d9b1d8f..ea475eb0a 100644 --- a/cde/programs/dtcalc/ds_popup.c +++ b/cde/programs/dtcalc/ds_popup.c @@ -50,7 +50,7 @@ extern XmWidgetExtData _XmGetWidgetExtData( #include "calctool.h" #include "motif.h" -void _DtChildPosition P((Widget, Widget, Position *, Position *)) ; +void _DtChildPosition(Widget, Widget, Position *, Position *); /* ARGSUSED */ void diff --git a/cde/programs/dtcalc/ds_popup.h b/cde/programs/dtcalc/ds_popup.h index 5775134db..769747aff 100644 --- a/cde/programs/dtcalc/ds_popup.h +++ b/cde/programs/dtcalc/ds_popup.h @@ -38,14 +38,6 @@ #include #include -/* For all function declarations, if ANSI then use a prototype. */ - -#if defined(__STDC__) -#define P(args) args -#else /* ! __STDC__ */ -#define P(args) () -#endif /* STDC */ - /* Location ops for ds_position_popup(). */ enum ds_location_op { @@ -58,12 +50,12 @@ enum ds_location_op { DS_POPUP_CENTERED /* Center popup within baseframe */ } ; -int ds_position_popup P((Widget, Widget, enum ds_location_op)) ; -int ds_force_popup_on_screen P((Widget, int *, int *)) ; +int ds_position_popup(Widget, Widget, enum ds_location_op); +int ds_force_popup_on_screen(Widget, int *, int *); -void ds_get_screen_size P((Widget, int *, int *)) ; +void ds_get_screen_size(Widget, int *, int *); -void _DtGenericMapWindow P((Widget shell, Widget parent )); -void _DtChildPosition P((Widget w, Widget parent, Position *newX, Position *newY)); +void _DtGenericMapWindow(Widget shell, Widget parent); +void _DtChildPosition(Widget w, Widget parent, Position *newX, Position *newY); #endif /*!_ds_popup_h*/ diff --git a/cde/programs/dtcalc/ds_widget.h b/cde/programs/dtcalc/ds_widget.h index da1291b9b..1becb092e 100644 --- a/cde/programs/dtcalc/ds_widget.h +++ b/cde/programs/dtcalc/ds_widget.h @@ -45,14 +45,6 @@ #include #include -/* For all function declarations, if ANSI then use a prototype. */ - -#if defined(__STDC__) -#define P(args) args -#else /* ! __STDC__ */ -#define P(args) () -#endif /* STDC */ - enum choice_type { CH_ACTIVE, CH_VALUE } ; /* Choice operations. */ /* Text widget operations. */ @@ -74,20 +66,20 @@ struct tW_struct { /* Text widget structure. */ Widget textfield ; /* xmTextWidgetClass. */ } ; -int get_choice P((struct cW_struct *, enum choice_type)) ; +int get_choice(struct cW_struct *, enum choice_type); -struct cW_struct *make_choiceW P((Widget, char *, char **, int, int, - int, void (*)())) ; -struct tW_struct *make_textW P((Widget, char *)) ; +struct cW_struct *make_choiceW(Widget, char *, char **, int, int, + int, void (*)()); +struct tW_struct *make_textW(Widget, char *); -Widget make_butW P((Widget, char *)) ; -Widget make_labelW P((Widget, char *)) ; -Widget make_manW P((char *, Widget, int, int)) ; -Widget make_toggleW P((Widget, char *)) ; +Widget make_butW(Widget, char *); +Widget make_labelW(Widget, char *); +Widget make_manW(char *, Widget, int, int); +Widget make_toggleW(Widget, char *); -void set_choice P((struct cW_struct *, enum choice_type, int)) ; -void set_choice_help P((struct cW_struct *, char *)) ; -void set_text_help P((struct tW_struct *, char *)) ; -void set_text_str P((struct tW_struct *, enum text_type, char *)) ; +void set_choice(struct cW_struct *, enum choice_type, int); +void set_choice_help(struct cW_struct *, char *); +void set_text_help(struct tW_struct *, char *); +void set_text_str(struct tW_struct *, enum text_type, char *); #endif /*_ds_widget_h*/ diff --git a/cde/programs/dtcalc/ds_xlib.h b/cde/programs/dtcalc/ds_xlib.h index 1afdd6fbb..5e50abc18 100644 --- a/cde/programs/dtcalc/ds_xlib.h +++ b/cde/programs/dtcalc/ds_xlib.h @@ -39,31 +39,23 @@ #include #include -/* For all function declarations, if ANSI then use a prototype. */ - -#if defined(__STDC__) -#define P(args) args -#else /* ! __STDC__ */ -#define P(args) () -#endif /* STDC */ - /* Function declarations. */ -char *ds_get_resource P((XrmDatabase, char *, char *)) ; +char *ds_get_resource(XrmDatabase, char *, char *); -int ds_get_choice_value P((Widget)) ; -int ds_get_strwidth P((XFontStruct *, char *)) ; -int ds_save_resources P((XrmDatabase, char *)) ; +int ds_get_choice_value(Widget) ; +int ds_get_strwidth(XFontStruct *, char *); +int ds_save_resources(XrmDatabase, char *) ; -void ds_add_help P((Widget, char *)) ; -void ds_beep P((Display *)) ; -void ds_get_geometry_size P((char *, int *, int *)) ; -void ds_get_frame_size P((Widget, int *, int *, int *, int *)) ; -void ds_put_resource P((XrmDatabase *, char *, char *, char *)) ; -void ds_save_cmdline P((Display *, Window, int, char **)) ; -void ds_set_choice_value P((Widget, int)) ; -void ds_set_frame_size P((Widget, int, int, int, int)) ; +void ds_add_help(Widget, char *); +void ds_beep(Display *); +void ds_get_geometry_size(char *, int *, int *); +void ds_get_frame_size(Widget, int *, int *, int *, int *); +void ds_put_resource(XrmDatabase *, char *, char *, char *); +void ds_save_cmdline(Display *, Window, int, char **); +void ds_set_choice_value(Widget, int); +void ds_set_frame_size(Widget, int, int, int, int); -XrmDatabase ds_load_resources P((Display *)) ; +XrmDatabase ds_load_resources(Display *); #endif /*_ds_xlib_h*/ diff --git a/cde/programs/dtcalc/functions.c b/cde/programs/dtcalc/functions.c index f1d4bcf19..e6ca52e6e 100644 --- a/cde/programs/dtcalc/functions.c +++ b/cde/programs/dtcalc/functions.c @@ -336,7 +336,7 @@ do_business(void) /* Perform special business mode calculations. */ make_registers(FIN) ; v->funstate = 1; - STRCPY(v->display, display_number); + strcpy(v->display, display_number); set_item(DISPLAYITEM, v->display); need_show = FALSE; } @@ -641,15 +641,15 @@ do_expno(void) /* Get exponential number. */ v->pointed = (strchr(v->display, '.') != NULL) ; if (!v->new_input) { - STRCPY(v->display, "1.0 +") ; + strcpy(v->display, "1.0 +") ; v->new_input = v->pointed = 1 ; } else if (!v->pointed) { - STRNCAT(v->display, ". +", 3) ; + strncat(v->display, ". +", 3) ; v->pointed = 1 ; } - else if (!v->key_exp) STRNCAT(v->display, " +", 2) ; + else if (!v->key_exp) strncat(v->display, " +", 2) ; v->toclear = 0 ; v->key_exp = 1 ; v->exp_posn = strchr(v->display, '+') ; @@ -910,7 +910,7 @@ do_number(void) if (v->toclear) { - SPRINTF(v->display, "%c", nextchar) ; + sprintf(v->display, "%c", nextchar) ; v->toclear = 0 ; } else @@ -990,7 +990,7 @@ do_paren(void) if(tmpdb == 0.0) { v->cur_op = '?'; - STRCPY(v->display, "") ; + strcpy(v->display, "") ; set_item(DISPLAYITEM, v->display) ; } else @@ -1009,7 +1009,7 @@ do_paren(void) } else { - STRCPY(v->display, "") ; + strcpy(v->display, "") ; set_item(DISPLAYITEM, v->display) ; } } @@ -1127,10 +1127,10 @@ do_point(void) /* Handle numeric point. */ { if (v->toclear) { - STRCPY(v->display, ".") ; + strcpy(v->display, ".") ; v->toclear = 0 ; } - else STRNCAT(v->display, ".", 1) ; + else strncat(v->display, ".", 1) ; v->pointed = 1 ; } else @@ -1644,7 +1644,7 @@ process_parens(char current) { set_item(DISPLAYITEM, vstrs[(int) V_ERROR]) ; set_item(OPITEM, vstrs[(int) V_CLR]) ; - STRCPY(v->display, vstrs[(int) V_ERROR]) ; + strcpy(v->display, vstrs[(int) V_ERROR]) ; } else { @@ -1664,7 +1664,7 @@ push_num(int *MPval) /* Try to push value onto the numeric stack. */ if (v->numsptr < 0) return ; if (v->numsptr >= MAXSTACK) { - STRCPY(v->display, vstrs[(int) V_NUMSTACK]) ; + strcpy(v->display, vstrs[(int) V_NUMSTACK]) ; set_item(DISPLAYITEM, v->display) ; v->error = 1 ; beep() ; @@ -1686,7 +1686,7 @@ push_op(int val) /* Try to push value onto the operand stack. */ if (v->opsptr < 0) return ; if (v->opsptr >= MAXSTACK) { - STRCPY(v->display, vstrs[(int) V_OPSTACK]) ; + strcpy(v->display, vstrs[(int) V_OPSTACK]) ; set_item(DISPLAYITEM, v->display) ; v->error = 1 ; set_item(OPITEM, vstrs[(int) V_CLR]) ; diff --git a/cde/programs/dtcalc/help.c b/cde/programs/dtcalc/help.c index 0d60cc780..5eea3ad9a 100644 --- a/cde/programs/dtcalc/help.c +++ b/cde/programs/dtcalc/help.c @@ -56,7 +56,7 @@ extern struct button buttons[] ; /* Calculator button values. */ extern Boolean ignore_event; extern XtIntervalId timerId; -extern void _DtChildPosition P((Widget, Widget, Position *, Position *)) ; +extern void _DtChildPosition(Widget, Widget, Position *, Position *); typedef struct _helpStruct { struct _helpStruct *pNext; @@ -65,8 +65,8 @@ typedef struct _helpStruct { Boolean inUse; } HelpStruct; -static Widget GetHelpDialog P(()) ; -static void UnmanageCB P(()) ; +static Widget GetHelpDialog(void); +static void UnmanageCB(Widget, XtPointer, XtPointer) ; void Help(char *helpVolume, char *locationId) diff --git a/cde/programs/dtcalc/motif.c b/cde/programs/dtcalc/motif.c index 411d381f5..6fbcde177 100644 --- a/cde/programs/dtcalc/motif.c +++ b/cde/programs/dtcalc/motif.c @@ -112,6 +112,9 @@ extern XmWidgetExtData _XmGetWidgetExtData( #include "ds_popup.h" #include "ds_xlib.h" + +ApplicationArgs application_args; +XVars X; Boolean colorSrv; static XtResource resources[] = @@ -184,47 +187,47 @@ typedef struct Window icon; } WM_STATE; -void menu_proc P((Widget, XtPointer, XtPointer)) ; -void show_ascii P((Widget, XtPointer, XtPointer)) ; -void write_cf_value P((Widget, XtPointer, XtPointer)) ; -void close_cf P((Widget, XtPointer, XtPointer)) ; -void close_ascii P((Widget, XtPointer, XtPointer)) ; -void move_cf P((Widget, XtPointer, XtPointer)) ; -void FocusInCB P((Widget, XtPointer, XtPointer)) ; -void map_popup P((Widget, XtPointer, XtPointer)) ; +void menu_proc(Widget, XtPointer, XtPointer); +void show_ascii(Widget, XtPointer, XtPointer); +void write_cf_value(Widget, XtPointer, XtPointer); +void close_cf(Widget, XtPointer, XtPointer); +void close_ascii(Widget, XtPointer, XtPointer); +void move_cf(Widget, XtPointer, XtPointer); +void FocusInCB(Widget, XtPointer, XtPointer); +void map_popup(Widget, XtPointer, XtPointer); -static int event_is_keypad P((XEvent *)) ; -static int get_next_event P((Widget, int, XEvent *)) ; -static int is_window_showing P((Widget)) ; +static int event_is_keypad(XEvent *); +static int get_next_event(Widget, int, XEvent *); +static int is_window_showing(Widget); -static KeySym keypad_keysym P((XEvent *)) ; +static KeySym keypad_keysym(XEvent *); -static void modelineValueChanged P((Widget, XtPointer, XtPointer)) ; -static void dtcalc_kkeyboard_create P((Widget)) ; -static void dtcalc_kpanel_create P((Widget)) ; -static void confirm_callback P((Widget, XtPointer, XtPointer)) ; -static void create_cfframe P(()) ; -static void create_menu P((enum menu_type, Widget, int)) ; -static void do_button P((Widget, XtPointer, XtPointer)) ; -static void do_confirm_notice P((Widget, char *)) ; -static void do_continue_notice P((Widget, char *)) ; -static void close_reg P((Widget, XtPointer, XtPointer)) ; -static void event_proc P((Widget, XtPointer, XEvent *, Boolean *)) ; -static void frame_interpose P((Widget, XtPointer, XEvent *, Boolean *)) ; -static void menu_handler P((Widget, XtPointer, XEvent *, Boolean *)) ; -static void popupHandler P((Widget, XtPointer, XEvent *, Boolean *)) ; -static void new_cf_value P((Widget, XtPointer, XtPointer)) ; -static void do_memory P((Widget, XtPointer, XtPointer)) ; -static void switch_mode P((enum mode_type)) ; -static void update_cf_value P(()) ; -static void xerror_interpose P((Display *, XErrorEvent *)) ; +static void modelineValueChanged(Widget, XtPointer, XtPointer); +static void dtcalc_kkeyboard_create(Widget); +static void dtcalc_kpanel_create(Widget); +static void confirm_callback(Widget, XtPointer, XtPointer); +static void create_cfframe(void); +static void create_menu(enum menu_type, Widget, int); +static void do_button(Widget, XtPointer, XtPointer); +static void do_confirm_notice(Widget, char *); +static void do_continue_notice(Widget, char *); +static void close_reg(Widget, XtPointer, XtPointer); +static void event_proc(Widget, XtPointer, XEvent *, Boolean *); +static void frame_interpose(Widget, XtPointer, XEvent *, Boolean *); +static void menu_handler(Widget, XtPointer, XEvent *, Boolean *); +static void popupHandler(Widget, XtPointer, XEvent *, Boolean *); +static void new_cf_value(Widget, XtPointer, XtPointer); +static void do_memory(Widget, XtPointer, XtPointer); +static void switch_mode(enum mode_type); +static void update_cf_value(void); +static void xerror_interpose(Display *, XErrorEvent *); -static Widget button_create P((Widget, int, int, int, int)) ; -static void save_state P((Widget, XtPointer, XtPointer)) ; -static void SaveSession P(( char *, char * )) ; -static void setCalcHints P(()) ; +static Widget button_create(Widget, int, int, int, int); +static void save_state(Widget, XtPointer, XtPointer); +static void SaveSession(char *, char *); +static void setCalcHints(void); -static char * _DtcalcStripSpaces P(( char * )) ; +static char * _DtcalcStripSpaces(char *); static void ProcessMotifSelection(Widget); static void create_menu_bar(Widget parent); @@ -292,7 +295,7 @@ main(int argc, char **argv) tmpStr = GETMESSAGE(2, 31, "Could not open display.\n"); msg = XtNewString(tmpStr); - FPRINTF(stderr, "%s", msg) ; + fprintf(stderr, "%s", msg) ; exit(1) ; } @@ -443,7 +446,7 @@ button_create(Widget owner, int row, int column, int maxrows, int maxcols) if (mtype != M_NONE) create_menu(mtype, button, n) ; val = (v->curwin << 16) + n ; XtAddCallback(button, XmNactivateCallback, do_button, (XtPointer) val) ; - XtAddCallback(button, XmNhelpCallback, HelpRequestCB, (XtPointer) val) ; + XtAddCallback(button, XmNhelpCallback, (void (*)(Widget, XtPointer, XtPointer)) HelpRequestCB, (XtPointer) val) ; XtAddEventHandler(button, KeyPressMask | KeyReleaseMask, FALSE, event_proc, NULL) ; @@ -501,7 +504,7 @@ dtcalc_initialize_rframe(Widget owner, int type) XmNdefaultPosition, FALSE, NULL) ; - SPRINTF(str, "register%1d", 0) ; + sprintf(str, "register%1d", 0) ; X->registers[0] = XtVaCreateManagedWidget(str, xmLabelWidgetClass, form, @@ -515,7 +518,7 @@ dtcalc_initialize_rframe(Widget owner, int type) for (i = 1; i < MAXREGS; i++) { - SPRINTF(str, "register%1d", i) ; + sprintf(str, "register%1d", i) ; X->registers[i] = XtVaCreateManagedWidget(str, xmLabelWidgetClass, form, @@ -584,7 +587,7 @@ dtcalc_initialize_rframe(Widget owner, int type) XmNdefaultPosition, FALSE, NULL) ; - SPRINTF(str, "fregister%1d", 0) ; + sprintf(str, "fregister%1d", 0) ; X->fregisters[0] = XtVaCreateManagedWidget(str, xmLabelWidgetClass, form, @@ -598,7 +601,7 @@ dtcalc_initialize_rframe(Widget owner, int type) for (i = 1; i < FINREGS; i++) { - SPRINTF(str, "fregister%1d", i) ; + sprintf(str, "fregister%1d", i) ; X->fregisters[i] = XtVaCreateManagedWidget(str, xmLabelWidgetClass, form, @@ -612,7 +615,7 @@ dtcalc_initialize_rframe(Widget owner, int type) NULL) ; } - SPRINTF(str, "fregistervals%1d", 0) ; + sprintf(str, "fregistervals%1d", 0) ; X->fregistersvals[0] = XtVaCreateManagedWidget(str, xmLabelWidgetClass, form, @@ -629,7 +632,7 @@ dtcalc_initialize_rframe(Widget owner, int type) for (i = 1; i < FINREGS; i++) { - SPRINTF(str, "fregistervals%1d", i) ; + sprintf(str, "fregistervals%1d", i) ; X->fregistersvals[i] = XtVaCreateManagedWidget(str, xmLabelWidgetClass, form, @@ -803,7 +806,7 @@ dtcalc_kpanel_create(Widget owner) XmNleftAttachment, XmATTACH_FORM, XmNnavigationType, XmTAB_GROUP, NULL) ; - XtAddCallback(X->textFrame, XmNhelpCallback, HelpRequestCB, + XtAddCallback(X->textFrame, XmNhelpCallback, (void (*)(Widget, XtPointer, XtPointer)) HelpRequestCB, (XtPointer)HELP_DISPLAY) ; X->textForm = XtVaCreateManagedWidget("textForm", @@ -813,7 +816,7 @@ dtcalc_kpanel_create(Widget owner) XmNbackground, tmp_pixelbg, XmNforeground, tmp_pixelfg, NULL) ; - XtAddCallback(X->textForm, XmNhelpCallback, HelpRequestCB, + XtAddCallback(X->textForm, XmNhelpCallback, (void (*)(Widget, XtPointer, XtPointer)) HelpRequestCB, (XtPointer)HELP_DISPLAY) ; X->modevals[(int) DISPLAYITEM] = XtVaCreateManagedWidget("display", @@ -830,7 +833,7 @@ dtcalc_kpanel_create(Widget owner) XmNbackground, tmp_pixelbg, XmNforeground, tmp_pixelfg, NULL) ; - XtAddCallback(X->modevals[(int) DISPLAYITEM], XmNhelpCallback, HelpRequestCB, + XtAddCallback(X->modevals[(int) DISPLAYITEM], XmNhelpCallback, (void (*)(Widget, XtPointer, XtPointer)) HelpRequestCB, (XtPointer) HELP_DISPLAY) ; XtAddEventHandler(X->modevals[(int) DISPLAYITEM], KeyPressMask | KeyReleaseMask, FALSE, event_proc, NULL) ; @@ -848,7 +851,7 @@ dtcalc_kpanel_create(Widget owner) XmNleftAttachment, XmATTACH_FORM, XmNnavigationType, XmTAB_GROUP, NULL) ; - XtAddCallback(X->modeFrame, XmNhelpCallback, HelpRequestCB, + XtAddCallback(X->modeFrame, XmNhelpCallback, (void (*)(Widget, XtPointer, XtPointer)) HelpRequestCB, (XtPointer) HELP_MODELINE) ; X->modeline = XtVaCreateManagedWidget("modeline", @@ -856,7 +859,7 @@ dtcalc_kpanel_create(Widget owner) X->modeFrame, XmNshadowThickness, 0, NULL) ; - XtAddCallback(X->modeline, XmNhelpCallback, HelpRequestCB, + XtAddCallback(X->modeline, XmNhelpCallback, (void (*)(Widget, XtPointer, XtPointer)) HelpRequestCB, (XtPointer) HELP_MODELINE) ; label_string = XmStringCreateLocalized (" "); @@ -870,7 +873,7 @@ dtcalc_kpanel_create(Widget owner) XmNalignment, XmALIGNMENT_CENTER, XmNlabelString, label_string, NULL) ; - XtAddCallback(X->modevals[i], XmNhelpCallback, HelpRequestCB, + XtAddCallback(X->modevals[i], XmNhelpCallback, (void (*)(Widget, XtPointer, XtPointer)) HelpRequestCB, (XtPointer) HELP_MODELINE) ; i = (int) HYPITEM; @@ -884,7 +887,7 @@ dtcalc_kpanel_create(Widget owner) XmNalignment, XmALIGNMENT_CENTER, XmNlabelString, label_string, NULL) ; - XtAddCallback(X->modevals[i], XmNhelpCallback, HelpRequestCB, + XtAddCallback(X->modevals[i], XmNhelpCallback, (void (*)(Widget, XtPointer, XtPointer)) HelpRequestCB, (XtPointer) HELP_MODELINE) ; i = (int) INVITEM; @@ -898,7 +901,7 @@ dtcalc_kpanel_create(Widget owner) XmNalignment, XmALIGNMENT_CENTER, XmNlabelString, label_string, NULL) ; - XtAddCallback(X->modevals[i], XmNhelpCallback, HelpRequestCB, + XtAddCallback(X->modevals[i], XmNhelpCallback, (void (*)(Widget, XtPointer, XtPointer)) HelpRequestCB, (XtPointer) HELP_MODELINE) ; XmStringFree(label_string); @@ -949,7 +952,7 @@ dtcalc_kpanel_create(Widget owner) XtSetArg(args[n], XmNmenuHistory, modeArry[(int)v->modetype]); n++; X->modevals[i] = XmCreateOptionMenu(X->modeline, "mode", args, n); XtManageChild (X->modevals[i]); - XtAddCallback(X->modevals[i], XmNhelpCallback, HelpRequestCB, + XtAddCallback(X->modevals[i], XmNhelpCallback, (void (*)(Widget, XtPointer, XtPointer)) HelpRequestCB, (XtPointer) HELP_MODE) ; XtOverrideTranslations(X->modevals[i], trans_table); @@ -1013,7 +1016,7 @@ dtcalc_kpanel_create(Widget owner) XtSetArg(args[n], XmNmenuHistory, X->baseWidgArry[(int)v->base]); n++; X->modevals[i] = XmCreateOptionMenu(X->modeline, "base", args, n); XtManageChild (X->modevals[i]); - XtAddCallback(X->modevals[i], XmNhelpCallback, HelpRequestCB, + XtAddCallback(X->modevals[i], XmNhelpCallback, (void (*)(Widget, XtPointer, XtPointer)) HelpRequestCB, (XtPointer) HELP_BASE) ; XtOverrideTranslations(X->modevals[i], trans_table); @@ -1067,7 +1070,7 @@ dtcalc_kpanel_create(Widget owner) XtSetArg(args[n], XmNmenuHistory, X->numWidgArry[(int)v->dtype]); n++; X->modevals[i] = XmCreateOptionMenu(X->modeline, "num", args, n); XtManageChild (X->modevals[i]); - XtAddCallback(X->modevals[i], XmNhelpCallback, HelpRequestCB, + XtAddCallback(X->modevals[i], XmNhelpCallback, (void (*)(Widget, XtPointer, XtPointer)) HelpRequestCB, (XtPointer) HELP_NOTATION) ; XtOverrideTranslations(X->modevals[i], trans_table); @@ -1125,7 +1128,7 @@ dtcalc_kpanel_create(Widget owner) XtSetArg(args[n], XmNmenuHistory, X->ttypeWidgArry[(int)v->ttype]); n++; X->modevals[i] = XmCreateOptionMenu(X->modeline, "trig", args, n); XtManageChild (X->modevals[i]); - XtAddCallback(X->modevals[i], XmNhelpCallback, HelpRequestCB, + XtAddCallback(X->modevals[i], XmNhelpCallback, (void (*)(Widget, XtPointer, XtPointer)) HelpRequestCB, (XtPointer) HELP_TRIG) ; XtOverrideTranslations(X->modevals[i], trans_table); @@ -1822,7 +1825,7 @@ ProcessMotifSelection(Widget W) display[i+1] = '\0'; } - STRCPY(v->display, display); + strcpy(v->display, display); XtFree(display); } @@ -2051,7 +2054,7 @@ get_resource(enum res_type rtype) { char str[MAXLINE] ; - STRCPY(str, calc_res[(int) rtype]) ; + strcpy(str, calc_res[(int) rtype]) ; return(ds_get_resource(X->rDB, v->appname, str)) ; } @@ -2171,7 +2174,7 @@ make_frames(void) { tool_label = (char *) calloc(1, strlen(lstrs[(int) L_UCALC]) + 3); - SPRINTF(tool_label, "%s", lstrs[(int) L_UCALC]); + sprintf(tool_label, "%s", lstrs[(int) L_UCALC]); } else read_str(&tool_label, v->titleline) ; @@ -2224,7 +2227,7 @@ make_registers(int type) { for (i = 0; i < MAXREGS; i++) { - SPRINTF(line, "%s: %s", menu_entries[i + 10].str, + sprintf(line, "%s: %s", menu_entries[i + 10].str, make_number(v->MPmvals[i], FALSE)) ; { @@ -2347,7 +2350,7 @@ new_cf_value(Widget widget, XtPointer client_data, XtPointer call_data) XmStringFree(cstr) ; XtRemoveAllCallbacks(X->CFpi_butHelp, XmNactivateCallback); - XtAddCallback(X->CFpi_butHelp, XmNactivateCallback, HelpRequestCB, + XtAddCallback(X->CFpi_butHelp, XmNactivateCallback, (void (*)(Widget, XtPointer, XtPointer)) HelpRequestCB, (XtPointer) HELP_CONSTANT); } else @@ -2360,7 +2363,7 @@ new_cf_value(Widget widget, XtPointer client_data, XtPointer call_data) XmStringFree(cstr) ; XtRemoveAllCallbacks(X->CFpi_butHelp, XmNactivateCallback); - XtAddCallback(X->CFpi_butHelp, XmNactivateCallback, HelpRequestCB, + XtAddCallback(X->CFpi_butHelp, XmNactivateCallback, (void (*)(Widget, XtPointer, XtPointer)) HelpRequestCB, (XtPointer) HELP_FUNCTION); } @@ -2630,7 +2633,7 @@ show_ascii_frame(void) /* Display ASCII popup. */ XtAddCallback(X->Api_butOK, XmNactivateCallback, show_ascii, NULL) ; XtAddCallback(X->Api_butClose, XmNactivateCallback, close_ascii, (XtPointer) NULL) ; - XtAddCallback(X->Api_butHelp, XmNactivateCallback, HelpRequestCB, + XtAddCallback(X->Api_butHelp, XmNactivateCallback, (void (*)(Widget, XtPointer, XtPointer)) HelpRequestCB, (XtPointer) HELP_ASCII) ; j = 0; @@ -2972,7 +2975,7 @@ update_cf_value(void) } /* need to run a "compute" of what was typed in */ len = strlen(X->vval) ; - STRCPY(str, X->vval); + strcpy(str, X->vval); if(X->vval[len - 1] != '=') { /* need to add an '=' at the end of the string so it @@ -3004,8 +3007,8 @@ update_cf_value(void) toclear = v->toclear; tstate = v->tstate; pending = v->pending; - STRCPY(display, v->display); - STRCPY(fnum, v->fnum); + strcpy(display, v->display); + strcpy(fnum, v->fnum); mpstr(v->MPdisp_val, MPdisp_val); mpstr(v->MPlast_input, MPlast_input); mpstr(v->MPresult, MPresult); @@ -3022,7 +3025,7 @@ update_cf_value(void) /* get the computed value */ accuracy = v->accuracy; v->accuracy = 9 ; - STRCPY(result, make_number(v->MPresult, FALSE)) ; + strcpy(result, make_number(v->MPresult, FALSE)) ; v->accuracy = accuracy ; /* return to previous state */ @@ -3033,8 +3036,8 @@ update_cf_value(void) v->toclear = toclear; v->tstate = tstate; v->pending = pending; - STRCPY(v->display, display); - STRCPY(v->fnum, fnum); + strcpy(v->display, display); + strcpy(v->fnum, fnum); mpstr(MPdisp_val, v->MPdisp_val); mpstr(MPlast_input, v->MPlast_input); mpstr(MPresult, v->MPresult); @@ -3045,7 +3048,7 @@ update_cf_value(void) ptr = DtStrchr(result, 'e'); if (n != 1 || ptr != NULL || v->error == TRUE) { - SPRINTF(message, "%s\n%s", vstrs[(int) V_INVCON], + sprintf(message, "%s\n%s", vstrs[(int) V_INVCON], vstrs[(int) V_NOCHANGE]) ; do_continue_notice(X->CFframe, message) ; set_item(OPITEM, "") ; @@ -3063,7 +3066,7 @@ update_cf_value(void) { len = strlen(result); - STRCPY(str, result); + strcpy(str, result); for(i=0; i < len; i++) str[i] = str[i+1]; MPstr_to_num(str, DEC, v->MPcon_vals[X->cfno]) ; @@ -3082,7 +3085,7 @@ update_cf_value(void) len--; } } - SPRINTF(v->con_names[X->cfno], "%1d: %s [%s]", + sprintf(v->con_names[X->cfno], "%1d: %s [%s]", X->cfno, result, X->dval) ; break ; case M_FUN : tmpStr = GETMESSAGE(3, 45, "."); @@ -3097,14 +3100,14 @@ update_cf_value(void) ptr = DtStrchr(X->vval, tmpStr[0]); } } - STRCPY(v->fun_vals[X->cfno], convert(X->vval)) ; + strcpy(v->fun_vals[X->cfno], convert(X->vval)) ; if(strcmp(X->vval, "") != 0) { - SPRINTF(v->fun_names[X->cfno], "%1d: %s [%s]", + sprintf(v->fun_names[X->cfno], "%1d: %s [%s]", X->cfno, X->vval, X->dval) ; } else - STRCPY(v->fun_names[X->cfno], ""); + strcpy(v->fun_names[X->cfno], ""); break; default : break; } @@ -3208,13 +3211,13 @@ write_cf_value(Widget widget, XtPointer client_data, XtPointer call_data) X->dval[40] = '\0'; X->vval = XmTextFieldGetString(X->CFpi_vtext->textfield); X->cfval = XmTextFieldGetString(X->CFpi_cftext->textfield); - SSCANF(X->cfval, "%d", &X->cfno) ; + sscanf(X->cfval, "%d", &X->cfno) ; if ((strcmp(X->cfval, "") == 0) || X->cfval[0] < '0' || X->cfval[0] > '9' || X->cfno < 0 || X->cfno > 9) { - SPRINTF(str, "%s", (X->CFtype == M_CON) ? vstrs[(int) V_LCON] + sprintf(str, "%s", (X->CFtype == M_CON) ? vstrs[(int) V_LCON] : vstrs[(int) V_LFUN]) ; - SPRINTF(message, "%s\n%s", str, vstrs[(int) V_RANGE]) ; + sprintf(message, "%s\n%s", str, vstrs[(int) V_RANGE]) ; do_continue_notice(X->CFframe, message) ; return ; } @@ -3231,10 +3234,10 @@ write_cf_value(Widget widget, XtPointer client_data, XtPointer call_data) } if (X->cfexists) { - SPRINTF(str, mess[(int) MESS_CON], + sprintf(str, mess[(int) MESS_CON], (X->CFtype == M_CON) ? vstrs[(int) V_UCON] : vstrs[(int) V_UFUN], X->cfno) ; - SPRINTF(message, "%s\n%s", str, vstrs[(int) V_OWRITE]) ; + sprintf(message, "%s\n%s", str, vstrs[(int) V_OWRITE]) ; XtUnmanageChild(X->CFframe) ; do_confirm_notice(X->CFframe, message) ; } @@ -3307,7 +3310,7 @@ create_menu_bar(Widget parent) XtSetArg(args[n], XmNtopAttachment, XmATTACH_FORM); n++; X->menubar = XmCreateMenuBar(parent, "mainMenu", args, n); XtManageChild(X->menubar); - XtAddCallback(X->menubar, XmNhelpCallback, HelpRequestCB, + XtAddCallback(X->menubar, XmNhelpCallback, (void (*)(Widget, XtPointer, XtPointer)) HelpRequestCB, (XtPointer)HELP_MENUBAR); mnemonic = GETMESSAGE(2, 13, "O"); @@ -4399,7 +4402,7 @@ RestoreSession(void) if (get_str_resource(R_DISPLAYED, str)) { - STRCPY(v->display, str); + strcpy(v->display, str); MPstr_to_num(str, v->base, v->MPdisp_val) ; } diff --git a/cde/programs/dtcalc/motif.h b/cde/programs/dtcalc/motif.h index 8e571c8e7..4ded8c26d 100644 --- a/cde/programs/dtcalc/motif.h +++ b/cde/programs/dtcalc/motif.h @@ -87,7 +87,7 @@ typedef struct Xobject { /* Motif/Xlib graphics object. */ typedef struct Xobject *XVars ; -XVars X ; +extern XVars X ; #ifndef CDE_INSTALLATION_TOP #define CDE_INSTALLATION_TOP "/usr/dt" diff --git a/cde/programs/dtcalc/text.c b/cde/programs/dtcalc/text.c index 9afc6ca83..ce3e70d3b 100644 --- a/cde/programs/dtcalc/text.c +++ b/cde/programs/dtcalc/text.c @@ -43,7 +43,7 @@ extern struct menu_entry menu_entries[] ; /* All the menu strings. */ extern Vars v ; /* Calctool variables and options. */ -void init_mess P(()) ; +void init_mess(void); /* The following are all the strings used by the dtcalc program. * They are initialized in init_text() to the local language equivalents. @@ -395,16 +395,16 @@ init_text(void) /* Setup text strings depending upon language. */ calc_res[(int) R_MENUBAR] = DGET("postMenuBar") ; calc_res[(int) R_KEYS] = DGET("keys") ; - STRCPY(v->con_names[0], LGET(GETMESSAGE(3, 119, "kilometers per hour <=> miles per hour."))) ; - STRCPY(v->con_names[1], LGET(GETMESSAGE(3, 120, "square root of 2."))) ; - STRCPY(v->con_names[2], LGET(GETMESSAGE(3, 121, "e."))) ; - STRCPY(v->con_names[3], LGET(GETMESSAGE(3, 122, "pi."))) ; - STRCPY(v->con_names[4], LGET(GETMESSAGE(3, 123, "centimeters <=> inch."))) ; - STRCPY(v->con_names[5], LGET(GETMESSAGE(3, 124, "degrees in a radian."))) ; - STRCPY(v->con_names[6], LGET(GETMESSAGE(3, 125, "2 ^ 20."))) ; - STRCPY(v->con_names[7], LGET(GETMESSAGE(3, 126, "grams <=> ounce."))) ; - STRCPY(v->con_names[8], LGET(GETMESSAGE(3, 127, "kilojoules <=> British thermal units."))) ; - STRCPY(v->con_names[9], LGET(GETMESSAGE(3, 128, "cubic centimeters <=> cubic inches."))) ; + strcpy(v->con_names[0], LGET(GETMESSAGE(3, 119, "kilometers per hour <=> miles per hour."))) ; + strcpy(v->con_names[1], LGET(GETMESSAGE(3, 120, "square root of 2."))) ; + strcpy(v->con_names[2], LGET(GETMESSAGE(3, 121, "e."))) ; + strcpy(v->con_names[3], LGET(GETMESSAGE(3, 122, "pi."))) ; + strcpy(v->con_names[4], LGET(GETMESSAGE(3, 123, "centimeters <=> inch."))) ; + strcpy(v->con_names[5], LGET(GETMESSAGE(3, 124, "degrees in a radian."))) ; + strcpy(v->con_names[6], LGET(GETMESSAGE(3, 125, "2 ^ 20."))) ; + strcpy(v->con_names[7], LGET(GETMESSAGE(3, 126, "grams <=> ounce."))) ; + strcpy(v->con_names[8], LGET(GETMESSAGE(3, 127, "kilojoules <=> British thermal units."))) ; + strcpy(v->con_names[9], LGET(GETMESSAGE(3, 128, "cubic centimeters <=> cubic inches."))) ; /* Keyboard equivalents for the dtcalc menu entries. */ diff --git a/cde/programs/dtcm/dtcm/alarm.h b/cde/programs/dtcm/dtcm/alarm.h index 11fa1e667..751db3d7b 100644 --- a/cde/programs/dtcm/dtcm/alarm.h +++ b/cde/programs/dtcm/dtcm/alarm.h @@ -53,15 +53,14 @@ #include #include -#include "ansi_c.h" -extern void compose P((Calendar*, CSA_reminder_reference *, char**)); -extern void flash_it P((XtPointer, XtIntervalId*)); -extern void mail_it P((XtPointer, XtIntervalId*, CSA_reminder_reference *)); -extern void open_it P((XtPointer, XtIntervalId*, CSA_reminder_reference *)); -extern void postup_show_proc P((Calendar*, CSA_reminder_reference *)); -extern void reminder_driver P((XtPointer, XtIntervalId*)); -extern void ring_it P((XtPointer, XtIntervalId*)); -extern void slp P((int x)); +extern void compose(Calendar*, CSA_reminder_reference *, char**); +extern void flash_it(XtPointer, XtIntervalId*); +extern void mail_it(XtPointer, XtIntervalId*, CSA_reminder_reference *); +extern void open_it(XtPointer, XtIntervalId*, CSA_reminder_reference *); +extern void postup_show_proc(Calendar*, CSA_reminder_reference *); +extern void reminder_driver(XtPointer, XtIntervalId*); +extern void ring_it(XtPointer, XtIntervalId*); +extern void slp(int x); #endif diff --git a/cde/programs/dtcm/dtcm/blist.h b/cde/programs/dtcm/dtcm/blist.h index 2a16e5486..dedb60287 100644 --- a/cde/programs/dtcm/dtcm/blist.h +++ b/cde/programs/dtcm/dtcm/blist.h @@ -52,7 +52,6 @@ #ifndef _BLIST_H #define _BLIST_H -#include "ansi_c.h" #include "util.h" /* @@ -107,11 +106,11 @@ typedef struct browser_state { struct browser_state *next; } BrowserState; -extern void blist_clean P((Browselist*, Boolean)); -extern void blist_init_names P((Calendar*)); -extern void blist_init_ui P((Calendar*)); -extern void blist_reset P((Calendar*)); -extern void make_browselist P((Calendar*)); -extern void show_browselist P((Calendar*)); +extern void blist_clean(Browselist*, Boolean); +extern void blist_init_names(Calendar*); +extern void blist_init_ui(Calendar*); +extern void blist_reset(Calendar*); +extern void make_browselist(Calendar*); +extern void show_browselist(Calendar*); #endif diff --git a/cde/programs/dtcm/dtcm/browser.h b/cde/programs/dtcm/dtcm/browser.h index 5f8c578e9..41494a156 100644 --- a/cde/programs/dtcm/dtcm/browser.h +++ b/cde/programs/dtcm/dtcm/browser.h @@ -52,7 +52,6 @@ #ifndef _BROWSER_H #define _BROWSER_H -#include "ansi_c.h" #include "timeops.h" #include "calendar.h" @@ -112,23 +111,23 @@ typedef struct { #define MB_PREVMONTH 4 #define MB_NEXTMONTH 5 -extern void br_display P((Calendar*)); -extern Boolean browser_exists P(()); -extern void browser_reset_list P((Calendar*)); -extern Boolean browser_showing P(()); -extern void make_browser P(()); -extern void mb_draw_chartgrid P(()); -extern void mb_draw_appts P(()); -extern void mb_update_segs P(()); -extern void mb_update_busyicon P(()); -extern void mb_init_blist P(()); -extern void mb_init_canvas P(()); -extern void mb_deregister_names P(()); -extern void mb_refresh_canvas P(()); -extern void sched_proc P(()); -extern void set_default_reminders P(()); -extern void set_default_scope_plus P(()); -extern void set_default_what P(()); -extern void mb_refigure_chart P((Calendar *)); +extern void br_display(Calendar *); +extern Boolean browser_exists(void); +extern void browser_reset_list(Calendar*); +extern Boolean browser_showing(void); +extern void make_browser(Calendar *c); +extern void mb_draw_chartgrid(Browser *b, Calendar *c); +extern void mb_draw_appts(Browser *b, int start, int end, Calendar *c); +extern void mb_update_segs(Browser *, Tick, Tick, int *, int *); +extern void mb_update_busyicon(void); +extern void mb_init_blist(void); +extern void mb_init_canvas(Calendar *c); +extern void mb_deregister_names(char *, Calendar *); +extern void mb_refresh_canvas(Browser *b, Calendar *c); +extern void sched_proc(void); +extern void set_default_reminders(void); +extern void set_default_scope_plus(void); +extern void set_default_what(void); +extern void mb_refigure_chart(Calendar *); #endif diff --git a/cde/programs/dtcm/dtcm/calendar.h b/cde/programs/dtcm/dtcm/calendar.h index 10b68bfff..046c03731 100644 --- a/cde/programs/dtcm/dtcm/calendar.h +++ b/cde/programs/dtcm/dtcm/calendar.h @@ -56,7 +56,6 @@ #include #include #include -#include "ansi_c.h" #include "util.h" #include "timeops.h" #include "props.h" @@ -324,68 +323,68 @@ extern int _csa_tick_to_iso8601(time_t, char *); (int)(r2)->y<=(int)(r1)->y+(int)(r1)->height) -extern void cache_dims P((Calendar*, Dimension, - Dimension)); -extern char* cm_get_relname P(()); -extern Boolean in_range P((time_t, time_t, time_t)); -extern int report_err P((char*)); -extern void reset_alarm P((Calendar*)); -extern CSA_return_code reset_timer P((Calendar*)); -extern CSA_return_code paint_canvas P((Calendar*, XRectangle*, - Render_Type)); -extern void switch_it P((Calendar*, char*, - WindowType)); -extern int yyyerror P((char*)); -extern void gr_clear_area P((new_XContext*, int, int, - Dimension, Dimension)); -extern void gr_clear_box P((new_XContext*, int, int, int, - int)); -extern void gr_make_grayshade P((new_XContext*, int, int, int, - int, int)); -extern void gr_make_gray P((new_XContext*, int, int, int, - int, int)); -extern void gr_make_rgbcolor P((new_XContext*, Colormap, int, +extern void cache_dims(Calendar*, Dimension, + Dimension); +extern char* cm_get_relname(void); +extern Boolean in_range(time_t, time_t, time_t); +extern int report_err(char*); +extern void reset_alarm(Calendar*); +extern CSA_return_code reset_timer(Calendar*); +extern CSA_return_code paint_canvas(Calendar*, XRectangle*, + Render_Type); +extern void switch_it(Calendar*, char*, + WindowType); +extern int yyyerror(char*); +extern void gr_clear_area(new_XContext*, int, int, + Dimension, Dimension); +extern void gr_clear_box(new_XContext*, int, int, int, + int); +extern void gr_make_grayshade(new_XContext*, int, int, int, + int, int); +extern void gr_make_gray(new_XContext*, int, int, int, + int, int); +extern void gr_make_rgbcolor(new_XContext*, Colormap, int, int, int, int, int, int, - int)); -extern int gr_nchars P((int, char*, Cal_Font *)); -extern void gr_draw_rgb_box P((new_XContext*, int, int, int, - int, int, int, Colormap)); -extern void gr_dissolve_box P((new_XContext*, int, int, int, - int, int)); -extern int gr_center P((int, char*, Cal_Font *)); -extern void gr_text P((new_XContext*, int, int, + int); +extern int gr_nchars(int, char*, Cal_Font *); +extern void gr_draw_rgb_box (new_XContext*, int, int, int, + int, int, int, Colormap); +extern void gr_dissolve_box (new_XContext*, int, int, int, + int, int); +extern int gr_center(int, char*, Cal_Font *); +extern void gr_text(new_XContext*, int, int, Cal_Font *, char*, - XRectangle*)); -extern void gr_text_rgb P((new_XContext*, int, int, + XRectangle*); +extern void gr_text_rgb(new_XContext*, int, int, Cal_Font *, char*, Pixel, - Colormap, XRectangle*)); -extern void gr_draw_line P((new_XContext*, int, int, int, + Colormap, XRectangle*); +extern void gr_draw_line(new_XContext*, int, int, int, int, GR_Line_Style, - XRectangle*)); -extern void gr_draw_box P((new_XContext*, int, int, int, - int, XRectangle*)); -extern void gr_draw_glyph P((new_XContext*, new_XContext*, - Pixmap, int, int, int, int)); -extern void gr_set_clip_rectangles P((new_XContext*, int, int, - XRectangle*, int, int)); -extern void gr_clear_clip_rectangles P((new_XContext*)); -extern Boolean gr_init P((new_XContext*, Widget)); -extern new_XContext *gr_create_xcontext P((Calendar*, Widget, GR_depth, - XtAppContext)); -extern Boolean today_inrange P((Calendar*, time_t)); -extern void update_browse_menu_names P((Calendar*)); -extern char* get_user_calendar P(()); -extern void destroy_paint_cache P((Paint_cache *, int)); -extern void invalidate_cache P((Calendar *)); + XRectangle*); +extern void gr_draw_box(new_XContext*, int, int, int, + int, XRectangle*); +extern void gr_draw_glyph(new_XContext*, new_XContext*, + Pixmap, int, int, int, int); +extern void gr_set_clip_rectangles(new_XContext*, int, int, + XRectangle*, int, int); +extern void gr_clear_clip_rectangles(new_XContext*); +extern Boolean gr_init(new_XContext*, Widget); +extern new_XContext *gr_create_xcontext(Calendar*, Widget, GR_depth, + XtAppContext); +extern Boolean today_inrange(Calendar*, time_t); +extern void update_browse_menu_names(Calendar*); +extern char* get_user_calendar(void); +extern void destroy_paint_cache(Paint_cache *, int); +extern void invalidate_cache(Calendar *); -extern CSA_return_code allocate_paint_cache P((CSA_entry_handle *, int, Paint_cache **)); +extern CSA_return_code allocate_paint_cache(CSA_entry_handle *, int, Paint_cache **); -extern Boolean fontlist_to_font P((XmFontList, Cal_Font *)); -extern void CalTextExtents P((Cal_Font *, char *, int, - int *, int *, int *, int *)); -extern void CalDrawString P((Display *, Drawable, +extern Boolean fontlist_to_font(XmFontList, Cal_Font *); +extern void CalTextExtents (Cal_Font *, char *, int, + int *, int *, int *, int *); +extern void CalDrawString (Display *, Drawable, Cal_Font *, GC, int, int, - char *, int)); -extern void CalFontExtents P((Cal_Font *, - XFontSetExtents *)); + char *, int); +extern void CalFontExtents (Cal_Font *, + XFontSetExtents *); #endif diff --git a/cde/programs/dtcm/dtcm/cm_i18n.h b/cde/programs/dtcm/dtcm/cm_i18n.h index d685d4880..dc5f03e28 100644 --- a/cde/programs/dtcm/dtcm/cm_i18n.h +++ b/cde/programs/dtcm/dtcm/cm_i18n.h @@ -92,10 +92,10 @@ extern char *cm_printf(); int is_comment(); int match_locale(); -extern int cm_get_fonts P((char *)); -extern int is_comment P((char[MAX_LINE_LEN])); -extern int match_locale P((char *, char[MAX_LINE_LEN])); -extern void ps_i18n_header P((FILE *, Widget)); -extern char* euc_to_octal P((char *)); -extern char* cm_get_i18n_date P((Widget, char *)); -extern char* cm_printf P((double, int)); +extern int cm_get_fonts(char *); +extern int is_comment(char[MAX_LINE_LEN]); +extern int match_locale(char *, char[MAX_LINE_LEN]); +extern void ps_i18n_header(FILE *, Widget); +extern char* euc_to_octal(char *); +extern char* cm_get_i18n_date(Widget, char *); +extern char* cm_printf(double, int); diff --git a/cde/programs/dtcm/dtcm/common.h b/cde/programs/dtcm/dtcm/common.h index 292fe80ae..fbc2ddc0e 100644 --- a/cde/programs/dtcm/dtcm/common.h +++ b/cde/programs/dtcm/dtcm/common.h @@ -52,22 +52,20 @@ #ifndef _COMMON_H #define _COMMON_H -#include "ansi_c.h" - #if LATER typedef struct { int data_version; char* target; } Cdata; -extern Cdata *get_cdata P(()); -extern void free_cd_from_blist P(()); +extern Cdata *get_cdata(); +extern void free_cd_from_blist(); #endif -extern void reset_values P(()); -extern void backup_values P(()); -extern void blist_write_names P(()); -extern Boolean duplicate_cd P(()); -extern char *get_appt_str P(()); -extern void common_update_lists P(()); +extern void reset_values(void); +extern void backup_values(void); +extern void blist_write_names(void); +extern Boolean duplicate_cd(void); +extern char *get_appt_str(void); +extern void common_update_lists(void); #endif diff --git a/cde/programs/dtcm/dtcm/datefield.h b/cde/programs/dtcm/dtcm/datefield.h index 13bff71ae..23a92810a 100644 --- a/cde/programs/dtcm/dtcm/datefield.h +++ b/cde/programs/dtcm/dtcm/datefield.h @@ -53,16 +53,15 @@ #define _DATEFIELD_H #include -#include "ansi_c.h" #include "props.h" #include "timeops.h" /* ** External function declaration */ -extern char *get_date_from_widget P((Tick, Widget, OrderingType, - SeparatorType)); -extern void set_date_in_widget P((Tick, Widget, OrderingType, - SeparatorType)); +extern char *get_date_from_widget(Tick, Widget, OrderingType, + SeparatorType); +extern void set_date_in_widget(Tick, Widget, OrderingType, + SeparatorType); #endif diff --git a/cde/programs/dtcm/dtcm/dayglance.h b/cde/programs/dtcm/dtcm/dayglance.h index b4617250f..728494c07 100644 --- a/cde/programs/dtcm/dtcm/dayglance.h +++ b/cde/programs/dtcm/dtcm/dayglance.h @@ -53,7 +53,6 @@ #define _DAYGLANCE_H #include -#include "ansi_c.h" #include "props.h" #define MOBOX_AREA_WIDTH (int)(c->view->winw*.4) @@ -82,17 +81,17 @@ typedef struct dayglance { Widget *month_panels; } Day; -extern void init_dayview P((Calendar*)); -extern void day_button P((Widget, XtPointer, XtPointer)); -extern void init_mo P((Calendar*)); -extern void monthbox_datetoxy P((Calendar*)); -extern void monthbox_xytodate P((Calendar*, int x, int y)); -extern void paint_dayview P((Calendar*, Boolean, - XRectangle*, Boolean)); -extern void paint_day P((Calendar*)); -extern void print_day_range P((Calendar*, Tick, Tick)); -extern void day_event P((XEvent*)); -extern int morning P((int)); -extern void paint_day_header P((Calendar *, Tick, void *)); -extern void cleanup_after_dayview P((Calendar *)); +extern void init_dayview(Calendar*); +extern void day_button(Widget, XtPointer, XtPointer); +extern void init_mo(Calendar*); +extern void monthbox_datetoxy(Calendar*); +extern void monthbox_xytodate(Calendar*, int x, int y); +extern void paint_dayview(Calendar*, Boolean, + XRectangle*, Boolean); +extern void paint_day(Calendar*); +extern void print_day_range (Calendar*, Tick, Tick); +extern void day_event(XEvent*); +extern int morning(int); +extern void paint_day_header(Calendar *, Tick, void *); +extern void cleanup_after_dayview(Calendar *); #endif diff --git a/cde/programs/dtcm/dtcm/deskset.h b/cde/programs/dtcm/dtcm/deskset.h index d9c528a9c..0e7af2461 100644 --- a/cde/programs/dtcm/dtcm/deskset.h +++ b/cde/programs/dtcm/dtcm/deskset.h @@ -54,7 +54,6 @@ #include #include -#include "ansi_c.h" /* ** Location ops for ds_position_popup(). @@ -72,10 +71,10 @@ typedef enum { /* ** Function declarations. */ -extern int ds_force_popup_on_screen P((Widget, int*, int*)) ; -extern void ds_get_screen_size P((Widget, int*, int*)) ; -extern int ds_position_popup P((Widget, Widget, - ds_location_op)) ; -extern char *ds_relname P(()); +extern int ds_force_popup_on_screen(Widget, int*, int*); +extern void ds_get_screen_size(Widget, int*, int*); +extern int ds_position_popup(Widget, Widget, + ds_location_op); +extern char *ds_relname(); #endif diff --git a/cde/programs/dtcm/dtcm/dnd.c b/cde/programs/dtcm/dtcm/dnd.c index abc58c12d..f37f19a67 100644 --- a/cde/programs/dtcm/dtcm/dnd.c +++ b/cde/programs/dtcm/dtcm/dnd.c @@ -72,10 +72,6 @@ static Bool lookForButton(Display *, XEvent *, XPointer); -#if !defined(__linux__) && !defined(CSRG_BASED) -extern char *sys_errlist[]; -#endif - extern int drag_load_proc(char*, Calendar *); static char dnd_filename[20]; diff --git a/cde/programs/dtcm/dtcm/dnd.h b/cde/programs/dtcm/dtcm/dnd.h index a19b8766e..ed5144dc2 100644 --- a/cde/programs/dtcm/dtcm/dnd.h +++ b/cde/programs/dtcm/dtcm/dnd.h @@ -52,8 +52,6 @@ #ifndef _DND_H #define _DND_H -#include "ansi_c.h" - typedef enum {SingleEditorList, SingleEditorIcon, GroupEditorList, @@ -72,12 +70,12 @@ typedef struct { #define DRAG_THRESHOLD 4 -extern void cm_register_drop_site P((Calendar *c, Widget w)); -extern void ApptDragStart P((Widget, XEvent *, Calendar *, - EditorType)); -extern void TranslationDragStart P((Widget, XEvent *, String *, - Cardinal *)); -extern void DtcmProcessPress P((Widget, XEvent *, String *, - Cardinal *)); +extern void cm_register_drop_site(Calendar *c, Widget w); +extern void ApptDragStart(Widget, XEvent *, Calendar *, + EditorType); +extern void TranslationDragStart(Widget, XEvent *, String *, + Cardinal *); +extern void DtcmProcessPress(Widget, XEvent *, String *, + Cardinal *); #endif diff --git a/cde/programs/dtcm/dtcm/dssw.h b/cde/programs/dtcm/dtcm/dssw.h index d0b4fcc9a..cbfe7b602 100644 --- a/cde/programs/dtcm/dtcm/dssw.h +++ b/cde/programs/dtcm/dtcm/dssw.h @@ -53,7 +53,6 @@ #define _DSSW_H #include -#include "ansi_c.h" #include "calendar.h" #define DATE_LEN 100 @@ -121,21 +120,21 @@ typedef struct { ** DSSW external function declarations ** *******************************************************************************/ -extern void build_dssw P((DSSW*, Calendar*, Widget, Boolean, Boolean)); -extern Boolean dssw_appt_to_form P((DSSW*, CSA_entry_handle)); -extern Boolean dssw_attrs_to_form P((DSSW*, Dtcm_appointment*)); -extern Boolean dssw_form_to_appt P((DSSW*, Dtcm_appointment*, char*, - Tick)); -extern Boolean dssw_form_flags_to_appt P((DSSW*, Dtcm_appointment*, char*, - Tick, int *)); -extern Boolean dssw_form_to_todo P((DSSW*, Dtcm_appointment*, char*, - Tick)); -extern void load_dssw_times P((DSSW*, Tick, Tick, Boolean)); -extern void get_dssw_times P((DSSW*)); -extern void get_dssw_vals P((DSSW*, Tick)); -extern void set_dssw_defaults P((DSSW*, Tick, Boolean)); -extern void set_dssw_times P((DSSW*)); -extern void set_dssw_vals P((DSSW*, Tick)); -extern void set_dssw_menus P((DSSW*, Props *)); +extern void build_dssw(DSSW*, Calendar*, Widget, Boolean, Boolean); +extern Boolean dssw_appt_to_form(DSSW*, CSA_entry_handle); +extern Boolean dssw_attrs_to_form(DSSW*, Dtcm_appointment*); +extern Boolean dssw_form_to_appt(DSSW*, Dtcm_appointment*, char*, + Tick); +extern Boolean dssw_form_flags_to_appt(DSSW*, Dtcm_appointment*, char*, + Tick, int *); +extern Boolean dssw_form_to_todo(DSSW*, Dtcm_appointment*, char*, + Tick); +extern void load_dssw_times(DSSW*, Tick, Tick, Boolean); +extern void get_dssw_times(DSSW*); +extern void get_dssw_vals(DSSW*, Tick); +extern void set_dssw_defaults(DSSW*, Tick, Boolean); +extern void set_dssw_times(DSSW*); +extern void set_dssw_vals(DSSW*, Tick); +extern void set_dssw_menus(DSSW*, Props *); #endif diff --git a/cde/programs/dtcm/dtcm/editor.h b/cde/programs/dtcm/dtcm/editor.h index aa5c99490..4a71f5b5a 100644 --- a/cde/programs/dtcm/dtcm/editor.h +++ b/cde/programs/dtcm/dtcm/editor.h @@ -53,7 +53,6 @@ #define _EDITOR_H #include -#include "ansi_c.h" #include "calendar.h" #include "misc.h" #include "dssw.h" @@ -115,27 +114,27 @@ typedef struct { ** Editor external function declarations ** *******************************************************************************/ -extern void add_to_appt_list P((CSA_entry_handle, Editor*)); -extern void add_all_appt P((Editor*)); -extern void build_editor_list P((Editor*, Tick, Glance, CSA_entry_handle**, - CSA_uint32*)); -extern int build_editor_view P((Editor*, Glance, Boolean)); -extern Boolean editor_change P((Dtcm_appointment*, CSA_entry_handle, - CSA_entry_handle*, Calendar*)); -extern void editor_clean_up P((Editor*)); -extern Boolean editor_created P((Editor*)); -extern Boolean editor_delete P((CSA_entry_handle, Calendar*)); -extern Boolean editor_insert P((Dtcm_appointment*, CSA_entry_handle*, - Calendar*)); -extern CSA_entry_handle editor_nth_appt P((Editor*, int)); -extern Boolean editor_showing P((Editor*)); -extern Boolean editor_view_showing P((Editor*)); -extern void get_editor_vals P((Editor*)); -extern void set_editor_defaults P((Editor*, Tick, Tick, Boolean)); -extern void set_editor_title P((Editor*, char *)); -extern void set_editor_vals P((Editor*, Tick, Tick)); -extern void show_editor P((Calendar*, Tick, Tick, Boolean)); -extern void show_editor_view P((Calendar*, Glance)); -extern void e_make_editor P((Calendar*)); +extern void add_to_appt_list(CSA_entry_handle, Editor*); +extern void add_all_appt(Editor*); +extern void build_editor_list(Editor*, Tick, Glance, CSA_entry_handle**, + CSA_uint32*); +extern int build_editor_view(Editor*, Glance, Boolean); +extern Boolean editor_change(Dtcm_appointment*, CSA_entry_handle, + CSA_entry_handle*, Calendar*); +extern void editor_clean_up (Editor*); +extern Boolean editor_created(Editor*); +extern Boolean editor_delete(CSA_entry_handle, Calendar*); +extern Boolean editor_insert(Dtcm_appointment*, CSA_entry_handle*, + Calendar*); +extern CSA_entry_handle editor_nth_appt(Editor*, int); +extern Boolean editor_showing(Editor*); +extern Boolean editor_view_showing(Editor*); +extern void get_editor_vals (Editor*); +extern void set_editor_defaults(Editor*, Tick, Tick, Boolean); +extern void set_editor_title(Editor*, char *); +extern void set_editor_vals (Editor*, Tick, Tick); +extern void show_editor (Calendar*, Tick, Tick, Boolean); +extern void show_editor_view(Calendar*, Glance); +extern void e_make_editor(Calendar*); #endif diff --git a/cde/programs/dtcm/dtcm/find.h b/cde/programs/dtcm/dtcm/find.h index f212369fc..0d5b10b76 100644 --- a/cde/programs/dtcm/dtcm/find.h +++ b/cde/programs/dtcm/dtcm/find.h @@ -52,8 +52,6 @@ #ifndef _FIND_H #define _FIND_H -#include "ansi_c.h" - typedef struct tick_list { Tick tick; struct tick_list *next; @@ -88,7 +86,7 @@ typedef struct { Tick search_to_date; }Find; -extern caddr_t make_find P((Calendar*)); -static Tick f_get_searchdate P((Widget, Props*)); +extern caddr_t make_find(Calendar*); +static Tick f_get_searchdate(Widget, Props*); #endif diff --git a/cde/programs/dtcm/dtcm/format.h b/cde/programs/dtcm/dtcm/format.h index 7b79cbf1b..06e134c6a 100644 --- a/cde/programs/dtcm/dtcm/format.h +++ b/cde/programs/dtcm/dtcm/format.h @@ -53,24 +53,23 @@ #define _FORMAT_H #include -#include "ansi_c.h" #include "props.h" #define DEFAULT_APPT_LEN 50 #define DEFAULT_GAPPT_LEN 80 -extern void format_date P((Tick, OrderingType, char*, int, int, int)); -extern void format_date3 P((Tick, OrderingType, SeparatorType, char*)); -extern Boolean format_line P((Tick, char*, char*, int, Boolean, - DisplayType)); -extern void format_line2 P((Dtcm_appointment*, char*, char*, - DisplayType)); -extern void format_appt P((Dtcm_appointment*, char*, DisplayType, int)); -extern void format_abbrev_appt P((Dtcm_appointment*, char*, Boolean, - DisplayType)); -extern void format_maxchars P((Dtcm_appointment*, char*, int, DisplayType)); -extern void format_gappt P((Dtcm_appointment*, char*, char*, - DisplayType, int)); +extern void format_date(Tick, OrderingType, char*, int, int, int); +extern void format_date3(Tick, OrderingType, SeparatorType, char*); +extern Boolean format_line(Tick, char*, char*, int, Boolean, + DisplayType); +extern void format_line2(Dtcm_appointment*, char*, char*, + DisplayType); +extern void format_appt (Dtcm_appointment*, char*, DisplayType, int); +extern void format_abbrev_appt(Dtcm_appointment*, char*, Boolean, + DisplayType); +extern void format_maxchars(Dtcm_appointment*, char*, int, DisplayType); +extern void format_gappt(Dtcm_appointment*, char*, char*, + DisplayType, int); #endif diff --git a/cde/programs/dtcm/dtcm/goto.h b/cde/programs/dtcm/dtcm/goto.h index 38db3d0b6..6ace726be 100644 --- a/cde/programs/dtcm/dtcm/goto.h +++ b/cde/programs/dtcm/dtcm/goto.h @@ -52,8 +52,6 @@ #ifndef _GOTO_H #define _GOTO_H -#include "ansi_c.h" - typedef struct { Widget frame; Widget form; @@ -65,7 +63,7 @@ typedef struct { Widget goto_message; }Goto; -extern caddr_t make_goto P((Calendar*)); +extern caddr_t make_goto(Calendar*); #define DATESIZ 40 diff --git a/cde/programs/dtcm/dtcm/group_editor.h b/cde/programs/dtcm/dtcm/group_editor.h index fd9c2b408..ae1e757a9 100644 --- a/cde/programs/dtcm/dtcm/group_editor.h +++ b/cde/programs/dtcm/dtcm/group_editor.h @@ -53,7 +53,6 @@ #define _GEDITOR_H #include -#include "ansi_c.h" #include "util.h" #include "calendar.h" #include "misc.h" @@ -127,21 +126,21 @@ typedef struct { ** Group Editor external function declarations ** *******************************************************************************/ -extern void add_to_gaccess_list P((char*, CSA_session_handle, +extern void add_to_gaccess_list(char*, CSA_session_handle, unsigned int, int, GEditor*, - Boolean)); -extern void add_all_gappt P((GEditor*)); -extern void geditor_clean_up P((GEditor*)); -extern CSA_entry_handle geditor_nth_appt P((GEditor*, int, - Access_data**)); -extern Boolean geditor_showing P((GEditor*)); -extern void get_geditor_vals P((GEditor*)); -extern void remove_all_gaccess_data P((GEditor*)); -extern void remove_all_gaccess P((GEditor*)); -extern void remove_from_gaccess_list P((char*, GEditor*)); -extern void set_geditor_defaults P((GEditor*, Tick, Tick)); -extern void set_geditor_title P((GEditor*, char*)); -extern void set_geditor_vals P((GEditor*, Tick, Tick)); -extern void show_geditor P((Calendar*, Tick, Tick)); + Boolean); +extern void add_all_gappt(GEditor*); +extern void geditor_clean_up(GEditor*); +extern CSA_entry_handle geditor_nth_appt(GEditor*, int, + Access_data**); +extern Boolean geditor_showing(GEditor*); +extern void get_geditor_vals(GEditor*); +extern void remove_all_gaccess_data(GEditor*); +extern void remove_all_gaccess(GEditor*); +extern void remove_from_gaccess_list(char*, GEditor*); +extern void set_geditor_defaults(GEditor*, Tick, Tick); +extern void set_geditor_title(GEditor*, char*); +extern void set_geditor_vals(GEditor*, Tick, Tick); +extern void show_geditor(Calendar*, Tick, Tick); #endif diff --git a/cde/programs/dtcm/dtcm/help.h b/cde/programs/dtcm/dtcm/help.h index 54e003052..db2bee79c 100644 --- a/cde/programs/dtcm/dtcm/help.h +++ b/cde/programs/dtcm/dtcm/help.h @@ -114,9 +114,9 @@ #define DURATION_ERROR_HELP "CalendarDurationError" #define ADVANCE_ERROR_HELP "CalendarAdvanceError" -extern void show_main_help P((Widget, XtPointer, XtPointer)); -extern void help_cb P((Widget, XtPointer, XtPointer)); -extern void help_view_cb P((Widget, XtPointer, XtPointer)); +extern void show_main_help(Widget, XtPointer, XtPointer); +extern void help_cb(Widget, XtPointer, XtPointer); +extern void help_view_cb(Widget, XtPointer, XtPointer); #endif diff --git a/cde/programs/dtcm/dtcm/misc.h b/cde/programs/dtcm/dtcm/misc.h index adbdf11e7..03da5578d 100644 --- a/cde/programs/dtcm/dtcm/misc.h +++ b/cde/programs/dtcm/dtcm/misc.h @@ -55,7 +55,6 @@ #include #include #include -#include "ansi_c.h" #include "calendar.h" #include "cm_tty.h" #include "datefield.h" @@ -81,31 +80,31 @@ typedef enum { /* ** External function declarations */ -extern char *cm_mbchar P((char*)); -extern int cm_mbstrlen P((char*)); -extern Widget create_for_menu P((Widget)); -extern Widget create_privacy_menu P((Widget)); -extern Widget create_repeat_menu P((Widget, XtCallbackProc, XtPointer)); -extern Widget create_repeat_scope_menu P((Widget, XmString, XtCallbackProc, - XtPointer)); -extern Widget create_start_stop_time_menu P((Widget, XmString, XtCallbackProc, +extern char *cm_mbchar(char*); +extern int cm_mbstrlen(char*); +extern Widget create_for_menu (Widget); +extern Widget create_privacy_menu(Widget); +extern Widget create_repeat_menu(Widget, XtCallbackProc, XtPointer); +extern Widget create_repeat_scope_menu(Widget, XmString, XtCallbackProc, + XtPointer); +extern Widget create_start_stop_time_menu(Widget, XmString, XtCallbackProc, XtPointer, Props*, Boolean, - Boolean, Widget**, int*)); -extern Widget create_time_scope_menu P((Widget, XmString, XtCallbackProc, - XtPointer)); + Boolean, Widget**, int*); +extern Widget create_time_scope_menu(Widget, XmString, XtCallbackProc, + XtPointer); #ifndef _AIX -extern int dialog_popup P((Widget, ...)); +extern int dialog_popup(Widget, ...); #endif /* _AIX */ -extern void editor_err_msg P((Widget, char*, Validate_op, Pixmap)); -extern void backend_err_msg P((Widget, char*, CSA_return_code, Pixmap)); -extern void get_range P((Glance, time_t, time_t*, time_t*)); -extern boolean_t query_user P((void*)); -extern void set_message P((Widget, char*)); -extern void setup_quit_handler P((Widget, XtCallbackProc, caddr_t)); -extern int ds_is_double_click P((XEvent*, XEvent*)); -extern int cm_select_text P((Widget, Time)); -extern void set_time_submenu P((Widget, Widget, Props*, +extern void editor_err_msg(Widget, char*, Validate_op, Pixmap); +extern void backend_err_msg(Widget, char*, CSA_return_code, Pixmap); +extern void get_range(Glance, time_t, time_t*, time_t*); +extern boolean_t query_user(void*); +extern void set_message (Widget, char*); +extern void setup_quit_handler(Widget, XtCallbackProc, caddr_t); +extern int ds_is_double_click(XEvent*, XEvent*); +extern int cm_select_text(Widget, Time); +extern void set_time_submenu(Widget, Widget, Props*, XtCallbackProc, XtPointer, - Boolean, Boolean, Widget**, int*)); -extern void ManageChildren P((Widget)); + Boolean, Boolean, Widget**, int*); +extern void ManageChildren(Widget); #endif diff --git a/cde/programs/dtcm/dtcm/monthglance.c b/cde/programs/dtcm/dtcm/monthglance.c index 72facdf4e..0a5743bee 100644 --- a/cde/programs/dtcm/dtcm/monthglance.c +++ b/cde/programs/dtcm/dtcm/monthglance.c @@ -286,7 +286,7 @@ paint_month(Calendar *c, Tick key, XRectangle *rect) tm = *_XLocaltime(&key, localtime_buf); tm.tm_mday = 1; -#ifdef SVR4 +#if defined(SVR4) || defined(__linux__) tm.tm_isdst = -1; day = mktime(&tm); #else @@ -466,7 +466,7 @@ layout_month( tm = *_XLocaltime(&date, localtime_buf); tm.tm_mday = 1; -#ifdef SVR4 +#if defined(SVR4) || defined(__linux__) tm.tm_isdst = -1; day = mktime(&tm); #else @@ -703,7 +703,7 @@ count_month_pages(Calendar *c, Tick start_date, int lines_per_box) tm = *_XLocaltime(&start_date, localtime_buf); tm.tm_mday = 1; -#ifdef SVR4 +#if defined(SVR4) || defined(__linux__) tm.tm_isdst = -1; day = (int)mktime(&tm); #else diff --git a/cde/programs/dtcm/dtcm/monthglance.h b/cde/programs/dtcm/dtcm/monthglance.h index 496b556f9..838f45c42 100644 --- a/cde/programs/dtcm/dtcm/monthglance.h +++ b/cde/programs/dtcm/dtcm/monthglance.h @@ -53,7 +53,6 @@ #define _MONTHGLANCE_H #include -#include "ansi_c.h" typedef struct month { Widget *hot_button; @@ -63,13 +62,13 @@ typedef struct month { int dayname_height; } Month; -extern void prepare_to_paint_monthview P((Calendar*, XRectangle*)); -extern void get_time_str P((Dtcm_appointment*, char*)); -extern void month_button P((Widget, XtPointer, XtPointer)); -extern void month_event P((XEvent*)); -extern void paint_grid P((Calendar*, XRectangle*)); -extern void print_month_range P((Calendar*, Tick, Tick)); -extern void cleanup_after_monthview P((Calendar*)); +extern void prepare_to_paint_monthview(Calendar*, XRectangle*); +extern void get_time_str(Dtcm_appointment*, char*); +extern void month_button(Widget, XtPointer, XtPointer); +extern void month_event(XEvent*); +extern void paint_grid(Calendar*, XRectangle*); +extern void print_month_range(Calendar*, Tick, Tick); +extern void cleanup_after_monthview(Calendar*); #endif diff --git a/cde/programs/dtcm/dtcm/props_pu.h b/cde/programs/dtcm/dtcm/props_pu.h index 616229281..ba97dd5b2 100644 --- a/cde/programs/dtcm/dtcm/props_pu.h +++ b/cde/programs/dtcm/dtcm/props_pu.h @@ -31,7 +31,6 @@ #ifndef _PROPS_PU_H #define _PROPS_PU_H -#include "ansi_c.h" #include "dssw.h" #include "props.h" #include "reminders.h" @@ -244,25 +243,25 @@ enum ** External function declarations ** *******************************************************************************/ -extern void create_all_pixmaps P((Props_pu*, Widget)); -extern Boolean get_date_vals_from_ui P((Props_pu*, Props*)); -extern Boolean get_display_vals_from_ui P((Props_pu*, Props*)); -extern Boolean get_editor_vals_from_ui P((Props_pu*, Props*)); -extern Boolean get_gap_vals_from_ui P((Props_pu*, Props*)); -extern Boolean get_printer_vals_from_ui P((Props_pu*, Props*)); -extern Boolean get_props_from_ui P((Props_pu*, Props*, int*)); -extern void set_date_vals_on_ui P((Props_pu*, Props*)); -extern void set_display_vals_on_ui P((Props_pu*, Props*)); -extern void set_editor_vals_on_ui P((Props_pu*, Props*)); -extern void set_gap_vals_on_ui P((Props_pu*, Props*)); -extern void set_printer_vals_on_ui P((Props_pu*, Props*)); -extern void set_props_on_ui P((Props_pu*, Props*)); -extern void set_props_pu_defaults P((Props_pu*, Props*)); -extern void show_props_pu P((Calendar*)); -extern void props_pu_clean_up P((Props_pu*)); -extern Boolean props_pu_showing P((Props_pu*)); -extern Boolean p_flush_changes P((Calendar*)); -extern void show_print_props_pu P((Calendar*)); +extern void create_all_pixmaps(Props_pu*, Widget); +extern Boolean get_date_vals_from_ui(Props_pu*, Props*); +extern Boolean get_display_vals_from_ui(Props_pu*, Props*); +extern Boolean get_editor_vals_from_ui(Props_pu*, Props*); +extern Boolean get_gap_vals_from_ui(Props_pu*, Props*); +extern Boolean get_printer_vals_from_ui(Props_pu*, Props*); +extern Boolean get_props_from_ui(Props_pu*, Props*, int*); +extern void set_date_vals_on_ui(Props_pu*, Props*); +extern void set_display_vals_on_ui(Props_pu*, Props*); +extern void set_editor_vals_on_ui(Props_pu*, Props*); +extern void set_gap_vals_on_ui(Props_pu*, Props*); +extern void set_printer_vals_on_ui(Props_pu*, Props*); +extern void set_props_on_ui (Props_pu*, Props*); +extern void set_props_pu_defaults(Props_pu*, Props*); +extern void show_props_pu(Calendar*); +extern void props_pu_clean_up(Props_pu*); +extern Boolean props_pu_showing(Props_pu*); +extern Boolean p_flush_changes (Calendar*); +extern void show_print_props_pu(Calendar*); extern void p_defaults_proc_helper(XtPointer client_data); diff --git a/cde/programs/dtcm/dtcm/reminders.h b/cde/programs/dtcm/dtcm/reminders.h index 9b742ea72..0adcd7dd6 100644 --- a/cde/programs/dtcm/dtcm/reminders.h +++ b/cde/programs/dtcm/dtcm/reminders.h @@ -54,7 +54,6 @@ #include #include -#include "ansi_c.h" #include "misc.h" #define REMINDER_SCOPE_LEN 5 @@ -114,14 +113,14 @@ typedef struct { ** Editor external function declarations ** *******************************************************************************/ -extern void build_reminders P((Reminders*, Calendar*, Widget)); -extern Reminder_val_op get_reminders_vals P((Reminders*, Boolean)); -extern Boolean reminders_attrs_to_form P((Reminders*, Dtcm_appointment*)); -extern Boolean reminders_appt_to_form P((Reminders*, CSA_entry_handle)); -extern Boolean reminders_form_to_appt P((Reminders*, Dtcm_appointment*, char *)); -extern void set_reminders_defaults P((Reminders*)); -extern void set_reminders_vals P((Reminders*, Boolean)); -extern void reminders_init P((Reminders*, Calendar*, Widget)); +extern void build_reminders(Reminders*, Calendar*, Widget); +extern Reminder_val_op get_reminders_vals(Reminders*, Boolean); +extern Boolean reminders_attrs_to_form(Reminders*, Dtcm_appointment*); +extern Boolean reminders_appt_to_form(Reminders*, CSA_entry_handle); +extern Boolean reminders_form_to_appt(Reminders*, Dtcm_appointment*, char *); +extern void set_reminders_defaults(Reminders*); +extern void set_reminders_vals(Reminders*, Boolean); +extern void reminders_init(Reminders*, Calendar*, Widget); #endif diff --git a/cde/programs/dtcm/dtcm/rfp.h b/cde/programs/dtcm/dtcm/rfp.h index a0a3facda..d4fa85dcb 100644 --- a/cde/programs/dtcm/dtcm/rfp.h +++ b/cde/programs/dtcm/dtcm/rfp.h @@ -53,7 +53,6 @@ #define _RFP_H #include -#include "ansi_c.h" #include "calendar.h" #include "misc.h" @@ -98,20 +97,20 @@ typedef struct { ** RFP (repeat, for, privacy) external function declarations ** *******************************************************************************/ -extern void build_rfp P((RFP*, Calendar*, Widget)); -extern void get_rfp_privacy_val P((RFP*)); -extern void get_rfp_repeat_val P((RFP*, time_t)); -extern void get_rfp_vals P((RFP*, time_t)); -extern Boolean rfp_attrs_to_form P((RFP*, Dtcm_appointment*)); -extern Boolean rfp_appt_to_form P((RFP*, CSA_entry_handle)); -extern Boolean rfp_form_to_appt P((RFP*, Dtcm_appointment*, char*)); -extern Boolean rfp_form_flags_to_appt P((RFP*, Dtcm_appointment*, char*, int *)); -extern void set_rfp_privacy_val P((RFP*)); -extern void set_rfp_repeat_val P((RFP*)); -extern void set_rfp_defaults P((RFP*)); -extern void set_rfp_vals P((RFP*)); -extern void rfp_set_repeat_values P((RFP*)); -extern void rfp_init P((RFP*, Calendar *, Widget)); +extern void build_rfp(RFP*, Calendar*, Widget); +extern void get_rfp_privacy_val(RFP*); +extern void get_rfp_repeat_val(RFP*, time_t); +extern void get_rfp_vals(RFP*, time_t); +extern Boolean rfp_attrs_to_form(RFP*, Dtcm_appointment*); +extern Boolean rfp_appt_to_form(RFP*, CSA_entry_handle); +extern Boolean rfp_form_to_appt(RFP*, Dtcm_appointment*, char*); +extern Boolean rfp_form_flags_to_appt(RFP*, Dtcm_appointment*, char*, int *); +extern void set_rfp_privacy_val(RFP*); +extern void set_rfp_repeat_val(RFP*); +extern void set_rfp_defaults(RFP*); +extern void set_rfp_vals(RFP*); +extern void rfp_set_repeat_values(RFP*); +extern void rfp_init(RFP*, Calendar *, Widget); #endif diff --git a/cde/programs/dtcm/dtcm/select.h b/cde/programs/dtcm/dtcm/select.h index 5d528b6df..cd9ad434a 100644 --- a/cde/programs/dtcm/dtcm/select.h +++ b/cde/programs/dtcm/dtcm/select.h @@ -52,7 +52,6 @@ #ifndef _SELECT_H #define _SELECT_H -#include "ansi_c.h" #include "browser.h" #include "calendar.h" @@ -79,16 +78,16 @@ typedef struct { int y; } pr_pos; -extern void activate_selection P((Selection*)); -extern void browser_deselect P((Calendar *, Browser*)); -extern void browser_select P((Calendar *, Browser*, pr_pos*)); -extern void calendar_deselect P((Calendar*)); -extern void calendar_select P((Calendar*, Selection_unit, caddr_t)); -extern void deactivate_selection P((Selection *)); -extern void monthbox_deselect P((Calendar*)); -extern void monthbox_select P((Calendar*)); -extern void paint_selection P((Calendar*)); -extern int selection_active P((Selection*)); -extern void weekchart_select P((Calendar*)); +extern void activate_selection(Selection*); +extern void browser_deselect(Calendar *, Browser*); +extern void browser_select(Calendar *, Browser*, pr_pos*); +extern void calendar_deselect(Calendar*); +extern void calendar_select (Calendar*, Selection_unit, caddr_t); +extern void deactivate_selection(Selection *); +extern void monthbox_deselect(Calendar*); +extern void monthbox_select(Calendar*); +extern void paint_selection(Calendar*); +extern int selection_active(Selection*); +extern void weekchart_select(Calendar*); #endif diff --git a/cde/programs/dtcm/dtcm/session.h b/cde/programs/dtcm/dtcm/session.h index a4725d49b..cdeaadad5 100644 --- a/cde/programs/dtcm/dtcm/session.h +++ b/cde/programs/dtcm/dtcm/session.h @@ -52,10 +52,9 @@ #ifndef _SESSION_H #define _SESSION_H -#include "ansi_c.h" #include "calendar.h" -extern void CMSaveSessionCB P((Widget, XtPointer, XtPointer)); -extern void GetSessionInfo P(()); +extern void CMSaveSessionCB(Widget, XtPointer, XtPointer); +extern void GetSessionInfo(); #endif diff --git a/cde/programs/dtcm/dtcm/tempbr.h b/cde/programs/dtcm/dtcm/tempbr.h index 77907a3a3..b823f9473 100644 --- a/cde/programs/dtcm/dtcm/tempbr.h +++ b/cde/programs/dtcm/dtcm/tempbr.h @@ -52,7 +52,6 @@ #ifndef _TEMPBR_H #define _TEMPBR_H -#include "ansi_c.h" #include "calendar.h" #ifdef FNS #include "cmfns.h" @@ -76,6 +75,6 @@ typedef struct { #endif } Tempbr; -extern caddr_t make_tempbr P(()); +extern caddr_t make_tempbr(Calendar *c); #endif /* _TEMPBR_H */ diff --git a/cde/programs/dtcm/dtcm/timezone.h b/cde/programs/dtcm/dtcm/timezone.h index 8fe6d8442..62c42075f 100644 --- a/cde/programs/dtcm/dtcm/timezone.h +++ b/cde/programs/dtcm/dtcm/timezone.h @@ -73,7 +73,7 @@ typedef struct { char gmttimezone[BUFSIZ]; }Timezone; -extern caddr_t make_timezone P((Calendar*)); -extern void refresh_timezone P((Timezone*)); +extern caddr_t make_timezone(Calendar*); +extern void refresh_timezone(Timezone*); #endif diff --git a/cde/programs/dtcm/dtcm/todo.h b/cde/programs/dtcm/dtcm/todo.h index 5ce14bea0..934c072a4 100644 --- a/cde/programs/dtcm/dtcm/todo.h +++ b/cde/programs/dtcm/dtcm/todo.h @@ -53,7 +53,6 @@ #define _TODO_H #include -#include "ansi_c.h" #include "calendar.h" #include "misc.h" #include "dssw.h" @@ -130,24 +129,24 @@ typedef struct { ** ToDo external function declarations ** *******************************************************************************/ -extern void add_to_todo_list P((CSA_entry_handle, ToDo*)); -extern void add_all_todo P((ToDo*)); -extern void build_todo_list P((ToDo*, Tick, Glance, CSA_entry_handle**, - CSA_uint32*, todo_view_op)); -extern int build_todo_view P((ToDo*, Glance, Boolean)); -extern void get_todo_vals P((ToDo*)); -extern void todo_hide P((ToDo*)); -extern void set_todo_defaults P((ToDo*)); -extern void set_todo_title P((ToDo*, char*)); -extern void set_todo_vals P((ToDo*)); -extern void show_todo P((Calendar*)); -extern void t_make_todo P((Calendar*)); -extern void show_todo_view P((Calendar*, todo_view_op)); -extern void todo_clean_up P((ToDo*)); -extern Boolean todo_showing P((ToDo*)); -extern Boolean todo_view_showing P((ToDo*)); -extern CSA_entry_handle t_nth_appt P((ToDo*, int)); -extern Boolean todo_insert P((Dtcm_appointment*, CSA_entry_handle*, - Calendar*)); +extern void add_to_todo_list(CSA_entry_handle, ToDo*); +extern void add_all_todo(ToDo*); +extern void build_todo_list(ToDo*, Tick, Glance, CSA_entry_handle**, + CSA_uint32*, todo_view_op); +extern int build_todo_view(ToDo*, Glance, Boolean); +extern void get_todo_vals(ToDo*); +extern void todo_hide(ToDo*); +extern void set_todo_defaults(ToDo*); +extern void set_todo_title(ToDo*, char*); +extern void set_todo_vals(ToDo*); +extern void show_todo(Calendar*); +extern void t_make_todo(Calendar*); +extern void show_todo_view(Calendar*, todo_view_op); +extern void todo_clean_up(ToDo*); +extern Boolean todo_showing(ToDo*); +extern Boolean todo_view_showing(ToDo*); +extern CSA_entry_handle t_nth_appt(ToDo*, int); +extern Boolean todo_insert(Dtcm_appointment*, CSA_entry_handle*, + Calendar*); #endif diff --git a/cde/programs/dtcm/dtcm/weekglance.h b/cde/programs/dtcm/dtcm/weekglance.h index 5f742a882..dd196338a 100644 --- a/cde/programs/dtcm/dtcm/weekglance.h +++ b/cde/programs/dtcm/dtcm/weekglance.h @@ -53,7 +53,6 @@ #define _WEEKGLANCE_H #include -#include "ansi_c.h" typedef struct week { int start_date; @@ -86,12 +85,12 @@ typedef struct week { typedef enum {okay, lower, upper} Boundary; -extern void paint_weekview P((Calendar*, XRectangle*)); -extern void print_week_range P((Calendar*, Tick, Tick)); -extern int count_multi_appts P((CSA_entry_handle*, int, Calendar*)); -extern void week_button P((Widget, XtPointer, XtPointer)); -extern void week_event P((XEvent*)); -extern void cleanup_after_weekview P((Calendar*)); -extern void resize_weekview P((Calendar *, Boundary *)); +extern void paint_weekview(Calendar*, XRectangle*); +extern void print_week_range(Calendar*, Tick, Tick); +extern int count_multi_appts(CSA_entry_handle*, int, Calendar*); +extern void week_button(Widget, XtPointer, XtPointer); +extern void week_event(XEvent*); +extern void cleanup_after_weekview(Calendar*); +extern void resize_weekview(Calendar *, Boundary *); #endif diff --git a/cde/programs/dtcm/dtcm/x_graphics.h b/cde/programs/dtcm/dtcm/x_graphics.h index 44b3a508b..a77f89f73 100644 --- a/cde/programs/dtcm/dtcm/x_graphics.h +++ b/cde/programs/dtcm/dtcm/x_graphics.h @@ -43,43 +43,43 @@ #define PAGE_HEIGHT 11000 /* 11.0" paper height */ #define XINCH 1000 /* 1 inch */ -extern void x_day_header P((void *)); -extern void x_day_timeslots P((void *, int, Boolean)); -extern void x_finish_printer P((void *)); -extern void x_finish_std_month P(()); -extern int x_get_day_lines_per_page P((void *)); -extern int x_get_month_lines_per_page P((void *)); -extern int x_get_week_lines_per_page P((void *)); -extern void x_init_day P((void *, int)); -extern void x_init_list P((void *)); -extern void x_init_month P((void *, int)); -extern void x_init_printer P((void *, short)); -extern void x_init_std_year P((void *)); -extern void x_init_week P((void *)); -extern void x_month_daynames P((void *, int)); -extern void x_month_timeslots P((void *, Tick, Boolean)); -extern void * x_open_file P((Calendar *)); -extern void x_print_file P((void *, Calendar *)); -extern void x_print_header P((void *, char*, int, int)); -extern void x_print_list_range P((Calendar*, CSA_sint32, int, - Tick, Tick)); -extern void x_print_little_months P((void *, Tick)); -extern void x_print_month P((void *, int, int, int, - int, int, int, int)); -extern Boolean x_print_month_appts P((void *, CSA_entry_handle*, int, - int, time_t, int)); -extern Boolean x_print_multi_appts P((void *, CSA_entry_handle*, int, - int, Glance)); -extern void x_print_todo P((void *, CSA_entry_handle*, int, +extern void x_day_header(void *); +extern void x_day_timeslots(void *, int, Boolean); +extern void x_finish_printer(void *); +extern void x_finish_std_month(); +extern int x_get_day_lines_per_page(void *); +extern int x_get_month_lines_per_page(void *); +extern int x_get_week_lines_per_page(void *); +extern void x_init_day(void *, int); +extern void x_init_list(void *); +extern void x_init_month(void *, int); +extern void x_init_printer(void *, short); +extern void x_init_std_year(void *); +extern void x_init_week(void *); +extern void x_month_daynames(void *, int); +extern void x_month_timeslots(void *, Tick, Boolean); +extern void * x_open_file (Calendar *); +extern void x_print_file(void *, Calendar *); +extern void x_print_header(void *, char*, int, int); +extern void x_print_list_range(Calendar*, CSA_sint32, int, + Tick, Tick); +extern void x_print_little_months(void *, Tick); +extern void x_print_month(void *, int, int, int, + int, int, int, int); +extern Boolean x_print_month_appts(void *, CSA_entry_handle*, int, + int, time_t, int); +extern Boolean x_print_multi_appts(void *, CSA_entry_handle*, int, + int, Glance); +extern void x_print_todo(void *, CSA_entry_handle*, int, CSA_sint32, Boolean, int, time_t, - char *)); -extern void x_print_year P((void *, int)); -extern void x_std_month_name P((void *, char*)); -extern void x_std_year_name P((void *, int)); -extern void x_week_appt_boxes P((void *)); -extern void x_week_daynames P((void *, char*, int, Boolean)); -extern void x_week_sched_boxes P((void *)); -extern void x_week_sched_draw P((void *, int)); -extern void x_week_sched_init P((void *)); + char *); +extern void x_print_year(void *, int); +extern void x_std_month_name(void *, char*); +extern void x_std_year_name(void *, int); +extern void x_week_appt_boxes(void *); +extern void x_week_daynames(void *, char*, int, Boolean); +extern void x_week_sched_boxes(void *); +extern void x_week_sched_draw(void *, int); +extern void x_week_sched_init(void *); #endif diff --git a/cde/programs/dtcm/dtcm/yearglance.h b/cde/programs/dtcm/dtcm/yearglance.h index 7a22328fc..9a6470fc4 100644 --- a/cde/programs/dtcm/dtcm/yearglance.h +++ b/cde/programs/dtcm/dtcm/yearglance.h @@ -65,9 +65,9 @@ typedef struct year { int year_shown; } Year; -extern void cleanup_after_yearview P((Calendar *)); -extern void year_button P((Widget, XtPointer, XtPointer)); -extern CSA_return_code paint_year P((Calendar*)); -extern void print_std_year_range P((int, int)); +extern void cleanup_after_yearview(Calendar *); +extern void year_button(Widget, XtPointer, XtPointer); +extern CSA_return_code paint_year(Calendar*); +extern void print_std_year_range(int, int); #endif diff --git a/cde/programs/dtcm/libDtCmP/cm_tty.h b/cde/programs/dtcm/libDtCmP/cm_tty.h index b98427f34..7b9f20059 100644 --- a/cde/programs/dtcm/libDtCmP/cm_tty.h +++ b/cde/programs/dtcm/libDtCmP/cm_tty.h @@ -54,7 +54,6 @@ #include #include -#include "ansi_c.h" #include "timeops.h" #include "util.h" #include "props.h" @@ -175,60 +174,60 @@ static const int ALL_DAY = -2; /* * External function definitions */ -extern char *boolean_str P((boolean_t)); -extern int cm_tty_delete P((nl_catd, CSA_session_handle, int, int, CSA_entry_handle*)); -extern void cm_tty_format_header P((Props*, Tick, char*)); -extern int cm_tty_insert P((nl_catd, CSA_session_handle, int, char*, char*, +extern char *boolean_str(boolean_t); +extern int cm_tty_delete(nl_catd, CSA_session_handle, int, int, CSA_entry_handle*); +extern void cm_tty_format_header(Props*, Tick, char*); +extern int cm_tty_insert(nl_catd, CSA_session_handle, int, char*, char*, char*, char*, char*, char*, - char*, Props*)); -extern void cm_tty_load_props P((Props**)); -extern int cm_tty_lookup P((nl_catd, CSA_session_handle, int, char*, char*, - CSA_entry_handle**, Props*)); -extern boolean_t convert_boolean_str P((char*)); -extern CSA_sint32 convert_privacy_str P((char*)); -extern int convert_privacy_str_to_op P((char*)); -extern SeparatorType convert_separator_str P((char*)); -extern Time_scope_menu_op convert_time_scope_str P((char*)); -extern char *day_str P((Days_op)); -extern char *default_repeat_cnt_str P((Repeat_menu_op)); -extern char *default_repeat_scope_str P((nl_catd, Repeat_menu_op)); -extern char *for_str P((For_menu_op)); -extern char *get_datemsg P((OrderingType, - SeparatorType)); -extern Parse_key_op identify_parse_key P((char*)); -extern void load_appt_defaults P((Dtcm_appointment*, Props*)); -extern void load_reminder_props P((Dtcm_appointment*, Props*)); -extern char *month_str P((Months_op)); -extern Validate_op parse_appt_from_file P((nl_catd, char*, CmDataList*, + char*, Props*); +extern void cm_tty_load_props(Props**); +extern int cm_tty_lookup(nl_catd, CSA_session_handle, int, char*, char*, + CSA_entry_handle**, Props*); +extern boolean_t convert_boolean_str(char*); +extern CSA_sint32 convert_privacy_str(char*); +extern int convert_privacy_str_to_op (char*); +extern SeparatorType convert_separator_str(char*); +extern Time_scope_menu_op convert_time_scope_str(char*); +extern char *day_str(Days_op); +extern char *default_repeat_cnt_str(Repeat_menu_op); +extern char *default_repeat_scope_str(nl_catd, Repeat_menu_op); +extern char *for_str(For_menu_op); +extern char *get_datemsg(OrderingType, + SeparatorType); +extern Parse_key_op identify_parse_key(char*); +extern void load_appt_defaults(Dtcm_appointment*, Props*); +extern void load_reminder_props(Dtcm_appointment*, Props*); +extern char *month_str(Months_op); +extern Validate_op parse_appt_from_file(nl_catd, char*, CmDataList*, Props*, boolean_t(*)(void*), - void*, int)); -extern char *parse_attrs_to_string P((Dtcm_appointment*, Props*, - char*)); -extern char *attrs_to_string P((CSA_attribute *, int)); -extern char *create_rfc_message P((char *, char *, char**, int)); -extern char *parse_appt_to_string P((CSA_session_handle, CSA_entry_handle, Props*, int)); -extern char *periodstr_from_period P((CSA_sint32, int)); -extern char *privacy_str P((int)); -extern char *privacy_str_old P((int)); -extern char *repeat_str P((nl_catd, Repeat_menu_op)); -extern char *repeat_scope_str P((nl_catd, Repeat_scope_menu_op)); -extern char *privacy_str_411 P((int)); -extern char *separator_str P((SeparatorType)); -extern void str_to_period P((char*, CSA_sint32*, int*)); -extern int timescopestring_to_tick P((char*)); -extern char *time_scope_str P((Time_scope_menu_op)); -extern char *time_scope_str_i18n P((nl_catd, Time_scope_menu_op)); -extern boolean_t valid_time P((Props*, char*)); -extern Validate_op validate_appt P((nl_catd, Dtcm_appointment*, + void*, int); +extern char *parse_attrs_to_string(Dtcm_appointment*, Props*, + char*); +extern char *attrs_to_string(CSA_attribute *, int); +extern char *create_rfc_message(char *, char *, char**, int); +extern char *parse_appt_to_string(CSA_session_handle, CSA_entry_handle, Props*, int); +extern char *periodstr_from_period(CSA_sint32, int); +extern char *privacy_str(int); +extern char *privacy_str_old(int); +extern char *repeat_str (nl_catd, Repeat_menu_op); +extern char *repeat_scope_str(nl_catd, Repeat_scope_menu_op); +extern char *privacy_str_411(int); +extern char *separator_str(SeparatorType); +extern void str_to_period(char*, CSA_sint32*, int*); +extern int timescopestring_to_tick(char*); +extern char *time_scope_str(Time_scope_menu_op); +extern char *time_scope_str_i18n(nl_catd, Time_scope_menu_op); +extern boolean_t valid_time(Props*, char*); +extern Validate_op validate_appt(nl_catd, Dtcm_appointment*, char*, char*, char*, int, char*, char*, char*, boolean_t(*)(void*), void*, - int)); -extern Validate_op validate_dssw P((Dtcm_appointment*, char*, + int); +extern Validate_op validate_dssw(Dtcm_appointment*, char*, char*, char*, int, char*, - boolean_t(*)(void*), void*)); -extern Validate_op validate_rfp P((nl_catd, Dtcm_appointment*, - char*, char*, int)); -extern Validate_op validate_reminders P((Dtcm_appointment*)); + boolean_t(*)(void*), void*); +extern Validate_op validate_rfp(nl_catd, Dtcm_appointment*, + char*, char*, int); +extern Validate_op validate_reminders(Dtcm_appointment*); #endif diff --git a/cde/programs/dtcm/libDtCmP/getdate.h b/cde/programs/dtcm/libDtCmP/getdate.h index 6d3289d85..f0dd5b752 100644 --- a/cde/programs/dtcm/libDtCmP/getdate.h +++ b/cde/programs/dtcm/libDtCmP/getdate.h @@ -64,7 +64,6 @@ struct timeb #include #endif #include -#include "ansi_c.h" #define BOT_YEAR 1970 #define EOT_YEAR 2037 @@ -77,12 +76,12 @@ struct timeb #define DATE_BHOUR -7 /* date had a bad hour number */ #define DATE_CONV -8 /* date converted poorly for am/pm/24hr */ -extern time_t dateconv P((int, int, int, int, int, int, int, int, int)); -extern time_t dayconv P((int, int, time_t)); -extern time_t timeconv P((int, int, int, int)); -extern time_t monthadd P((time_t, time_t)); -extern time_t daylcorr P((time_t, time_t)); -extern time_t cm_getdate P((char*, struct timeb *)); +extern time_t dateconv (int, int, int, int, int, int, int, int, int); +extern time_t dayconv (int, int, time_t); +extern time_t timeconv (int, int, int, int); +extern time_t monthadd (time_t, time_t); +extern time_t daylcorr (time_t, time_t); +extern time_t cm_getdate (char*, struct timeb *); int yylex(); extern void yyerror(char *s); diff --git a/cde/programs/dtcm/libDtCmP/props.h b/cde/programs/dtcm/libDtCmP/props.h index b8f0385e1..b5f763845 100644 --- a/cde/programs/dtcm/libDtCmP/props.h +++ b/cde/programs/dtcm/libDtCmP/props.h @@ -53,7 +53,6 @@ #define _PROPS_H #include -#include "ansi_c.h" #include "resource.h" /******************************************************************************* @@ -150,14 +149,14 @@ typedef struct { ** External function declarations ** *******************************************************************************/ -extern boolean_t cal_convert_cmrc P((Props*)); -extern char *get_char_prop P((Props*, Props_op)); -extern char *get_char_prop_default P((Props_op)); -extern int get_int_prop P((Props*, Props_op)); -extern void props_clean_up P((Props*)); -extern boolean_t read_props P((Props*)); -extern boolean_t save_props P((Props*)); -extern boolean_t set_char_prop P((Props*, Props_op, char*)); -extern boolean_t set_int_prop P((Props*, Props_op, int)); +extern boolean_t cal_convert_cmrc(Props*); +extern char *get_char_prop(Props*, Props_op); +extern char *get_char_prop_default(Props_op); +extern int get_int_prop(Props*, Props_op); +extern void props_clean_up(Props*); +extern boolean_t read_props(Props*); +extern boolean_t save_props(Props*); +extern boolean_t set_char_prop(Props*, Props_op, char*); +extern boolean_t set_int_prop(Props*, Props_op, int); #endif diff --git a/cde/programs/dtcm/libDtCmP/resource.h b/cde/programs/dtcm/libDtCmP/resource.h index c9ab06d3a..830ca7447 100644 --- a/cde/programs/dtcm/libDtCmP/resource.h +++ b/cde/programs/dtcm/libDtCmP/resource.h @@ -51,8 +51,7 @@ #ifndef _RESOURCE_H #define _RESOURCE_H - -#include "ansi_c.h" + #include /* @@ -68,14 +67,14 @@ typedef struct Resource Resource; /* ** Function declarations */ -extern void free_resources P((Resource*)); -extern char *get_resource P((Resource*, char *, char*, - char*, char*)); -extern char *get_resource_by_val P((Resource*, char*, char*)); -extern boolean_t load_resources P((Resource**, char*)); -extern boolean_t save_resources P((Resource*, char*)); -extern boolean_t set_resource P((Resource**, char*, char*, - char*, char*)); -extern boolean_t set_resource_by_val P((Resource**, char*, char*)); +extern void free_resourcee(Resource*); +extern char *get_resource(Resource*, char *, char*, + char*, char*); +extern char *get_resource_by_val(Resource*, char*, char*); +extern boolean_t load_resources(Resource**, char*); +extern boolean_t save_resources(Resource*, char*); +extern boolean_t set_resource(Resource**, char*, char*, + char*, char*); +extern boolean_t set_resource_by_val(Resource**, char*, char*); #endif diff --git a/cde/programs/dtcm/libDtCmP/timeops.h b/cde/programs/dtcm/libDtCmP/timeops.h index c9a6f682c..70664b3ef 100644 --- a/cde/programs/dtcm/libDtCmP/timeops.h +++ b/cde/programs/dtcm/libDtCmP/timeops.h @@ -53,7 +53,6 @@ #define _TIMEOPS_H #include -#include "ansi_c.h" typedef enum { minsec = 60, @@ -81,71 +80,71 @@ extern char *months2[]; extern int monthsecs[]; extern char *numbers[]; -extern int days_to_seconds P((int)); -extern int dom P((Tick)); -extern int dow P((Tick)); -extern int fdom P((Tick)); -extern Tick first_dom P((Tick)); -extern Tick first_dow P((Tick)); -extern Tick get_eot P(()); -extern Tick get_bot P(()); -extern long gmt_off P(()); -extern int hour P((Tick)); -extern int hours_to_seconds P((int)); -extern void init_time P(()); -extern Tick jan1 P((Tick)); -extern Tick last_dom P((Tick)); -extern Tick last_dow P((Tick)); -extern Tick last_ndays P((Tick t, int)); -extern int lastapptofweek P((u_int)); -extern Tick lastjan1 P((Tick)); -extern int ldom P((Tick)); -extern Tick lower_bound P((int, Tick)); -extern Tick lowerbound P((Tick)); -extern boolean_t magic_time P((Tick t)); -extern Tick midnight P(()); -extern int minutes_to_seconds P((int)); -extern int minute P((Tick)); -extern int month P((Tick)); -extern Tick monthdayyear P((int, int, int)); -extern int monthlength P((Tick)); -extern Tick next_ndays P((Tick, int)); -extern Tick next_nhours P((Tick, int)); -extern Tick next2weeks P((Tick)); -extern Tick nextday P((Tick)); -extern Tick nextjan1 P((Tick)); -extern Tick nextmonth P((Tick t)); -extern Tick next_nmonth P((Tick t, int n)); -extern Tick nextmonth_exactday P((Tick t)); -extern Tick nextweek P((Tick t)); -extern Tick nextyear P((Tick)); -extern Tick nextnyear P((Tick t, int n)); -extern Tick now P(()); -extern int ntimes_this_week P((u_int, int)); -extern int numwks P((Tick)); -extern Tick prev_nmonth P((Tick t, int n)); -extern Tick prevmonth_exactday P((Tick)); -extern Tick previousmonth P((Tick t)); -extern Tick prevweek P((Tick t)); -extern Tick prev2weeks P((Tick t)); -extern Tick prevnyear P((Tick t, int n)); -extern int seconds P((int n, Unit unit)); -extern double seconds_dble P((double n, Unit unit)); -extern int seconds_to_days P((int)); -extern int seconds_to_hours P((int)); -extern int seconds_to_minutes P((int)); -extern int seconds_to_weeks P((int)); -extern void set_timezone P((char*)); -extern int timeok P((Tick t)); -extern Tick upperbound P((Tick)); -extern int weeks_to_seconds P((int)); -extern int wom P((Tick)); -extern boolean_t weekofmonth P((Tick, int*)); -extern Tick xytoclock P((int, int, Tick)); -extern int year P((Tick)); -extern int adjust_dst P((Tick, Tick)); -extern boolean_t adjust_hour P((int*)); -extern int leapyr P((int)); -extern Tick prevday P((Tick)); +extern int days_to_seconds (int); +extern int dom (Tick); +extern int dow (Tick); +extern int fdom (Tick); +extern Tick first_dom (Tick); +extern Tick first_dow (Tick); +extern Tick get_eot (void); +extern Tick get_bot (void); +extern long gmt_off (void); +extern int hour (Tick); +extern int hours_to_seconds(int); +extern void init_time (void); +extern Tick jan1 (Tick); +extern Tick last_dom (Tick); +extern Tick last_dow (Tick); +extern Tick last_ndays (Tick t, int); +extern int lastapptofweek (u_int); +extern Tick lastjan1 (Tick); +extern int ldom (Tick); +extern Tick lower_bound (int, Tick); +extern Tick lowerbound (Tick); +extern boolean_t magic_time (Tick t); +extern Tick midnight (); +extern int minutes_to_seconds(int); +extern int minute (Tick); +extern int month (Tick); +extern Tick monthdayyear (int, int, int); +extern int monthlength (Tick); +extern Tick next_ndays (Tick, int); +extern Tick next_nhours (Tick, int); +extern Tick next2weeks (Tick); +extern Tick nextday (Tick); +extern Tick nextjan1 (Tick); +extern Tick nextmonth (Tick t); +extern Tick next_nmonth (Tick t, int n); +extern Tick nextmonth_exactday(Tick t); +extern Tick nextweek (Tick t); +extern Tick nextyear (Tick); +extern Tick nextnyear (Tick t, int n); +extern Tick now (void); +extern int ntimes_this_week(u_int, int); +extern int numwks (Tick); +extern Tick prev_nmonth (Tick t, int n); +extern Tick prevmonth_exactday(Tick); +extern Tick previousmonth (Tick t); +extern Tick prevweek (Tick t); +extern Tick prev2weeks (Tick t); +extern Tick prevnyear (Tick t, int n); +extern int seconds (int n, Unit unit); +extern double seconds_dble (double n, Unit unit); +extern int seconds_to_days (int); +extern int seconds_to_hours(int); +extern int seconds_to_minutes(int); +extern int seconds_to_weeks(int); +extern void set_timezone (char*); +extern int timeok (Tick t); +extern Tick upperbound (Tick); +extern int weeks_to_seconds(int); +extern int wom (Tick); +extern boolean_t weekofmonth (Tick, int*); +extern Tick xytoclock (int, int, Tick); +extern int year (Tick); +extern int adjust_dst (Tick, Tick); +extern boolean_t adjust_hour (int*); +extern int leapyr (int); +extern Tick prevday (Tick); #endif diff --git a/cde/programs/dtcm/libDtCmP/util.c b/cde/programs/dtcm/libDtCmP/util.c index d33b8ba11..6de4739de 100644 --- a/cde/programs/dtcm/libDtCmP/util.c +++ b/cde/programs/dtcm/libDtCmP/util.c @@ -306,10 +306,7 @@ syserr(char *msg, int a1, int a2, int a3) #if 0 /* print the error, if any */ if (saveerr != 0) { - if (saveerr < 0 || saveerr > sys_nerr) - (void) fprintf(stderr, ":Unknown error %d", saveerr); - else - (void) fprintf(stderr, ":%s", sys_errlist[saveerr]); + (void) fprintf(stderr, ":%s", strerror(saveerr)); } #endif diff --git a/cde/programs/dtcm/libDtCmP/util.h b/cde/programs/dtcm/libDtCmP/util.h index 0ab470992..143d17e44 100644 --- a/cde/programs/dtcm/libDtCmP/util.h +++ b/cde/programs/dtcm/libDtCmP/util.h @@ -55,7 +55,6 @@ #include #include #include -#include "ansi_c.h" #include "timeops.h" #include "props.h" @@ -212,79 +211,79 @@ typedef struct { * forth to the backend. These functions and structures make hard coding * indexes into the arrays unnecessary. */ -extern Dtcm_appointment *allocate_appt_struct P((Allocation_reason , int, ...)); -extern CSA_return_code query_appt_struct P((CSA_session_handle, +extern Dtcm_appointment *allocate_appt_struct(Allocation_reason , int, ...); +extern CSA_return_code query_appt_struct (CSA_session_handle, CSA_entry_handle, - Dtcm_appointment *)); -extern Dtcm_calendar *allocate_cal_struct P((Allocation_reason, int, ...)); -extern CSA_return_code query_cal_struct P((CSA_session_handle, - Dtcm_calendar *)); -extern void free_appt_struct P((Dtcm_appointment**)); -extern void free_cal_struct P((Dtcm_calendar**)); + Dtcm_appointment *); +extern Dtcm_calendar *allocate_cal_struct(Allocation_reason, int, ...); +extern CSA_return_code query_cal_struct (CSA_session_handle, + Dtcm_calendar *); +extern void free_appt_struct(Dtcm_appointment**); +extern void free_cal_struct (Dtcm_calendar**); -extern boolean_t cal_ident_index_ro P((int, int)); -extern boolean_t entry_ident_index_ro P((int, int)); -extern CSA_enum cal_ident_index_tag P((int)); -extern CSA_enum entry_ident_index_tag P((int)); -extern boolean_t ident_name_ro P((char*, int)); -extern void initialize_cal_attr P((int, CSA_attribute*, - Allocation_reason, int)); -extern void initialize_entry_attr P((int, CSA_attribute*, - Allocation_reason, int)); -extern void set_appt_links P((Dtcm_appointment*)); -extern void set_cal_links P((Dtcm_calendar*)); -extern void scrub_cal_attr_list P((Dtcm_calendar*)); -extern void setup_range P((CSA_attribute**, +extern boolean_t cal_ident_index_ro(int, int); +extern boolean_t entry_ident_index_ro(int, int); +extern CSA_enum cal_ident_index_tag(int); +extern CSA_enum entry_ident_index_tag(int); +extern boolean_t ident_name_ro(char*, int); +extern void initialize_cal_attr(int, CSA_attribute*, + Allocation_reason, int); +extern void initialize_entry_attr(int, CSA_attribute*, + Allocation_reason, int); +extern void set_appt_links (Dtcm_appointment*); +extern void set_cal_links (Dtcm_calendar*); +extern void scrub_cal_attr_list(Dtcm_calendar*); +extern void setup_range (CSA_attribute**, CSA_enum**, int*, time_t, time_t, CSA_sint32, CSA_sint32, - boolean_t, int)); -extern void free_range P((CSA_attribute**, - CSA_enum**, int)); + boolean_t, int); +extern void free_range (CSA_attribute**, + CSA_enum**, int); /* * Other utilty functions */ -extern int blank_buf P((char*)); -extern int embedded_blank P((char*)); -extern char *ckalloc P(()); -extern char *cm_def_printer P(()); -extern char *cm_get_credentials P(()); -extern char *cm_get_local_domain P(()); -extern char *cm_get_local_host P(()); -extern char *cm_get_uname P(()); -extern char *cm_pqtarget P((char*)); -extern char *cm_strcat P((char*, char*)); -extern char *cm_strcpy P((char*, char*)); -extern char *cm_strdup P((char*)); -extern int cm_strlen P((char*)); -extern char *cm_target2domain P((char*)); -extern char *cm_target2host P((char*)); -extern char *cm_target2location P((char*)); -extern char *cm_target2name P((char*)); -extern char *cr_to_str P((char*)); -extern void destroy_lines P((Lines*)); -extern void expand_esc_chars P((char*)); -extern char *get_head P((char*, char)); -extern char *get_tail P((char*, char)); -extern void print_tick P((time_t)); -extern boolean_t same_path P((char*, char*)); -extern boolean_t same_user P((char*, char*)); -extern char *str_to_cr P((char*)); -extern char *strncat P(()); -extern char *substr P((char*, int, int n)); -extern void syserr P((char*, int, int, int)); -extern Lines *text_to_lines P((char*, int)); -extern int get_data_version P((CSA_session_handle)); -extern int get_server_version P((CSA_session_handle)); -extern CSA_sint32 privacy_set P((Dtcm_appointment *)); -extern CSA_sint32 showtime_set P((Dtcm_appointment *)); -extern int max P((int, int)); -extern int min P((int, int)); -extern int parse_date P((OrderingType, SeparatorType, char*, char*, char*, char*)); +extern int blank_buf (char*); +extern int embedded_blank(char*); +extern char * ckalloc(unsigned int size); +extern char * cm_def_printer(void); +extern char * cm_get_credentials(void); +extern char * cm_get_local_domain(void); +extern char * cm_get_local_host(void); +extern char * cm_get_uname(void); +extern char * cm_pqtarget(char*); +extern char * cm_strcat(char*, char*); +extern char * cm_strcpy(char*, char*); +extern char * cm_strdup(char*); +extern int cm_strlen(char*); +extern char * cm_target2domain(char*); +extern char * cm_target2host (char*); +extern char * cm_target2location(char*); +extern char * cm_target2name (char*); +extern char * cr_to_str(char*); +extern void destroy_lines(Lines*); +extern void expand_esc_chars(char*); +extern char * get_head(char*, char); +extern char * get_tail(char*, char); +extern void print_tick(time_t); +extern boolean_t same_path(char*, char*); +extern boolean_t same_user(char*, char*); +extern char * str_to_cr(char*); +extern char * strncat(char *, const char *, size_t n); +extern char * substr(char*, int, int n); +extern void syserr(char*, int, int, int); +extern Lines * text_to_lines (char*, int); +extern int get_data_version(CSA_session_handle); +extern int get_server_version(CSA_session_handle); +extern CSA_sint32 privacy_set(Dtcm_appointment *); +extern CSA_sint32 showtime_set(Dtcm_appointment *); +extern int max(int, int); +extern int min(int, int); +extern int parse_date(OrderingType, SeparatorType, char*, char*, char*, char*); -extern int datestr2mdy P((char*, OrderingType, SeparatorType, char*)); -extern void format_tick P((time_t, OrderingType, SeparatorType, char*)); -extern void format_time P((Tick, DisplayType, char*)); +extern int datestr2mdy(char*, OrderingType, SeparatorType, char*); +extern void format_tick(time_t, OrderingType, SeparatorType, char*); +extern void format_time(Tick, DisplayType, char*); /* * In Motif you can't associate user data with items in a list. To get around @@ -303,12 +302,12 @@ typedef struct _CmDataList { int count; } CmDataList; -extern CmDataList *CmDataListCreate P((void)); -extern void CmDataListDestroy P((CmDataList *, int)); -extern int CmDataListAdd P((CmDataList *, void *, int)); -extern void *CmDataListGetData P((CmDataList *, int)); -extern void *CmDataListDeletePos P((CmDataList *, int, int)); -extern void CmDataListDeleteAll P((CmDataList *, int)); +extern CmDataList * CmDataListCreate(void); +extern void CmDataListDestroy(CmDataList *, int); +extern int CmDataListAdd(CmDataList *, void *, int); +extern void * CmDataListGetData(CmDataList *, int); +extern void * CmDataListDeletePos(CmDataList *, int, int); +extern void CmDataListDeleteAll(CmDataList *, int); #endif diff --git a/cde/programs/dtcm/server/access.h b/cde/programs/dtcm/server/access.h index f2359a581..c6160994d 100644 --- a/cde/programs/dtcm/server/access.h +++ b/cde/programs/dtcm/server/access.h @@ -31,7 +31,6 @@ #ifndef _ACCESS_H #define _ACCESS_H -#include "ansi_c.h" #include "cm.h" #include "rtable4.h" #include "cmscalendar.h" @@ -70,46 +69,46 @@ #define _DTCMS_HAS_V4_WRITE_ACCESS(a) \ ((a) & (access_write_4 | CSA_OWNER_RIGHTS)) -extern CSA_return_code _DtCmsV4LoadAndCheckAccess P(( +extern CSA_return_code _DtCmsV4LoadAndCheckAccess( struct svc_req *svcrq, char *target, char **sender, uint *access, - _DtCmsCalendar **cal)); + _DtCmsCalendar **cal); -extern CSA_return_code _DtCmsV5LoadAndCheckAccess P(( +extern CSA_return_code _DtCmsV5LoadAndCheckAccess( struct svc_req *svcrq, char *target, char **sender, uint *access, - _DtCmsCalendar **cal)); + _DtCmsCalendar **cal); -extern CSA_return_code _DtCmsGetClientInfo P(( +extern CSA_return_code _DtCmsGetClientInfo( struct svc_req *svcrq, - char **source)); + char **source); -extern boolean_t _DtCmsIsFileOwner P((char *owner, char *user, char *target)); +extern boolean_t _DtCmsIsFileOwner(char *owner, char *user, char *target); -extern void _DtCmsShowAccessList P((Access_Entry_4 *l)); +extern void _DtCmsShowAccessList(Access_Entry_4 *l); -extern Access_Entry_4 *_DtCmsCalendarAccessList P((_DtCmsCalendar *cal)); +extern Access_Entry_4 *_DtCmsCalendarAccessList(_DtCmsCalendar *cal); -extern Privacy_Level_4 _DtCmCheckPrivacyLevel P((char **p_src, Appt_4 *p_appt)); +extern Privacy_Level_4 _DtCmCheckPrivacyLevel(char **p_src, Appt_4 *p_appt); -extern CSA_return_code _DtCmsCheckViewAccess P(( +extern CSA_return_code _DtCmsCheckViewAccess( char *user, uint access, - cms_entry *eptr)); + cms_entry *eptr); -extern CSA_return_code _DtCmsCheckChangeAccess P(( +extern CSA_return_code _DtCmsCheckChangeAccess( char *user, uint access, - cms_entry *eptr)); + cms_entry *eptr); -extern uint _DtCmsClassToInsertAccess P((cms_entry *entry)); +extern uint _DtCmsClassToInsertAccess(cms_entry *entry); -extern uint _DtCmsClassToViewAccess P((cms_entry *entry)); +extern uint _DtCmsClassToViewAccess(cms_entry *entry); -extern uint _DtCmsClassToChangeAccess P((cms_entry *entry)); +extern uint _DtCmsClassToChangeAccess(cms_entry *entry); #endif diff --git a/cde/programs/dtcm/server/callback.h b/cde/programs/dtcm/server/callback.h index 9fa3cb6d9..d1ebf3d43 100644 --- a/cde/programs/dtcm/server/callback.h +++ b/cde/programs/dtcm/server/callback.h @@ -31,7 +31,6 @@ #ifndef _CALLBACK_H #define _CALLBACK_H -#include "ansi_c.h" #include "rtable4.h" typedef struct __DtCmsRegistrationInfo { @@ -44,81 +43,81 @@ typedef struct __DtCmsRegistrationInfo { struct __DtCmsRegistrationInfo *next; } _DtCmsRegistrationInfo; -extern _DtCmsRegistrationInfo *_DtCmsMakeRegistrationInfo P(( +extern _DtCmsRegistrationInfo *_DtCmsMakeRegistrationInfo( char *client, int types, u_long prognum, u_long versnum, u_long procnum, - int pid)); + int pid); -extern void _DtCmsFreeRegistrationInfo P((_DtCmsRegistrationInfo *w)); +extern void _DtCmsFreeRegistrationInfo(_DtCmsRegistrationInfo *w); -extern _DtCmsRegistrationInfo *_DtCmsGetRegistration P(( +extern _DtCmsRegistrationInfo *_DtCmsGetRegistration( _DtCmsRegistrationInfo **rlist, char *client, u_long prognum, u_long versnum, u_long procnum, - int pid)); + int pid); -extern _DtCmsRegistrationInfo *_DtCmsRemoveRegistration P(( +extern _DtCmsRegistrationInfo *_DtCmsRemoveRegistration( _DtCmsRegistrationInfo *rlist, - _DtCmsRegistrationInfo *rinfo)); + _DtCmsRegistrationInfo *rinfo); -extern _DtCmsRegistrationInfo *_DtCmsCheckRegistrationList P(( - _DtCmsRegistrationInfo *rlist)); +extern _DtCmsRegistrationInfo *_DtCmsCheckRegistrationList( + _DtCmsRegistrationInfo *rlist); -extern _DtCmsRegistrationInfo * _DtCmsDoV1CbForV4Data P(( +extern _DtCmsRegistrationInfo * _DtCmsDoV1CbForV4Data( _DtCmsRegistrationInfo *rlist, char *source, int pid, cms_key *key1, - cms_key *key2)); + cms_key *key2); -extern _DtCmsRegistrationInfo *_DtCmsDoV1Callback P(( +extern _DtCmsRegistrationInfo *_DtCmsDoV1Callback( _DtCmsRegistrationInfo *rlist, char *source, int pid, - Appt_4 *a)); + Appt_4 *a); -extern _DtCmsRegistrationInfo *_DtCmsDoOpenCalCallback P(( +extern _DtCmsRegistrationInfo *_DtCmsDoOpenCalCallback( _DtCmsRegistrationInfo *rlist, char *cal, char *user, - int pid)); + int pid); -extern _DtCmsRegistrationInfo *_DtCmsDoRemoveCalCallback P(( +extern _DtCmsRegistrationInfo *_DtCmsDoRemoveCalCallback( _DtCmsRegistrationInfo *rlist, char *cal, char *user, - int pid)); + int pid); -extern _DtCmsRegistrationInfo *_DtCmsDoUpdateCalAttrsCallback P(( +extern _DtCmsRegistrationInfo *_DtCmsDoUpdateCalAttrsCallback( _DtCmsRegistrationInfo *rlist, char *cal, char *user, uint num_attrs, cms_attribute *attrs, - int pid)); + int pid); -extern _DtCmsRegistrationInfo *_DtCmsDoInsertEntryCallback P(( +extern _DtCmsRegistrationInfo *_DtCmsDoInsertEntryCallback( _DtCmsRegistrationInfo *rlist, char *cal, char *source, long id, - int pid)); + int pid); -extern _DtCmsRegistrationInfo *_DtCmsDoDeleteEntryCallback P(( +extern _DtCmsRegistrationInfo *_DtCmsDoDeleteEntryCallback( _DtCmsRegistrationInfo *rlist, char *cal, char *source, long id, int scope, time_t time, - int pid)); + int pid); -extern _DtCmsRegistrationInfo *_DtCmsDoUpdateEntryCallback P(( +extern _DtCmsRegistrationInfo *_DtCmsDoUpdateEntryCallback( _DtCmsRegistrationInfo *rlist, char *cal, char *source, @@ -126,10 +125,10 @@ extern _DtCmsRegistrationInfo *_DtCmsDoUpdateEntryCallback P(( long oldid, int scope, long time, - int pid)); + int pid); -extern void _DtCmsListRegistration P((_DtCmsRegistrationInfo *rlist, - char *cal)); +extern void _DtCmsListRegistration(_DtCmsRegistrationInfo *rlist, + char *cal); #endif diff --git a/cde/programs/dtcm/server/cmsattr.h b/cde/programs/dtcm/server/cmsattr.h index 1bf1239a5..cb07372d6 100644 --- a/cde/programs/dtcm/server/cmsattr.h +++ b/cde/programs/dtcm/server/cmsattr.h @@ -44,36 +44,35 @@ #ifndef _CMSATTR_H #define _CMSATTR_H -#include "ansi_c.h" #include "cm.h" #include "cmscalendar.h" -extern CSA_return_code _DtCmsUpdateSint32AttrVal P(( +extern CSA_return_code _DtCmsUpdateSint32AttrVal( cms_attribute_value *newval, - cms_attribute_value **attrval)); + cms_attribute_value **attrval); -extern CSA_return_code _DtCmsUpdateUint32AttrVal P(( +extern CSA_return_code _DtCmsUpdateUint32AttrVal( cms_attribute_value *newval, - cms_attribute_value **attrval)); + cms_attribute_value **attrval); -extern CSA_return_code _DtCmsUpdateStringAttrVal P(( +extern CSA_return_code _DtCmsUpdateStringAttrVal( cms_attribute_value *newval, - cms_attribute_value **attrval)); + cms_attribute_value **attrval); -extern CSA_return_code _DtCmsUpdateAccessListAttrVal P(( +extern CSA_return_code _DtCmsUpdateAccessListAttrVal( cms_attribute_value *newval, - cms_attribute_value **attrval)); + cms_attribute_value **attrval); -extern CSA_return_code _DtCmsUpdateReminderAttrVal P(( +extern CSA_return_code _DtCmsUpdateReminderAttrVal( cms_attribute_value *newval, - cms_attribute_value **attrval)); + cms_attribute_value **attrval); -extern CSA_return_code _DtCmsUpdateDateTimeListAttrVal P(( +extern CSA_return_code _DtCmsUpdateDateTimeListAttrVal( cms_attribute_value *newval, - cms_attribute_value **attrval)); + cms_attribute_value **attrval); -extern CSA_return_code _DtCmsUpdateOpaqueDataAttrVal P(( +extern CSA_return_code _DtCmsUpdateOpaqueDataAttrVal( cms_attribute_value *newval, - cms_attribute_value **attrval)); + cms_attribute_value **attrval); #endif diff --git a/cde/programs/dtcm/server/cmscalendar.h b/cde/programs/dtcm/server/cmscalendar.h index 27df5198b..3e1e8acc4 100644 --- a/cde/programs/dtcm/server/cmscalendar.h +++ b/cde/programs/dtcm/server/cmscalendar.h @@ -31,7 +31,6 @@ #ifndef _CMSCALENDAR_H #define _CMSCALENDAR_H -#include "ansi_c.h" #include "csa.h" #include "cm.h" #include "nametbl.h" @@ -89,84 +88,84 @@ typedef struct __DtCmsCalendar { } _DtCmsCalendar; -extern _DtCmsCalendar * _DtCmsMakeCalendar P(( +extern _DtCmsCalendar * _DtCmsMakeCalendar( char *owner, - char *name)); + char *name); -extern void _DtCmsPutInCalList P((_DtCmsCalendar *cal)); +extern void _DtCmsPutInCalList(_DtCmsCalendar *cal); -extern void _DtCmsFreeCalendar P((_DtCmsCalendar *cal)); +extern void _DtCmsFreeCalendar(_DtCmsCalendar *cal); -extern CSA_return_code _DtCmsSetFileVersion P(( +extern CSA_return_code _DtCmsSetFileVersion( _DtCmsCalendar *cal, - int version)); + int version); -extern CSA_return_code _DtCmsLoadCalendar P(( +extern CSA_return_code _DtCmsLoadCalendar( char *target, - _DtCmsCalendar **cal)); + _DtCmsCalendar **cal); -extern char * _DtCmsGetCalendarOwner P((char *target)); +extern char * _DtCmsGetCalendarOwner(char *target); -extern CSA_return_code _DtCmsGetCalendarByName P(( +extern CSA_return_code _DtCmsGetCalendarByName( char *target, boolean_t load, - _DtCmsCalendar **cal)); + _DtCmsCalendar **cal); -extern CSA_return_code _DtCmsInsertEntry4Parser P(( +extern CSA_return_code _DtCmsInsertEntry4Parser( _DtCmsCalendar *cal, - cms_entry *entry)); + cms_entry *entry); -extern void _DtCmsSetAccess4Parser P(( +extern void _DtCmsSetAccess4Parser( _DtCmsCalendar *cal, Access_Entry_4 *list, - int type)); + int type); -extern void _DtCmsSetCalendarAttrs4Parser P(( +extern void _DtCmsSetCalendarAttrs4Parser( _DtCmsCalendar *cal, int len, - cms_attribute *attrs)); + cms_attribute *attrs); -extern void _DtCmsGenerateKey P((_DtCmsCalendar *cal, long *key)); +extern void _DtCmsGenerateKey(_DtCmsCalendar *cal, long *key); -extern CSA_return_code _DtCmsEnumerateUp P(( +extern CSA_return_code _DtCmsEnumerateUp( _DtCmsCalendar *cal, - _DtCmsEnumerateProc doit)); + _DtCmsEnumerateProc doit); -extern void _DtCmsEnumerateDown P(( +extern void _DtCmsEnumerateDown( _DtCmsCalendar *cal, - _DtCmsEnumerateProc doit)); + _DtCmsEnumerateProc doit); -extern CSA_return_code _DtCmsRbToCsaStat P((Rb_Status rb_stat)); +extern CSA_return_code _DtCmsRbToCsaStat(Rb_Status rb_stat); -extern CSA_return_code _DtCmsGetCalAttrsByName P(( +extern CSA_return_code _DtCmsGetCalAttrsByName( _DtCmsCalendar *cal, uint num_names, cms_attr_name *names, uint *num_attrs_r, - cms_attribute **attrs_r)); + cms_attribute **attrs_r); -extern CSA_return_code _DtCmsGetAllCalAttrs P(( +extern CSA_return_code _DtCmsGetAllCalAttrs( _DtCmsCalendar *cal, u_int *num_attrs_r, cms_attribute **attrs_r, - boolean_t returnall)); + boolean_t returnall); -extern CSA_return_code _DtCmsGetCalAttrNames P(( +extern CSA_return_code _DtCmsGetCalAttrNames( _DtCmsCalendar *cal, uint *num_names_r, - cms_attr_name **names_r)); + cms_attr_name **names_r); -extern void _DtCmsFreeCmsAttrNames P((uint num, cms_attr_name *names)); +extern void _DtCmsFreeCmsAttrNames(uint num, cms_attr_name *names); -extern CSA_return_code _DtCmsUpdateCalAttributesAndLog P(( +extern CSA_return_code _DtCmsUpdateCalAttributesAndLog( _DtCmsCalendar *cal, uint numsrc, cms_attribute *srcattrs, - uint access)); + uint access); -extern CSA_return_code _DtCmsV5TransactLog P(( +extern CSA_return_code _DtCmsV5TransactLog( _DtCmsCalendar *cal, cms_entry *e, - _DtCmsLogOps op)); + _DtCmsLogOps op); #endif diff --git a/cde/programs/dtcm/server/cmsconvert.h b/cde/programs/dtcm/server/cmsconvert.h index f2ff80e71..c0a30d641 100644 --- a/cde/programs/dtcm/server/cmsconvert.h +++ b/cde/programs/dtcm/server/cmsconvert.h @@ -32,59 +32,58 @@ #define _CMSCONVERT_H #include -#include "ansi_c.h" #include "cm.h" #include "rtable4.h" #include "v4ops.h" -extern CSA_return_code _DtCmsCmsentriesToAppt4ForClient P(( +extern CSA_return_code _DtCmsCmsentriesToAppt4ForClient( cms_entry *entries, - Appt_4 **appt)); + Appt_4 **appt); -extern CSA_return_code _DtCmsCmsentriesToAbbrAppt4ForClient P(( +extern CSA_return_code _DtCmsCmsentriesToAbbrAppt4ForClient( cms_entry *entries, - Abb_Appt_4 **abbr)); + Abb_Appt_4 **abbr); -extern CSA_return_code _DtCmsCmsentryToAbbrAppt4 P(( +extern CSA_return_code _DtCmsCmsentryToAbbrAppt4( cms_entry *entry, - Abb_Appt_4 **abbr)); + Abb_Appt_4 **abbr); -extern Access_Entry_4 *_DtCmsConvertV5AccessList P(( +extern Access_Entry_4 *_DtCmsConvertV5AccessList( cms_access_entry *cmslist, - boolean_t strictmode)); + boolean_t strictmode); -extern cms_access_entry *_DtCmsConvertV4AccessList P(( - Access_Entry_4 *alist)); +extern cms_access_entry *_DtCmsConvertV4AccessList( + Access_Entry_4 *alist); -extern CSA_return_code _DtCmsReminderRefToReminder P(( +extern CSA_return_code _DtCmsReminderRefToReminder( cms_reminder_ref *rems, - Reminder_4 **r4)); + Reminder_4 **r4); -extern CSA_return_code _DtCmsV4ReminderToReminderRef P(( +extern CSA_return_code _DtCmsV4ReminderToReminderRef( char *calname, Reminder_4 *r4, _DtCmsEntryId *ids, - cms_reminder_ref **rems)); + cms_reminder_ref **rems); -extern CSA_return_code _DtCmsCmsAccessToV4Access P(( +extern CSA_return_code _DtCmsCmsAccessToV4Access( cms_access_entry *alist, - Access_Entry_4 **a4)); + Access_Entry_4 **a4); -extern CSA_return_code _DtCmsAppt4ToCmsentriesForClient P(( +extern CSA_return_code _DtCmsAppt4ToCmsentriesForClient( char *calname, Appt_4 *appt, - cms_entry **e_r)); + cms_entry **e_r); -extern CSA_return_code _DtCmsAppt4ToCmsentry P(( +extern CSA_return_code _DtCmsAppt4ToCmsentry( char *calname, Appt_4 *a4, cms_entry **entry_r, - boolean_t rerule)); + boolean_t rerule); -extern CSA_return_code _DtCmsAttrsToAppt4 P(( +extern CSA_return_code _DtCmsAttrsToAppt4( uint size, cms_attribute *attrs, Appt_4 *appt, - boolean_t check)); + boolean_t check); #endif diff --git a/cde/programs/dtcm/server/cmsentry.h b/cde/programs/dtcm/server/cmsentry.h index 63936eb32..41924b2e7 100644 --- a/cde/programs/dtcm/server/cmsentry.h +++ b/cde/programs/dtcm/server/cmsentry.h @@ -32,23 +32,22 @@ #define _CMSENTRY_H #include -#include "ansi_c.h" #include "nametbl.h" #include "cm.h" #include "csa.h" #include "cmscalendar.h" -extern CSA_return_code _DtCmsMakeHashedEntry P(( +extern CSA_return_code _DtCmsMakeHashedEntry( _DtCmsCalendar *cal, uint num, cms_attribute *attrs, - cms_entry **entry)); + cms_entry **entry); -extern void _DtCmsFreeEntryAttrResItem P((cms_get_entry_attr_res_item *elist)); +extern void _DtCmsFreeEntryAttrResItem(cms_get_entry_attr_res_item *elist); -extern CSA_return_code _DtCmsGetCmsEntryForClient P(( +extern CSA_return_code _DtCmsGetCmsEntryForClient( cms_entry *e, cms_entry **e_r, - boolean_t time_only)); + boolean_t time_only); #endif diff --git a/cde/programs/dtcm/server/cmsmatch.h b/cde/programs/dtcm/server/cmsmatch.h index b24c8eb83..926cd66b5 100644 --- a/cde/programs/dtcm/server/cmsmatch.h +++ b/cde/programs/dtcm/server/cmsmatch.h @@ -32,14 +32,13 @@ #define _CMSMATCH_H #include -#include "ansi_c.h" #include "cm.h" #include "nametbl.h" -extern boolean_t _DtCmsMatchAttributes P(( +extern boolean_t _DtCmsMatchAttributes( cms_entry *entry, uint num_attrs, cms_attribute *attrs, - CSA_enum *ops)); + CSA_enum *ops); #endif diff --git a/cde/programs/dtcm/server/data.h b/cde/programs/dtcm/server/data.h index 23d021c2a..0435fdac5 100644 --- a/cde/programs/dtcm/server/data.h +++ b/cde/programs/dtcm/server/data.h @@ -35,8 +35,6 @@ * Common definition for internal data storage */ -#include "ansi_c.h" - typedef enum { rb_ok = 0, rb_duplicate = 1, diff --git a/cde/programs/dtcm/server/delete.h b/cde/programs/dtcm/server/delete.h index 1bc11d619..a1a38e8c1 100644 --- a/cde/programs/dtcm/server/delete.h +++ b/cde/programs/dtcm/server/delete.h @@ -31,31 +31,30 @@ #ifndef _DELETE_H #define _DELETE_H -#include "ansi_c.h" #include "cm.h" #include "cmscalendar.h" -extern CSA_return_code _DtCmsDeleteEntry P(( +extern CSA_return_code _DtCmsDeleteEntry( _DtCmsCalendar *cal, char *sender, uint access, cms_key *key, - cms_entry **entry_r)); + cms_entry **entry_r); -extern CSA_return_code _DtCmsDeleteEntryAndLog P(( +extern CSA_return_code _DtCmsDeleteEntryAndLog( _DtCmsCalendar *cal, char *sender, uint access, cms_key *key, - cms_entry **entry_r)); + cms_entry **entry_r); -extern CSA_return_code _DtCmsDeleteInstancesAndLog P(( +extern CSA_return_code _DtCmsDeleteInstancesAndLog( _DtCmsCalendar *cal, char *sender, uint access, cms_key *key, int scope, cms_entry **newe, - cms_entry **olde)); + cms_entry **olde); #endif diff --git a/cde/programs/dtcm/server/garbage.h b/cde/programs/dtcm/server/garbage.h index dd635b82b..8548e1098 100644 --- a/cde/programs/dtcm/server/garbage.h +++ b/cde/programs/dtcm/server/garbage.h @@ -31,8 +31,6 @@ #ifndef _GARBAGE_H #define _GARBAGE_H -#include "ansi_c.h" - /* ** Housekeeping mechanism to clean up the calendar log file. It copies the ** log file to a backup file, dumps the red/black tree to a temp file, copies @@ -41,8 +39,8 @@ ** The garbage collector runs at midnight every. */ -extern void _DtCmsCollectOne P((_DtCmsCalendar *cal)); -extern CSA_return_code _DtCmsDumpDataV1 P((char *file, _DtCmsCalendar *cal)); -extern CSA_return_code _DtCmsDumpDataV2 P((char *file, _DtCmsCalendar *cal)); +extern void _DtCmsCollectOne(_DtCmsCalendar *cal); +extern CSA_return_code _DtCmsDumpDataV1(char *file, _DtCmsCalendar *cal); +extern CSA_return_code _DtCmsDumpDataV2(char *file, _DtCmsCalendar *cal); #endif diff --git a/cde/programs/dtcm/server/insert.h b/cde/programs/dtcm/server/insert.h index bf1d639aa..b0d28fbcb 100644 --- a/cde/programs/dtcm/server/insert.h +++ b/cde/programs/dtcm/server/insert.h @@ -31,16 +31,15 @@ #ifndef _INSERT_H #define _INSERT_H -#include "ansi_c.h" #include "cm.h" #include "cmscalendar.h" -extern CSA_return_code _DtCmsInsertEntry P(( +extern CSA_return_code _DtCmsInsertEntry( _DtCmsCalendar *cal, - cms_entry *entry)); + cms_entry *entry); -extern CSA_return_code _DtCmsInsertEntryAndLog P(( +extern CSA_return_code _DtCmsInsertEntryAndLog( _DtCmsCalendar *cal, - cms_entry *entry)); + cms_entry *entry); #endif diff --git a/cde/programs/dtcm/server/lexer.h b/cde/programs/dtcm/server/lexer.h index 932cbf67b..e9866cb21 100644 --- a/cde/programs/dtcm/server/lexer.h +++ b/cde/programs/dtcm/server/lexer.h @@ -31,7 +31,6 @@ #ifndef _LEXER_H #define _LEXER_H -#include "ansi_c.h" #include "rtable4.h" extern int yyylineno; @@ -42,7 +41,7 @@ extern Tag_4 externTag; extern Appt_Status_4 externApptStatus; extern Privacy_Level_4 externPrivacy; -extern void setinput P((FILE*)); -extern int yyylex P(()); +extern void setinput(FILE*); +extern int yyylex(void); #endif diff --git a/cde/programs/dtcm/server/lexit.c b/cde/programs/dtcm/server/lexit.c index afd6c6e43..ebe2653c6 100644 --- a/cde/programs/dtcm/server/lexit.c +++ b/cde/programs/dtcm/server/lexit.c @@ -46,7 +46,6 @@ #include "rtable4.h" #include "parser.h" -#include "ansi_c.h" extern char *pgname; int yyylineno; @@ -58,8 +57,8 @@ Appt_Status_4 externApptStatus; Tag_4 externTag; Privacy_Level_4 externPrivacy; -static int hash_string P((char *)); -static char *strescapes P((char *)); +static int hash_string(char *); +static char *strescapes(char *); static int len; static caddr_t start_of_mmapped_area; diff --git a/cde/programs/dtcm/server/list.h b/cde/programs/dtcm/server/list.h index 899a0032f..66e9d817c 100644 --- a/cde/programs/dtcm/server/list.h +++ b/cde/programs/dtcm/server/list.h @@ -31,7 +31,6 @@ #ifndef _LIST_H #define _LIST_H -#include "ansi_c.h" #include "data.h" #include "rerule.h" @@ -49,28 +48,28 @@ typedef struct { caddr_t private; /* for internal tool state */ } Hc_list; -typedef int(*Destroy_proc)P((caddr_t)); +typedef int(*Destroy_proc)(caddr_t); #define hc_lookup_next(p_node) (p_node)->rlink #define hc_lookup_previous(p_node) (p_node)->llink -extern Rb_Status hc_check_list P((Hc_list*)); -extern Hc_list* hc_create P((_DtCmsGetKeyProc, _DtCmsCompareProc)); -extern List_node *hc_delete P((Hc_list*, caddr_t key)); -extern List_node *hc_delete_node P((Hc_list*, List_node*)); -extern void hc_destroy P((Hc_list*, Destroy_proc)); -extern void hc_enumerate_down P((Hc_list*, _DtCmsEnumerateProc)); -extern Rb_Status hc_enumerate_up P((Hc_list*, _DtCmsEnumerateProc)); -extern Rb_Status hc_insert P((Hc_list*, caddr_t data, caddr_t key, - RepeatEvent *re, List_node **node_r)); -extern caddr_t hc_lookup P((Hc_list*, caddr_t key)); -extern caddr_t hc_lookup_largest P((Hc_list*)); -extern caddr_t hc_lookup_next_larger P((Hc_list*, caddr_t key)); -extern caddr_t hc_lookup_next_smaller P((Hc_list*, caddr_t key)); -extern caddr_t hc_lookup_smallest P((Hc_list*)); -extern int hc_size P((Hc_list*)); -extern List_node *hc_lookup_node P((Hc_list*, caddr_t key)); -extern Hc_list* hc_create P((_DtCmsGetKeyProc, _DtCmsCompareProc)); -extern Rb_Status hc_insert_node P((Hc_list *, List_node *, caddr_t key)); +extern Rb_Status hc_check_list(Hc_list*); +extern Hc_list* hc_create(_DtCmsGetKeyProc, _DtCmsCompareProc); +extern List_node *hc_delete(Hc_list*, caddr_t key); +extern List_node *hc_delete_node(Hc_list*, List_node*); +extern void hc_destroy(Hc_list*, Destroy_proc); +extern void hc_enumerate_down(Hc_list*, _DtCmsEnumerateProc); +extern Rb_Status hc_enumerate_up(Hc_list*, _DtCmsEnumerateProc); +extern Rb_Status hc_insert(Hc_list*, caddr_t data, caddr_t key, + RepeatEvent *re, List_node **node_r); +extern caddr_t hc_lookup(Hc_list*, caddr_t key); +extern caddr_t hc_lookup_largest(Hc_list*); +extern caddr_t hc_lookup_next_larger(Hc_list*, caddr_t key); +extern caddr_t hc_lookup_next_smaller(Hc_list*, caddr_t key); +extern caddr_t hc_lookup_smallest(Hc_list*); +extern int hc_size(Hc_list*); +extern List_node *hc_lookup_node(Hc_list*, caddr_t key); +extern Hc_list* hc_create(_DtCmsGetKeyProc, _DtCmsCompareProc); +extern Rb_Status hc_insert_node(Hc_list *, List_node *, caddr_t key); #endif diff --git a/cde/programs/dtcm/server/log.h b/cde/programs/dtcm/server/log.h index db7a84a29..3eef53839 100644 --- a/cde/programs/dtcm/server/log.h +++ b/cde/programs/dtcm/server/log.h @@ -31,7 +31,6 @@ #ifndef _LOG_H #define _LOG_H -#include "ansi_c.h" #include "cm.h" #include "rtable4.h" @@ -48,63 +47,63 @@ typedef enum { _DtCmsLogAdd, _DtCmsLogRemove } _DtCmsLogOps; -extern CSA_return_code _DtCmsAppendAppt4ByFN P((char*, Appt_4*, _DtCmsLogOps)); -extern CSA_return_code _DtCmsAppendAppt4ByFD P((int, Appt_4*, _DtCmsLogOps)); +extern CSA_return_code _DtCmsAppendAppt4ByFN(char*, Appt_4*, _DtCmsLogOps); +extern CSA_return_code _DtCmsAppendAppt4ByFD(int, Appt_4*, _DtCmsLogOps); -extern CSA_return_code _DtCmsAppendCalAttrsByFN P((char *file, +extern CSA_return_code _DtCmsAppendCalAttrsByFN(char *file, int size, - cms_attribute * attrs)); -extern CSA_return_code _DtCmsAppendCalAttrsByFD P((int f, + cms_attribute * attrs); +extern CSA_return_code _DtCmsAppendCalAttrsByFD(int f, int size, - cms_attribute * attrs)); + cms_attribute * attrs); -extern CSA_return_code _DtCmsAppendEntryByFN P((char *, +extern CSA_return_code _DtCmsAppendEntryByFN(char *, cms_entry *, - _DtCmsLogOps)); -extern CSA_return_code _DtCmsAppendEntryByFD P((int, + _DtCmsLogOps); +extern CSA_return_code _DtCmsAppendEntryByFD(int, cms_entry *, - _DtCmsLogOps)); + _DtCmsLogOps); -extern CSA_return_code _DtCmsAppendHTableByFN P((char *file, +extern CSA_return_code _DtCmsAppendHTableByFN(char *file, uint size, char **names, - int *types)); + int *types); -extern CSA_return_code _DtCmsAppendHTableByFD P((int fd, +extern CSA_return_code _DtCmsAppendHTableByFD(int fd, uint size, char **names, - int *types)); + int *types); -extern CSA_return_code _DtCmsAppendAccessByFN P((char*, +extern CSA_return_code _DtCmsAppendAccessByFN(char*, int, - Access_Entry_4 *)); -extern CSA_return_code _DtCmsAppendAccessByFD P((int, int, Access_Entry_4 *)); + Access_Entry_4 *); +extern CSA_return_code _DtCmsAppendAccessByFD(int, int, Access_Entry_4 *); -extern CSA_return_code _DtCmsCreateLogV1 P((char*, char *)); +extern CSA_return_code _DtCmsCreateLogV1(char*, char *); -extern CSA_return_code _DtCmsCreateLogV2 P((char *owner, char *file)); +extern CSA_return_code _DtCmsCreateLogV2(char *owner, char *file); -extern CSA_return_code _DtCmsWriteVersionString P((char *file, int version)); +extern CSA_return_code _DtCmsWriteVersionString(char *file, int version); -extern int _DtCmsSetFileMode P((char *file, +extern int _DtCmsSetFileMode(char *file, uid_t uid, gid_t gid, mode_t mode, boolean_t changeeuid, - boolean_t printerr)); + boolean_t printerr); -extern CSA_return_code _DtCmsRemoveLog P((char *calendar, char *user)); +extern CSA_return_code _DtCmsRemoveLog(char *calendar, char *user); -extern char *_DtCmsGetBakFN P((char*)); -extern char *_DtCmsGetLogFN P((char*)); -extern char *_DtCmsGetTmpFN P((char*)); -extern char *_DtCmsGetDelFN P((char*)); +extern char *_DtCmsGetBakFN(char*); +extern char *_DtCmsGetLogFN(char*); +extern char *_DtCmsGetTmpFN(char*); +extern char *_DtCmsGetDelFN(char*); -extern boolean_t _DtCmsPrintAppt4 P((caddr_t data)); -extern void _DtCmsPrintExceptions P((int len, int *exceptions)); +extern boolean_t _DtCmsPrintAppt4(caddr_t data); +extern void _DtCmsPrintExceptions(int len, int *exceptions); -extern CSA_return_code _DtCmsGetFileSize P((char *calendar, int *size)); +extern CSA_return_code _DtCmsGetFileSize(char *calendar, int *size); -extern void _DtCmsTruncateFile P((char *calendar, int size)); +extern void _DtCmsTruncateFile(char *calendar, int size); #endif diff --git a/cde/programs/dtcm/server/lookup.h b/cde/programs/dtcm/server/lookup.h index b4a1c1e6f..287d6acc4 100644 --- a/cde/programs/dtcm/server/lookup.h +++ b/cde/programs/dtcm/server/lookup.h @@ -31,21 +31,20 @@ #ifndef _LOOKUP_H #define _LOOKUP_H -#include "ansi_c.h" #include "cm.h" #include "cmscalendar.h" -extern _DtCmsComparisonResult _DtCmsCompareEntry P(( +extern _DtCmsComparisonResult _DtCmsCompareEntry( cms_key *key, - caddr_t data)); + caddr_t data); -extern _DtCmsComparisonResult _DtCmsCompareRptEntry P(( +extern _DtCmsComparisonResult _DtCmsCompareRptEntry( cms_key *key, - caddr_t data)); + caddr_t data); -extern caddr_t _DtCmsGetEntryKey P((caddr_t data)); +extern caddr_t _DtCmsGetEntryKey(caddr_t data); -extern CSA_return_code _DtCmsLookupEntries P(( +extern CSA_return_code _DtCmsLookupEntries( _DtCmsCalendar *cal, char *sender, uint access, @@ -57,9 +56,9 @@ extern CSA_return_code _DtCmsLookupEntries P(( CSA_uint32 num_attrs, cms_attribute *attrs, CSA_enum *ops, - cms_entry **entries)); + cms_entry **entries); -extern CSA_return_code _DtCmsLookupEntriesById P(( +extern CSA_return_code _DtCmsLookupEntriesById( _DtCmsCalendar *cal, char *sender, uint access, @@ -73,9 +72,9 @@ extern CSA_return_code _DtCmsLookupEntriesById P(( CSA_uint32 num_attrs, cms_attribute *attrs, CSA_enum *ops, - cms_entry **entries)); + cms_entry **entries); -extern CSA_return_code _DtCmsEnumerateSequenceById P(( +extern CSA_return_code _DtCmsEnumerateSequenceById( _DtCmsCalendar *cal, char *sender, uint access, @@ -89,9 +88,9 @@ extern CSA_return_code _DtCmsEnumerateSequenceById P(( CSA_uint32 num_attrs, cms_attribute *attrs, CSA_enum *ops, - cms_entry **entries)); + cms_entry **entries); -extern CSA_return_code _DtCmsLookupEntriesByKey P(( +extern CSA_return_code _DtCmsLookupEntriesByKey( _DtCmsCalendar *cal, char *sender, uint access, @@ -99,10 +98,10 @@ extern CSA_return_code _DtCmsLookupEntriesByKey P(( cms_key *keys, uint num_names, cms_attr_name *names, - cms_get_entry_attr_res_item **res)); + cms_get_entry_attr_res_item **res); -extern CSA_return_code _DtCmsGetEntryAttrByKey P(( +extern CSA_return_code _DtCmsGetEntryAttrByKey( _DtCmsCalendar *cal, char *sender, uint access, @@ -110,6 +109,6 @@ extern CSA_return_code _DtCmsGetEntryAttrByKey P(( uint num_names, cms_attr_name *names, cms_entry **entry_r, - cms_get_entry_attr_res_item **res_r)); + cms_get_entry_attr_res_item **res_r); #endif diff --git a/cde/programs/dtcm/server/reminder.h b/cde/programs/dtcm/server/reminder.h index a6861a489..630fd4286 100644 --- a/cde/programs/dtcm/server/reminder.h +++ b/cde/programs/dtcm/server/reminder.h @@ -31,7 +31,6 @@ #ifndef _REMINDER_H #define _REMINDER_H -#include "ansi_c.h" #include "EUSCompat.h" #include "cm.h" #include "rtable4.h" @@ -71,50 +70,50 @@ typedef struct reminder_q { struct reminder_q *next; } Rm_que; -extern void _DtCmsAddReminderV4 P((Rm_que **qhead, Rm_que *p_reminder)); +extern void _DtCmsAddReminderV4(Rm_que **qhead, Rm_que *p_reminder); -extern Rm_que *_DtCmsRemoveReminderV4 P(( +extern Rm_que *_DtCmsRemoveReminderV4( Rm_que **qhead, Rm_que *p_prev, - Rm_que *p_curr)); + Rm_que *p_curr); -extern Rm_que *build_reminder P(( +extern Rm_que *build_reminder( time_t current_time, Appt_4 *p_appt, Attr_4 p_attr, time_t start_tick, - u_int start_ord)); + u_int start_ord); -extern Reminder_4 *_DtCmsGetReminderInfoV4 P((Rm_que *original)); +extern Reminder_4 *_DtCmsGetReminderInfoV4(Rm_que *original); -extern void _DtCmsPrintReminderListV4 P((Rm_que *qhead)); +extern void _DtCmsPrintReminderListV4(Rm_que *qhead); -extern void _DtCmsObsoleteReminderV4 P(( +extern void _DtCmsObsoleteReminderV4( Rm_que **qhead, Appt_4 *p_appt, int ord, - boolean_t delforward)); + boolean_t delforward); -extern void _DtCmsAddReminders4Entry P(( +extern void _DtCmsAddReminders4Entry( _DtCmsRemQueue **qhead, cms_entry *entry, - List_node *lnode)); + List_node *lnode); -extern void _DtCmsObsoleteReminder4Entry P(( +extern void _DtCmsObsoleteReminder4Entry( _DtCmsRemQueue *qhead, cms_entry *entry, List_node *lnode, time_t starttime, - boolean_t delfwd)); + boolean_t delfwd); -extern CSA_return_code _DtCmsLookupReminder P(( +extern CSA_return_code _DtCmsLookupReminder( _DtCmsRemQueue *remq, time_t tick, uint num_names, cms_attr_name *names, - cms_reminder_ref **rems)); + cms_reminder_ref **rems); -extern void _DtCmsFreeReminderRef P((cms_reminder_ref *rems)); +extern void _DtCmsFreeReminderRef(cms_reminder_ref *rems); extern void _DtCmsUpdateReminders(_DtCmsRemQueue *remq); diff --git a/cde/programs/dtcm/server/repeat.c b/cde/programs/dtcm/server/repeat.c index d86eeb936..ac3b15cae 100644 --- a/cde/programs/dtcm/server/repeat.c +++ b/cde/programs/dtcm/server/repeat.c @@ -814,7 +814,7 @@ next_ndays(time_t t, int n) tm.tm_min = 0; tm.tm_hour = 0; -#ifdef SVR4 +#if defined(SVR4) || defined(__linux__) next = mktime(&tm); #else next = timelocal(&tm); @@ -1004,7 +1004,7 @@ prev_nmonth(time_t t, int n) tm.tm_mon += 12; tm.tm_year--; } -#ifdef SVR4 +#if defined(SVR4) || defined(__linux__) tm.tm_isdst = -1; return(mktime(&tm)); #else @@ -1088,7 +1088,7 @@ nextnyear(time_t t, int n) tm = *_XLocaltime(&t, localtime_buf); tm.tm_year += n; -#ifdef SVR4 +#if defined(SVR4) || defined(__linux__) return(mktime(&tm)); #else return(timelocal(&tm)); @@ -1110,7 +1110,7 @@ prevnyear(time_t t, int n) tm = *_XLocaltime(&t, localtime_buf); tm.tm_year -= n; -#ifdef SVR4 +#if defined(SVR4) || defined(__linux__) return(mktime(&tm)); #else return(timelocal(&tm)); @@ -1139,7 +1139,7 @@ prevmonth_exactday(time_t t) prev = previousmonth(previousmonth(t)); /* hop over the month */ tm = *_XLocaltime(&prev, localtime_buf); tm.tm_mday = day; -#ifdef SVR4 +#if defined(SVR4) || defined(__linux__) tm.tm_isdst = -1; prev =(mktime(&tm)) + sdelta; #else @@ -1172,7 +1172,7 @@ nextmonth_exactday(time_t t) next = next_nmonth(t, 2); /* hop over the month */ tm = *_XLocaltime(&next, localtime_buf); tm.tm_mday = day; -#ifdef SVR4 +#if defined(SVR4) || defined(__linux__) tm.tm_isdst = -1; next = mktime(&tm) + sdelta; #else @@ -1201,7 +1201,7 @@ previousmonth(time_t t) tm.tm_mday=1; tm.tm_mon--; } -#ifdef SVR4 +#if defined(SVR4) || defined(__linux__) tm.tm_isdst = -1; return(mktime(&tm)); #else @@ -1513,7 +1513,7 @@ nextnmth_exactday(time_t t, int n) t = next; } -#ifdef SVR4 +#if defined(SVR4) || defined(__linux__) tm2.tm_isdst = -1; next = mktime(&tm2); #else @@ -1549,7 +1549,7 @@ prevnmth_exactday(time_t t, int n) t = prev; } -#ifdef SVR4 +#if defined(SVR4) || defined(__linux__) tm2.tm_isdst = -1; prev = mktime(&tm2); #else diff --git a/cde/programs/dtcm/server/repeat.h b/cde/programs/dtcm/server/repeat.h index 6dbcdd8ef..ce50a197f 100644 --- a/cde/programs/dtcm/server/repeat.h +++ b/cde/programs/dtcm/server/repeat.h @@ -32,7 +32,6 @@ #define _REPEAT_H #include -#include "ansi_c.h" #include "cm.h" #include "rtable4.h" #include "rerule.h" @@ -41,45 +40,45 @@ typedef time_t Tick; extern int monthdays[]; -extern void init_time P(()); +extern void init_time(void); -extern time_t _DtCms_closest_tick_v4 P((time_t target, +extern time_t _DtCms_closest_tick_v4(time_t target, time_t ftick, Period_4 period, - int *ordinal)); + int *ordinal); -extern time_t _DtCms_last_tick_v4 P((time_t ftick, +extern time_t _DtCms_last_tick_v4(time_t ftick, Period_4 period, - int ntimes)); + int ntimes); -extern time_t _DtCms_next_tick_v4 P((time_t tick, Period_4 period)); +extern time_t _DtCms_next_tick_v4(time_t tick, Period_4 period); -extern time_t _DtCms_prev_tick_v4 P((time_t tick, Period_4 period)); +extern time_t _DtCms_prev_tick_v4(time_t tick, Period_4 period); -extern time_t _DtCms_first_tick_v4 P((time_t t, Period_4 period, int ordinal)); +extern time_t _DtCms_first_tick_v4(time_t t, Period_4 period, int ordinal); -extern void _DtCms_adjust_appt_startdate P((Appt_4 *appt)); +extern void _DtCms_adjust_appt_startdate(Appt_4 *appt); -extern time_t next_nmins P((time_t t, int m)); +extern time_t next_nmins(time_t t, int m); -extern time_t next_ndays P((time_t t, int n)); +extern time_t next_ndays(time_t t, int n); -extern int _DtCms_marked_4_cancellation P((Appt_4 *a, int i)); +extern int _DtCms_marked_4_cancellation(Appt_4 *a, int i); -extern int _DtCms_get_new_ntimes_v4 P((Period_4 period, +extern int _DtCms_get_new_ntimes_v4(Period_4 period, time_t tick, - int ninstance)); + int ninstance); -extern int _DtCms_get_ninstance_v4 P((Appt_4 *appt)); +extern int _DtCms_get_ninstance_v4(Appt_4 *appt); -extern int _DtCms_in_repeater P((Id_4 *key, +extern int _DtCms_in_repeater(Id_4 *key, Appt_4 *p_appt, - boolean_t dont_care_cancel)); + boolean_t dont_care_cancel); -extern int monthlength P((Tick)); -extern int leapyr P((int)); -extern int fdom P((Tick)); -extern int ldom P((Tick)); +extern int monthlength(Tick); +extern int leapyr(int); +extern int fdom(Tick); +extern int ldom(Tick); /* * returns the tick of the beginning of the day @@ -94,6 +93,6 @@ extern time_t _DtCmsTimeOfDay(time_t t); /* * routines to deal with recurrence rule and exception dates */ -extern boolean_t _DtCmsInExceptionList P((cms_entry *eptr, time_t tick)); +extern boolean_t _DtCmsInExceptionList(cms_entry *eptr, time_t tick); #endif diff --git a/cde/programs/dtcm/server/rpcextras.h b/cde/programs/dtcm/server/rpcextras.h index d0a2c773f..8cc426cc2 100644 --- a/cde/programs/dtcm/server/rpcextras.h +++ b/cde/programs/dtcm/server/rpcextras.h @@ -31,8 +31,6 @@ #ifndef _RPCEXTRAS_H #define _RPCEXTRAS_H -#include "ansi_c.h" - #define RPCGEN_ACTION(routine) routine struct rpcgen_table { @@ -58,7 +56,7 @@ typedef struct prog_object { typedef program_object *program_handle; -extern program_handle newph P(()); -extern program_handle getph P(()); +extern program_handle newph(void); +extern program_handle getph(void); #endif diff --git a/cde/programs/dtcm/server/tree.h b/cde/programs/dtcm/server/tree.h index 7fa1ec0b0..3c439d243 100644 --- a/cde/programs/dtcm/server/tree.h +++ b/cde/programs/dtcm/server/tree.h @@ -31,7 +31,6 @@ #ifndef _TREE_H #define _TREE_H -#include "ansi_c.h" #include "data.h" /* @@ -52,32 +51,32 @@ typedef struct { caddr_t private; /* for internal tool state */ } Rb_tree; -extern Rb_tree* rb_create P((_DtCmsGetKeyProc, _DtCmsCompareProc)); +extern Rb_tree* rb_create(_DtCmsGetKeyProc, _DtCmsCompareProc); -extern void rb_destroy P((Rb_tree*, _DtCmsEnumerateProc)); +extern void rb_destroy(Rb_tree*, _DtCmsEnumerateProc); -extern int rb_size P((Rb_tree*t)); +extern int rb_size(Rb_tree*t); -extern Rb_Status rb_insert P((Rb_tree*, caddr_t data, caddr_t key)); +extern Rb_Status rb_insert(Rb_tree*, caddr_t data, caddr_t key); -extern Rb_Status rb_insert_node P((Rb_tree*, Tree_node*, caddr_t key)); +extern Rb_Status rb_insert_node(Rb_tree*, Tree_node*, caddr_t key); -extern Tree_node * rb_delete P((Rb_tree*, caddr_t key)); +extern Tree_node * rb_delete(Rb_tree*, caddr_t key); -extern caddr_t rb_lookup P((Rb_tree*, caddr_t key)); +extern caddr_t rb_lookup(Rb_tree*, caddr_t key); -extern caddr_t rb_lookup_next_larger P((Rb_tree*, caddr_t key)); +extern caddr_t rb_lookup_next_larger(Rb_tree*, caddr_t key); -extern caddr_t rb_lookup_next_smaller P((Rb_tree*, caddr_t key)); +extern caddr_t rb_lookup_next_smaller(Rb_tree*, caddr_t key); -extern caddr_t rb_lookup_smallest P((Rb_tree*)); +extern caddr_t rb_lookup_smallest(Rb_tree*); -extern caddr_t rb_lookup_largest P((Rb_tree*)); +extern caddr_t rb_lookup_largest(Rb_tree*); -extern Rb_Status rb_enumerate_up P((Rb_tree*, _DtCmsEnumerateProc)); +extern Rb_Status rb_enumerate_up(Rb_tree*, _DtCmsEnumerateProc); -extern void rb_enumerate_down P((Rb_tree*, _DtCmsEnumerateProc)); +extern void rb_enumerate_down(Rb_tree*, _DtCmsEnumerateProc); -extern Rb_Status rb_check_tree P((Rb_tree *)); +extern Rb_Status rb_check_tree(Rb_tree *); #endif diff --git a/cde/programs/dtcm/server/update.h b/cde/programs/dtcm/server/update.h index b68967f1c..587b99d7b 100644 --- a/cde/programs/dtcm/server/update.h +++ b/cde/programs/dtcm/server/update.h @@ -31,16 +31,15 @@ #ifndef _UPDATE_H #define _UPDATE_H -#include "ansi_c.h" #include "cm.h" #include "cmscalendar.h" -extern CSA_return_code _DtCmsUpdateCalAttrs P(( +extern CSA_return_code _DtCmsUpdateCalAttrs( _DtCmsCalendar *cal, uint num_attrs, - cms_attribute *attrs)); + cms_attribute *attrs); -extern CSA_return_code _DtCmsUpdateEntry P(( +extern CSA_return_code _DtCmsUpdateEntry( _DtCmsCalendar *cal, char *sender, uint access, @@ -48,9 +47,9 @@ extern CSA_return_code _DtCmsUpdateEntry P(( uint num_attrs, cms_attribute *attrs, cms_entry **oldentry, - cms_entry **newentry)); + cms_entry **newentry); -extern CSA_return_code _DtCmsUpdateInstances P(( +extern CSA_return_code _DtCmsUpdateInstances( _DtCmsCalendar *cal, char *sender, uint access, @@ -59,6 +58,6 @@ extern CSA_return_code _DtCmsUpdateInstances P(( uint num_attrs, cms_attribute *attrs, cms_entry **oldentry, - cms_entry **newentry)); + cms_entry **newentry); #endif diff --git a/cde/programs/dtcm/server/utility.h b/cde/programs/dtcm/server/utility.h index 2daa3a55a..7a6ec47f5 100644 --- a/cde/programs/dtcm/server/utility.h +++ b/cde/programs/dtcm/server/utility.h @@ -31,14 +31,12 @@ #ifndef _UTILITY_H #define _UTILITY_H -#include "ansi_c.h" +extern char *_DtCmsTarget2Name(char *target); -extern char *_DtCmsTarget2Name P((char *target)); +extern char *_DtCmsTarget2Location(char *target); -extern char *_DtCmsTarget2Location P((char *target)); +extern char *_DtCmsTarget2Host(char *target); -extern char *_DtCmsTarget2Host P((char *target)); - -extern char *_DtCmsTarget2Domain P((char *target)); +extern char *_DtCmsTarget2Domain(char *target); #endif diff --git a/cde/programs/dtcm/server/v4ops.h b/cde/programs/dtcm/server/v4ops.h index 91dca8c1c..322982b52 100644 --- a/cde/programs/dtcm/server/v4ops.h +++ b/cde/programs/dtcm/server/v4ops.h @@ -31,7 +31,6 @@ #ifndef _V4OPS_H #define _V4OPS_H -#include "ansi_c.h" #include "rtable4.h" #include "cm.h" #include "log.h" @@ -45,64 +44,64 @@ typedef struct __DtCmsEntryId { struct __DtCmsEntryId *next; } _DtCmsEntryId; -extern CSA_return_code _DtCmsInsertAppt P((_DtCmsCalendar *cal, Appt_4 *appt4)); +extern CSA_return_code _DtCmsInsertAppt(_DtCmsCalendar *cal, Appt_4 *appt4); -extern CSA_return_code _DtCmsDeleteAppt P(( +extern CSA_return_code _DtCmsDeleteAppt( _DtCmsCalendar *cal, char *user, uint access, Id_4 *p_key, - Appt_4 **appt_r)); + Appt_4 **appt_r); -extern CSA_return_code _DtCmsDeleteApptAndLog P(( +extern CSA_return_code _DtCmsDeleteApptAndLog( _DtCmsCalendar *cal, char *user, uint access, Id_4 *key, - Appt_4 **oldappt)); + Appt_4 **oldappt); -extern CSA_return_code _DtCmsDeleteApptInstancesAndLog P(( +extern CSA_return_code _DtCmsDeleteApptInstancesAndLog( _DtCmsCalendar *cal, char *source, uint access, Id_4 *key, Options_4 option, int *remain, - Appt_4 **oldappt)); + Appt_4 **oldappt); -extern CSA_return_code _DtCmsChangeAll P(( +extern CSA_return_code _DtCmsChangeAll( _DtCmsCalendar *cal, char *source, uint access, Id_4 *p_key, Appt_4 *newa, - Appt_4 **oldappt)); + Appt_4 **oldappt); -extern CSA_return_code _DtCmsChangeSome P(( +extern CSA_return_code _DtCmsChangeSome( _DtCmsCalendar *cal, char *source, uint access, Id_4 *p_key, Appt_4 *p_appt, Options_4 option, - Appt_4 **oldappt)); + Appt_4 **oldappt); -extern CSA_return_code _DtCmsInsertApptAndLog P(( +extern CSA_return_code _DtCmsInsertApptAndLog( _DtCmsCalendar *cal, - Appt_4 *appt)); + Appt_4 *appt); -extern _DtCmsComparisonResult _DtCmsCompareAppt P((Id_4 *key, caddr_t data)); +extern _DtCmsComparisonResult _DtCmsCompareAppt(Id_4 *key, caddr_t data); -extern _DtCmsComparisonResult _DtCmsCompareRptAppt P((Id_4 *key, caddr_t data)); +extern _DtCmsComparisonResult _DtCmsCompareRptAppt(Id_4 *key, caddr_t data); -extern caddr_t _DtCmsGetApptKey P((caddr_t data)); +extern caddr_t _DtCmsGetApptKey(caddr_t data); -extern CSA_return_code v4_transact_log P(( +extern CSA_return_code v4_transact_log( char *calendar, Appt_4 *a, - _DtCmsLogOps op)); + _DtCmsLogOps op); -extern CSA_return_code _DtCmsLookupRangeV4 P(( +extern CSA_return_code _DtCmsLookupRangeV4( _DtCmsCalendar *cal, char *user, uint access, @@ -115,9 +114,9 @@ extern CSA_return_code _DtCmsLookupRangeV4 P(( cms_attribute *attrs, CSA_enum *ops, Appt_4 **appt_r, - Abb_Appt_4 **abbr_r)); + Abb_Appt_4 **abbr_r); -extern CSA_return_code _DtCmsLookupKeyrangeV4 P(( +extern CSA_return_code _DtCmsLookupKeyrangeV4( _DtCmsCalendar *cal, char *user, uint access, @@ -133,48 +132,48 @@ extern CSA_return_code _DtCmsLookupKeyrangeV4 P(( cms_attribute *attrs, CSA_enum *ops, Appt_4 **appt_r, - Abb_Appt_4 **abbr_r)); + Abb_Appt_4 **abbr_r); -extern CSA_return_code _AddToLinkedAppts P(( +extern CSA_return_code _AddToLinkedAppts( Appt_4 *p_appt, char *user, uint access, - caddr_t *ilp)); + caddr_t *ilp); -extern CSA_return_code _AddToLinkedAbbrAppts P(( +extern CSA_return_code _AddToLinkedAbbrAppts( Appt_4 *p_appt, char *user, uint access, - caddr_t *ilp)); + caddr_t *ilp); -extern Privacy_Level_4 _GetAccessLevel P(( +extern Privacy_Level_4 _GetAccessLevel( char *user, uint access, - Appt_4 *p_appt)); + Appt_4 *p_appt); -extern Appt_4 * _AddApptInOrder P((Appt_4 * head, Appt_4 * aptr)); +extern Appt_4 * _AddApptInOrder(Appt_4 * head, Appt_4 * aptr); -extern Abb_Appt_4 * _AddAbbApptInOrder P((Abb_Appt_4 *head, Abb_Appt_4 *aptr)); +extern Abb_Appt_4 * _AddAbbApptInOrder(Abb_Appt_4 *head, Abb_Appt_4 *aptr); -extern CSA_return_code _DtCmsSetV4AccessListAndLog P(( +extern CSA_return_code _DtCmsSetV4AccessListAndLog( _DtCmsCalendar *cal, - Access_Entry_4 *alist)); + Access_Entry_4 *alist); -extern CSA_return_code _DtCmsGetV4Reminders P(( +extern CSA_return_code _DtCmsGetV4Reminders( _DtCmsCalendar *cal, long tick, Reminder_4 **rem_r, - _DtCmsEntryId **ids_r)); + _DtCmsEntryId **ids_r); -extern void _DtCmsFreeEntryIds P((_DtCmsEntryId *ids)); +extern void _DtCmsFreeEntryIds(_DtCmsEntryId *ids); -extern CSA_return_code _DtCmsTruncateElist P(( +extern CSA_return_code _DtCmsTruncateElist( Appt_4 *parent_p, int remain, - Except_4 **excpt)); + Except_4 **excpt); -extern CSA_return_code _DtCmsSetV4AccessListInCal P(( +extern CSA_return_code _DtCmsSetV4AccessListInCal( _DtCmsCalendar *cal, - Access_Entry_4 *e)); + Access_Entry_4 *e); #endif diff --git a/cde/programs/dtcm/server/v5ops.h b/cde/programs/dtcm/server/v5ops.h index 11307e1eb..2a2332eb5 100644 --- a/cde/programs/dtcm/server/v5ops.h +++ b/cde/programs/dtcm/server/v5ops.h @@ -31,42 +31,41 @@ #ifndef _V5OPS_H #define _V5OPS_H -#include "ansi_c.h" #include "cm.h" #include "cmscalendar.h" #include "rerule.h" #include "repeat.h" -extern _DtCmsComparisonResult _DtCmsCompareEntry P(( +extern _DtCmsComparisonResult _DtCmsCompareEntry( cms_key *key, - caddr_t data)); + caddr_t data); -extern _DtCmsComparisonResult _DtCmsCompareRptEntry P(( +extern _DtCmsComparisonResult _DtCmsCompareRptEntry( cms_key *key, - caddr_t data)); + caddr_t data); -extern caddr_t _DtCmsGetEntryKey P((caddr_t data)); +extern caddr_t _DtCmsGetEntryKey(caddr_t data); -extern CSA_return_code _DtCmsSetLastUpdate P((cms_entry *entry)); +extern CSA_return_code _DtCmsSetLastUpdate(cms_entry *entry); -extern void _DtCmsConvertToOnetime P((cms_entry *entry, RepeatEvent *re)); +extern void _DtCmsConvertToOnetime(cms_entry *entry, RepeatEvent *re); -extern int _DtCmsGetDuration P((cms_entry *eptr)); +extern int _DtCmsGetDuration(cms_entry *eptr); -extern CSA_return_code _DtCmsCheckInitialAttributes P((cms_entry *entry)); +extern CSA_return_code _DtCmsCheckInitialAttributes(cms_entry *entry); -extern CSA_return_code _DtCmsCheckStartEndTime P((cms_entry *entry)); +extern CSA_return_code _DtCmsCheckStartEndTime(cms_entry *entry); -extern void _DtCmsCleanupExceptionDates P((cms_entry *newe, long ftick)); +extern void _DtCmsCleanupExceptionDates(cms_entry *newe, long ftick); -extern int _DtCmsNumberExceptionDates P((cms_entry *entry)); +extern int _DtCmsNumberExceptionDates(cms_entry *entry); -extern CSA_return_code _DtCmsUpdateDurationInRule P(( +extern CSA_return_code _DtCmsUpdateDurationInRule( cms_entry *entry, - uint remain)); + uint remain); -extern CSA_return_code _DtCmsAddEndDateToRule P(( +extern CSA_return_code _DtCmsAddEndDateToRule( cms_attribute *attr, RepeatEvent *re, - long time)); + long time); #endif diff --git a/cde/programs/dtcreate/AddFiletype.c b/cde/programs/dtcreate/AddFiletype.c index 50b5025e2..ef0501aa8 100644 --- a/cde/programs/dtcreate/AddFiletype.c +++ b/cde/programs/dtcreate/AddFiletype.c @@ -71,7 +71,7 @@ Widget Licon2; extern int do_which; enum icon_size_range filetype_icon_size = None_Selected; */ -enum icon_size_range filetype_icon_size; +enum icon_size_range filetype_icon_size = None_Selected; /******************************************************************************* diff --git a/cde/programs/dtcreate/dtcreate.h b/cde/programs/dtcreate/dtcreate.h index 45f10251c..f4f65f0d3 100644 --- a/cde/programs/dtcreate/dtcreate.h +++ b/cde/programs/dtcreate/dtcreate.h @@ -36,14 +36,6 @@ #include #include -#ifndef STORAGECLASS -#ifdef NOEXTERN -#define STORAGECLASS -#else -#define STORAGECLASS extern -#endif -#endif - /***************************************************************************/ /* */ /* Constant Declarations */ @@ -206,181 +198,145 @@ typedef struct { /* */ /***************************************************************************/ - /*******************************************************************/ - /* Global variables that are not being initialized. */ - /*******************************************************************/ +/*******************************************************************/ +/* Global variables that are not being initialized. */ +/******************************************************************/ -STORAGECLASS ActionData AD; -STORAGECLASS ActionData *pMyCopyAD; -STORAGECLASS char *pszFileToEdit; -STORAGECLASS Cursor watch_cursor; -STORAGECLASS Widget widEditSource; -STORAGECLASS Boolean bIconEditorDisplayed; -STORAGECLASS nl_catd nlmsg_fd; -STORAGECLASS char *pszExecName; -STORAGECLASS Widget widSelectedIcon; -STORAGECLASS Boolean bLowRes; -STORAGECLASS IconData *IconDataList[ICON_NUMBER]; +extern ActionData AD; +extern ActionData *pMyCopyAD; +extern char *pszFileToEdit; +extern Cursor watch_cursor; +extern Widget widEditSource; +extern Boolean bIconEditorDisplayed; +extern nl_catd nlmsg_fd; +extern char *pszExecName; +extern Widget widSelectedIcon; +extern Boolean bLowRes; +extern IconData *IconDataList[ICON_NUMBER]; - /**********************************************************/ - /* CreateActionAppShell globals. */ - /**********************************************************/ +/**********************************************************/ +/* CreateActionAppShell globals. */ +/**********************************************************/ -STORAGECLASS Widget CreateActionAppShell; -STORAGECLASS Widget ExpertOption; -STORAGECLASS Widget ColorMonoOption; -STORAGECLASS Widget CA_ActionNameTextField; -STORAGECLASS Widget CA_MED_IconGadget; -STORAGECLASS Widget CA_SML_IconGadget; -STORAGECLASS Widget CA_TINY_IconGadget; -STORAGECLASS Widget CA_LRG_IconGadget; -STORAGECLASS Widget CA_DblClkText; -STORAGECLASS Widget XprtOptionForm; -STORAGECLASS Widget CA_XprtActionOpenText; -STORAGECLASS Widget CA_FiletypesList; -STORAGECLASS Widget CA_WindowTypeArea; -STORAGECLASS Widget CA_WindowType; -STORAGECLASS Widget CA_Expand; +extern Widget CreateActionAppShell; +extern Widget ExpertOption; +extern Widget ColorMonoOption; +extern Widget CA_ActionNameTextField; +extern Widget CA_MED_IconGadget; +extern Widget CA_SML_IconGadget; +extern Widget CA_TINY_IconGadget; +extern Widget CA_LRG_IconGadget; +extern Widget CA_DblClkText; +extern Widget XprtOptionForm; +extern Widget CA_XprtActionOpenText; +extern Widget CA_FiletypesList; +extern Widget CA_WindowTypeArea; +extern Widget CA_WindowType; +extern Widget CA_Expand; #if 0 -STORAGECLASS Widget CA_WindowType_OptionMenuShell; -STORAGECLASS Widget CA_WindowType_Pane; +extern Widget CA_WindowType_OptionMenuShell; +extern Widget CA_WindowType_Pane; #endif -STORAGECLASS Widget CA_WinTypeX; -STORAGECLASS Widget CA_WinTypeAutoClose; -STORAGECLASS Widget CA_WinTypeManualClose; -STORAGECLASS Widget CA_WinTypeNoOutput; -STORAGECLASS Widget CA_HelpTextWindow; -STORAGECLASS Widget CA_HelpText; -STORAGECLASS Widget CA_AllFiletypesToggle; -STORAGECLASS Widget CA_FiletypesInListToggle; +extern Widget CA_WinTypeX; +extern Widget CA_WinTypeAutoClose; +extern Widget CA_WinTypeManualClose; +extern Widget CA_WinTypeNoOutput; +extern Widget CA_HelpTextWindow; +extern Widget CA_HelpText; +extern Widget CA_AllFiletypesToggle; +extern Widget CA_FiletypesInListToggle; - /**********************************************************/ - /* AddFiletype globals. */ - /**********************************************************/ +/**********************************************************/ +/* AddFiletype globals. */ +/**********************************************************/ -STORAGECLASS Widget AddFiletype; -STORAGECLASS Widget AF_FileTypeNameTextField; -STORAGECLASS Widget AF_IdCharacteristicsText; -STORAGECLASS Widget AF_IdCharacteristicsEdit; -STORAGECLASS Widget AF_FiletypePrintCmdTextField; -STORAGECLASS Widget AF_OpenCmdText; -STORAGECLASS Widget AF_FiletypeHelpText; -STORAGECLASS Widget AF_MED_IconGadget; -STORAGECLASS Widget AF_TINY_IconGadget; +extern Widget AddFiletype; +extern Widget AF_FileTypeNameTextField; +extern Widget AF_IdCharacteristicsText; +extern Widget AF_IdCharacteristicsEdit; +extern Widget AF_FiletypePrintCmdTextField; +extern Widget AF_OpenCmdText; +extern Widget AF_FiletypeHelpText; +extern Widget AF_MED_IconGadget; +extern Widget AF_TINY_IconGadget; - /**********************************************************/ - /* FileCharacteristics globals */ - /**********************************************************/ +/**********************************************************/ +/* FileCharacteristics globals */ +/**********************************************************/ -STORAGECLASS Widget FileCharacteristics; -STORAGECLASS Widget FC_DirectoryToggle; -STORAGECLASS Widget FC_FileToggle; -STORAGECLASS Widget FC_AndLabel2; -STORAGECLASS Widget FC_ContentsPatternText; -STORAGECLASS Widget FC_StringToggle; -STORAGECLASS Widget FC_ByteToggle; -STORAGECLASS Widget FC_ShortToggle; -STORAGECLASS Widget FC_LongToggle; -STORAGECLASS Widget FC_StartByteTextField; +extern Widget FileCharacteristics; +extern Widget FC_DirectoryToggle; +extern Widget FC_FileToggle; +extern Widget FC_AndLabel2; +extern Widget FC_ContentsPatternText; +extern Widget FC_StringToggle; +extern Widget FC_ByteToggle; +extern Widget FC_ShortToggle; +extern Widget FC_LongToggle; +extern Widget FC_StartByteTextField; /* -STORAGECLASS Widget FC_EndByteTextField; +extern Widget FC_EndByteTextField; */ -STORAGECLASS Widget FC_NameOrPathText; -STORAGECLASS Widget FC_AndLabel1; -STORAGECLASS Widget FC_PermissionForm; -STORAGECLASS Widget FC_ReadToggle; -STORAGECLASS Widget FC_WriteToggle; -STORAGECLASS Widget FC_ExecuteToggle; +extern Widget FC_NameOrPathText; +extern Widget FC_AndLabel1; +extern Widget FC_PermissionForm; +extern Widget FC_ReadToggle; +extern Widget FC_WriteToggle; +extern Widget FC_ExecuteToggle; -STORAGECLASS Widget FC_NamePatternLabel; -STORAGECLASS Widget FC_PermissionLabel; -STORAGECLASS Widget FC_PermissionToggle; -STORAGECLASS Widget FC_ContentsLabel; -STORAGECLASS Widget FC_ContentsBox; -STORAGECLASS Widget FC_TypeRowColumn; -STORAGECLASS Widget FC_StartByteLabel; -STORAGECLASS Widget FC_TypeLabel; -STORAGECLASS Widget FC_ContentsPatternLabel; +extern Widget FC_NamePatternLabel; +extern Widget FC_PermissionLabel; +extern Widget FC_PermissionToggle; +extern Widget FC_ContentsLabel; +extern Widget FC_ContentsBox; +extern Widget FC_TypeRowColumn; +extern Widget FC_StartByteLabel; +extern Widget FC_TypeLabel; +extern Widget FC_ContentsPatternLabel; /* -STORAGECLASS Widget FC_EndByteLabel; +extern Widget FC_EndByteLabel; */ -STORAGECLASS Widget FC_ContentsToggle; -STORAGECLASS Widget FC_NameOrPathToggle; +extern Widget FC_ContentsToggle; +extern Widget FC_NameOrPathToggle; - /**********************************************************/ - /* icon_selection_dialog globals */ - /**********************************************************/ -STORAGECLASS Widget ISD_SelectedIconTextField; +/**********************************************************/ +/* icon_selection_dialog globals */ +/**********************************************************/ +extern Widget ISD_SelectedIconTextField; - /**********************************************************/ - /* Other dialog globals */ - /**********************************************************/ -STORAGECLASS SessionData sessiondata; +/**********************************************************/ +/* Other dialog globals */ +/**********************************************************/ +extern SessionData sessiondata; - /*******************************************************************/ - /* Global variables that are being initialized. */ - /*******************************************************************/ +/*******************************************************************/ +/* Global variables that are being initialized. */ +/*******************************************************************/ -#ifdef NOEXTERN +extern enum icon_size_range filetype_icon_size; +extern int pidIconEditor; +extern Boolean bShowPixmaps; +extern Widget IconSelector; +extern Boolean DbInitDone; +extern Widget OpenFile; +extern Widget Confirmed; +extern Widget QuestionDialog; +extern Widget ErrorDialog; +extern Widget last_action_pushed; +extern Widget last_filetype_pushed; -STORAGECLASS enum icon_size_range action_icon_size = None_Selected; -STORAGECLASS enum icon_size_range filetype_icon_size = None_Selected; -STORAGECLASS int pidIconEditor = 0; -STORAGECLASS Boolean bShowPixmaps = TRUE; -STORAGECLASS Widget IconSelector = (Widget)NULL; -STORAGECLASS Boolean DbInitDone = FALSE; -STORAGECLASS Widget OpenFile = (Widget)NULL; -STORAGECLASS Widget Confirmed = (Widget)NULL; -STORAGECLASS Widget QuestionDialog = (Widget)NULL; -STORAGECLASS Widget ErrorDialog = (Widget)NULL; -STORAGECLASS Widget last_action_pushed = (Widget)NULL; -STORAGECLASS Widget last_filetype_pushed = (Widget)NULL; +extern const char *ca_icon_default; +extern const char *ca_full_icon_default; +extern const char *ca_lrg_icon_default; +extern const char *ca_med_icon_default; +extern const char *ca_sml_icon_default; +extern const char *ca_tiny_icon_default; - -STORAGECLASS const char *ca_icon_default = "Dtactn"; -STORAGECLASS const char *ca_full_icon_default = "/usr/dt/appconfig/icons/C/Dtactn"; -STORAGECLASS const char *ca_lrg_icon_default = "/usr/dt/appconfig/icons/C/Dtactn.l"; -STORAGECLASS const char *ca_med_icon_default = "/usr/dt/appconfig/icons/C/Dtactn.m"; -STORAGECLASS const char *ca_sml_icon_default = "/usr/dt/appconfig/icons/C/Dtactn.s"; -STORAGECLASS const char *ca_tiny_icon_default = "/usr/dt/appconfig/icons/C/Dtactn.t"; - -STORAGECLASS const char *af_icon_default = "Dtdata"; -STORAGECLASS const char *af_full_icon_default = "/usr/dt/appconfig/icons/C/Dtdata"; -STORAGECLASS const char *af_lrg_icon_default = "/usr/dt/appconfig/icons/C/Dtdata.l"; -STORAGECLASS const char *af_med_icon_default = "/usr/dt/appconfig/icons/C/Dtdata.m"; -STORAGECLASS const char *af_sml_icon_default = "/usr/dt/appconfig/icons/C/Dtdata.s"; -STORAGECLASS const char *af_tiny_icon_default = "/usr/dt/appconfig/icons/C/Dtdata.t"; - -#else /* NOEXTERN */ - -STORAGECLASS enum icon_size_range action_icon_size; -STORAGECLASS enum icon_size_range filetype_icon_size; -STORAGECLASS int pidIconEditor; -STORAGECLASS Boolean bShowPixmaps; -STORAGECLASS Widget IconSelector; -STORAGECLASS Boolean DbInitDone; -STORAGECLASS Widget OpenFile; -STORAGECLASS Widget Confirmed; -STORAGECLASS Widget QuestionDialog; -STORAGECLASS Widget ErrorDialog; -STORAGECLASS Widget last_action_pushed; -STORAGECLASS Widget last_filetype_pushed; - - -STORAGECLASS const char *ca_icon_default; -STORAGECLASS const char *ca_full_icon_default; -STORAGECLASS const char *ca_lrg_icon_default; -STORAGECLASS const char *ca_med_icon_default; -STORAGECLASS const char *ca_sml_icon_default; -STORAGECLASS const char *ca_tiny_icon_default; - -STORAGECLASS const char *af_icon_default; -STORAGECLASS const char *af_full_icon_default; -STORAGECLASS const char *af_lrg_icon_default; -STORAGECLASS const char *af_med_icon_default; -STORAGECLASS const char *af_sml_icon_default; -STORAGECLASS const char *af_tiny_icon_default; - -#endif /* NOEXTERN */ +extern const char *af_icon_default; +extern const char *af_full_icon_default; +extern const char *af_lrg_icon_default; +extern const char *af_med_icon_default; +extern const char *af_sml_icon_default; +extern const char *af_tiny_icon_default; #endif /* _DTCREATE_H_INCLUDED */ diff --git a/cde/programs/dtcreate/main.c b/cde/programs/dtcreate/main.c index fbd49e6ac..0b223cf62 100644 --- a/cde/programs/dtcreate/main.c +++ b/cde/programs/dtcreate/main.c @@ -61,7 +61,6 @@ extern XmWidgetExtData _XmGetWidgetExtData( unsigned char extType) ; #endif /* NeedWidePrototypes */ -#define NOEXTERN #include "dtcreate.h" #include "ca_aux.h" #include "cmnrtns.h" @@ -78,6 +77,146 @@ Tt_message ProcessToolTalkMessage( ); #define NL_CAT_LOCALE 0 #endif +/* Global variables declared in dtcreate.h */ +ActionData AD; +ActionData *pMyCopyAD; +char *pszFileToEdit; +Cursor watch_cursor; +Widget widEditSource; +Boolean bIconEditorDisplayed; +nl_catd nlmsg_fd; +char *pszExecName; +Widget widSelectedIcon; +Boolean bLowRes; +IconData *IconDataList[ICON_NUMBER]; + +/**********************************************************/ +/* CreateActionAppShell globals. */ +/**********************************************************/ + +Widget CreateActionAppShell; +Widget ExpertOption; +Widget ColorMonoOption; +Widget CA_ActionNameTextField; +Widget CA_MED_IconGadget; +Widget CA_SML_IconGadget; +Widget CA_TINY_IconGadget; +Widget CA_LRG_IconGadget; +Widget CA_DblClkText; +Widget XprtOptionForm; +Widget CA_XprtActionOpenText; +Widget CA_FiletypesList; +Widget CA_WindowTypeArea; +Widget CA_WindowType; +Widget CA_Expand; +#if 0 +Widget CA_WindowType_OptionMenuShell; +Widget CA_WindowType_Pane; +#endif +Widget CA_WinTypeX; +Widget CA_WinTypeAutoClose; +Widget CA_WinTypeManualClose; +Widget CA_WinTypeNoOutput; +Widget CA_HelpTextWindow; +Widget CA_HelpText; +Widget CA_AllFiletypesToggle; +Widget CA_FiletypesInListToggle; + +/**********************************************************/ +/* AddFiletype globals. */ +/**********************************************************/ + +Widget AddFiletype; +Widget AF_FileTypeNameTextField; +Widget AF_IdCharacteristicsText; +Widget AF_IdCharacteristicsEdit; +Widget AF_FiletypePrintCmdTextField; +Widget AF_OpenCmdText; +Widget AF_FiletypeHelpText; +Widget AF_MED_IconGadget; +Widget AF_TINY_IconGadget; + +/**********************************************************/ +/* FileCharacteristics globals */ +/**********************************************************/ + +Widget FileCharacteristics; +Widget FC_DirectoryToggle; +Widget FC_FileToggle; +Widget FC_AndLabel2; +Widget FC_ContentsPatternText; +Widget FC_StringToggle; +Widget FC_ByteToggle; +Widget FC_ShortToggle; +Widget FC_LongToggle; +Widget FC_StartByteTextField; +/* +Widget FC_EndByteTextField; +*/ +Widget FC_NameOrPathText; +Widget FC_AndLabel1; +Widget FC_ReadToggle; +Widget FC_WriteToggle; +Widget FC_ExecuteToggle; + +Widget FC_NamePatternLabel; +Widget FC_PermissionLabel; +Widget FC_PermissionToggle; +Widget FC_ContentsLabel; +Widget FC_ContentsBox; +Widget FC_TypeRowColumn; +Widget FC_StartByteLabel; +Widget FC_TypeLabel; +Widget FC_ContentsPatternLabel; +/* +Widget FC_EndByteLabel; +*/ +Widget FC_ContentsToggle; +Widget FC_NameOrPathToggle; + +/**********************************************************/ +/* icon_selection_dialog globals */ +/**********************************************************/ +Widget ISD_SelectedIconTextField; + +/**********************************************************/ +/* Other dialog globals */ +/**********************************************************/ +SessionData sessiondata; + +/*******************************************************************/ +/* Global variables that are being initialized. */ +/*******************************************************************/ + + +enum icon_size_range action_icon_size = None_Selected; +extern enum icon_size_range filetype_icon_size; +int pidIconEditor = 0; +Boolean bShowPixmaps = TRUE; +Widget IconSelector = (Widget)NULL; +Boolean DbInitDone = FALSE; +Widget OpenFile = (Widget)NULL; +Widget Confirmed = (Widget)NULL; +Widget QuestionDialog = (Widget)NULL; +Widget ErrorDialog = (Widget)NULL; +Widget last_action_pushed = (Widget)NULL; +Widget last_filetype_pushed = (Widget)NULL; + +const char *ca_icon_default = "Dtactn"; +const char *ca_full_icon_default = "/usr/dt/appconfig/icons/C/Dtactn"; +const char *ca_lrg_icon_default = "/usr/dt/appconfig/icons/C/Dtactn.l"; +const char *ca_med_icon_default = "/usr/dt/appconfig/icons/C/Dtactn.m"; +const char *ca_sml_icon_default = "/usr/dt/appconfig/icons/C/Dtactn.s"; +const char *ca_tiny_icon_default = "/usr/dt/appconfig/icons/C/Dtactn.t"; + +const char *af_icon_default = "Dtdata"; +const char *af_full_icon_default = "/usr/dt/appconfig/icons/C/Dtdata"; +const char *af_lrg_icon_default = "/usr/dt/appconfig/icons/C/Dtdata.l"; +const char *af_med_icon_default = "/usr/dt/appconfig/icons/C/Dtdata.m"; +const char *af_sml_icon_default = "/usr/dt/appconfig/icons/C/Dtdata.s"; +const char *af_tiny_icon_default = "/usr/dt/appconfig/icons/C/Dtdata.t"; + + /*---------------------------------------------------- * UxXt.h needs to be included only when compiling a diff --git a/cde/programs/dtdocbook/instant/main.c b/cde/programs/dtdocbook/instant/main.c index a3762bded..2b479d740 100644 --- a/cde/programs/dtdocbook/instant/main.c +++ b/cde/programs/dtdocbook/instant/main.c @@ -882,11 +882,13 @@ ReadLocaleStrings(const char *file_name, int *ret_code) { i18nBuf = EscapeI18NChars(pBuf); if (i18nBuf != pBuf) { - free(pBuf); + pBuf = Tcl_Realloc(pBuf, 1 + strlen(i18nBuf)); + strcpy(pBuf, i18nBuf); + free(i18nBuf); } *ret_code = 0; - return i18nBuf; + return pBuf; } static int TclReadLocaleStrings(ClientData clientData, @@ -1093,7 +1095,7 @@ ReadESIS( char *buf, *i18nBuf; int i, c, ncont; Element_t *e; - Content_t cont[5000]; + Content_t cont[5000] = {0}; Malloc( LINESIZE+1, buf, char ); diff --git a/cde/programs/dthelp/dthelpdemo/Main.c b/cde/programs/dthelp/dthelpdemo/Main.c index 8baf84ac5..fc02997fd 100644 --- a/cde/programs/dthelp/dthelpdemo/Main.c +++ b/cde/programs/dthelp/dthelpdemo/Main.c @@ -68,6 +68,13 @@ #include "HelpCacheI.h" #include "HourGlassI.h" +/* Global Variables Used by our helpCache */ + +CacheListStruct *pCacheListHead; +CacheListStruct *pCacheListTale; +int totalCacheNodes; + + /* Internal Static Functions */ static Widget BuildMenus(Widget parent); static void CreateMainWindow(Widget parent); diff --git a/cde/programs/dthelp/dthelpdemo/Main.h b/cde/programs/dthelp/dthelpdemo/Main.h index 6bfd1f71c..37b23457a 100644 --- a/cde/programs/dthelp/dthelpdemo/Main.h +++ b/cde/programs/dthelp/dthelpdemo/Main.h @@ -64,9 +64,9 @@ /* Global Variables Used by our helpCache */ -CacheListStruct *pCacheListHead; -CacheListStruct *pCacheListTale; -int totalCacheNodes; +extern CacheListStruct *pCacheListHead; +extern CacheListStruct *pCacheListTale; +extern int totalCacheNodes; /* Globally referenced widget variables */ extern Widget topLevel; diff --git a/cde/programs/dthelp/dthelpview/Main.c b/cde/programs/dthelp/dthelpview/Main.c index 8180dc9b4..441e221c0 100644 --- a/cde/programs/dthelp/dthelpview/Main.c +++ b/cde/programs/dthelp/dthelpview/Main.c @@ -80,6 +80,27 @@ #include "UtilI.h" #include "ManPageI.h" +/* Global Variables Used to maintain our cache list of help dialogs */ +CacheListStruct *pCacheListHead; +CacheListStruct *pCacheListTale; +int totalCacheNodes; + +/* Global Variables */ +Widget topLevel; +Widget viewWidget; +Widget manWidget; +Widget manBtn; +Widget manText; +Widget manForm; +Widget closeBtn; + +/* General global variables */ +int runMode; +char *helpClass; +Display *appDisplay; +char *startCommand; + + /* Application resource list definition */ static XrmOptionDescRec option_list[] = diff --git a/cde/programs/dthelp/dthelpview/Main.h b/cde/programs/dthelp/dthelpview/Main.h index 4f7475064..4cfb4a8de 100644 --- a/cde/programs/dthelp/dthelpview/Main.h +++ b/cde/programs/dthelp/dthelpview/Main.h @@ -66,25 +66,25 @@ /* Global Variables Used to maintain our cache list of help dialogs */ -CacheListStruct *pCacheListHead; -CacheListStruct *pCacheListTale; -int totalCacheNodes; +extern CacheListStruct *pCacheListHead; +extern CacheListStruct *pCacheListTale; +extern int totalCacheNodes; /* Global Variables */ -Widget topLevel; -Widget viewWidget; -Widget manWidget; -Widget manBtn; -Widget manText; -Widget manForm; -Widget closeBtn; +extern Widget topLevel; +extern Widget viewWidget; +extern Widget manWidget; +extern Widget manBtn; +extern Widget manText; +extern Widget manForm; +extern Widget closeBtn; /* General global variables */ -int runMode; -char *helpClass; -Display *appDisplay; -char *startCommand; +extern int runMode; +extern char *helpClass; +extern Display *appDisplay; +extern char *startCommand; diff --git a/cde/programs/dthelp/parser.ccdf/volumegen/Volumegen.c b/cde/programs/dthelp/parser.ccdf/volumegen/Volumegen.c index d9a429430..08de4809d 100644 --- a/cde/programs/dthelp/parser.ccdf/volumegen/Volumegen.c +++ b/cde/programs/dthelp/parser.ccdf/volumegen/Volumegen.c @@ -56,7 +56,6 @@ typedef int Boolean; /* extern int errno; */ -/* extern char *sys_errlist[]; */ /* extern int sys_nerr; */ static void GenTopicList ( diff --git a/cde/programs/dthelp/parser/canon1/helptag/Imakefile b/cde/programs/dthelp/parser/canon1/helptag/Imakefile index a0ab8653b..5ea05a86a 100644 --- a/cde/programs/dthelp/parser/canon1/helptag/Imakefile +++ b/cde/programs/dthelp/parser/canon1/helptag/Imakefile @@ -44,10 +44,10 @@ APPLHDRS = $(PARSEHDRS) $(ELTHDRS) \ ../parser/pval.h ../parser/globdec.h ../parser/signonx.h \ ../parser/userinc.h -SRCS = custom.c default.c help.c make.c option.c out.c special.c xref.c \ +SRCS = custom.c default.c global.c help.c make.c option.c out.c special.c xref.c \ $(XLATESRCS) -OBJS = custom.o default.o help.o make.o option.o out.o special.o xref.o \ +OBJS = custom.o default.o global.o help.o make.o option.o out.o special.o xref.o \ $(XLATEOBJS) LOCAL_LIBRARIES = $(HELPUTILLIB) diff --git a/cde/programs/dthelp/parser/canon1/helptag/global.c b/cde/programs/dthelp/parser/canon1/helptag/global.c new file mode 100644 index 000000000..604a186bb --- /dev/null +++ b/cde/programs/dthelp/parser/canon1/helptag/global.c @@ -0,0 +1,47 @@ +/* + * CDE - Common Desktop Environment + * + * Copyright (c) 1993-2012, The Open Group. All rights reserved. + * + * These libraries and programs are free software; you can + * redistribute them and/or modify them under the terms of the GNU + * Lesser General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) + * any later version. + * + * These libraries and programs are distributed in the hope that + * they will be useful, but WITHOUT ANY WARRANTY; without even the + * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU Lesser General Public License for more + * details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with these libraries and programs; if not, write + * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth + * Floor, Boston, MA 02110-1301 USA + */ + +#include "basic.h" +#include "trie.h" +#include "common.h" + +#include "global.h" + +/* global variables */ +PBLOCK blockinfo INIT(NULL); +LOGICAL inParText INIT(FALSE); +LOGICAL inSdlP INIT(FALSE); + +/* Save these ids and reuse them on the current virpage. + * We need two of each (except for the first) so we can alternate to + * avoid
thinking it is supposed to span them. The bullet id + * indexes will flip back and forth between 0 and 1 to pick an id. +*/ +int bulletId[2], looseBulletId[2], firstBulletId, firstLooseBulletId; +int bulletIdIndex INIT(1); +int looseBulletIdIndex INIT(1); + +/* Should we use these BASENAME_LIMIT on the size of file names? */ +LOGICAL usingshortnames INIT(FALSE); + + diff --git a/cde/programs/dthelp/parser/canon1/helptag/global.h b/cde/programs/dthelp/parser/canon1/helptag/global.h index 4b1335220..3e8ed60e6 100644 --- a/cde/programs/dthelp/parser/canon1/helptag/global.h +++ b/cde/programs/dthelp/parser/canon1/helptag/global.h @@ -227,20 +227,21 @@ struct _block { char *pclass; char *pssi; PBLOCK pprev; -} block, *pblock; -PBLOCK blockinfo INIT(NULL); +}; +/*block, *pblock;*/ +extern PBLOCK blockinfo; -LOGICAL inParText INIT(FALSE); -LOGICAL inSdlP INIT(FALSE); +extern LOGICAL inParText; +extern LOGICAL inSdlP; /* Save these ids and reuse them on the current virpage. * We need two of each (except for the first) so we can alternate to * avoid thinking it is supposed to span them. The bullet id * indexes will flip back and forth between 0 and 1 to pick an id. */ -int bulletId[2], looseBulletId[2], firstBulletId, firstLooseBulletId; -int bulletIdIndex INIT(1); -int looseBulletIdIndex INIT(1); +extern int bulletId[2], looseBulletId[2], firstBulletId, firstLooseBulletId; +extern int bulletIdIndex; +extern int looseBulletIdIndex; /* indent for p, image, ex, vex, based on plain list */ #define LISTFIRSTINDENT 2 @@ -289,7 +290,7 @@ EXTERN char *helpext; EXTERN char helptmpbuf[2] INIT("0"); /* Should we use these BASENAME_LIMIT on the size of file names? */ -LOGICAL usingshortnames INIT(FALSE); +extern LOGICAL usingshortnames; /* Limit on how long the basename can be for a .ht file */ #define BASENAME_LIMIT 6 /* limit on how many additional character are allowed before the ext */ diff --git a/cde/programs/dthelp/parser/canon1/parser/Imakefile b/cde/programs/dthelp/parser/canon1/parser/Imakefile index 324c22d4c..bcc02b7d8 100644 --- a/cde/programs/dthelp/parser/canon1/parser/Imakefile +++ b/cde/programs/dthelp/parser/canon1/parser/Imakefile @@ -44,6 +44,7 @@ XLATEOBJECTS = $(HELPTAGSRC)/LocaleXlate.o $(HELPTAGSRC)/XlationSvc.o APPLOBJECTS = \ $(HELPTAGSRC)/custom.o \ $(HELPTAGSRC)/default.o \ + $(HELPTAGSRC)/global.o \ $(HELPTAGSRC)/help.o \ $(HELPTAGSRC)/make.o \ $(HELPTAGSRC)/option.o \ diff --git a/cde/programs/dthelp/parser/canon1/parser/parser.c b/cde/programs/dthelp/parser/canon1/parser/parser.c index 7d7ac070b..130716661 100644 --- a/cde/programs/dthelp/parser/canon1/parser/parser.c +++ b/cde/programs/dthelp/parser/canon1/parser/parser.c @@ -35,6 +35,8 @@ #include "if.h" #include "entext.h" +char *user_defined_entities M_PARINIT("USER-DEFINED-ENTITIES"); + static void scanloop(LOGICAL prolog); /* Main procedure */ diff --git a/cde/programs/dthelp/parser/canon1/parser/parser.h b/cde/programs/dthelp/parser/canon1/parser/parser.h index 663ec17bb..076ca9fd0 100644 --- a/cde/programs/dthelp/parser/canon1/parser/parser.h +++ b/cde/programs/dthelp/parser/canon1/parser/parser.h @@ -301,7 +301,7 @@ M_PAREXTERN int m_prevcon ; M_PAREXTERN int m_token ; M_PAREXTERN int m_scanval ; -char *user_defined_entities M_PARINIT("USER-DEFINED-ENTITIES"); +extern char *user_defined_entities; /* Declarations for tentative list of omitted tags when checking for tag MINimization */ diff --git a/cde/programs/dthelp/parser/pass1/helptag/Imakefile b/cde/programs/dthelp/parser/pass1/helptag/Imakefile index 9a2329d3f..b3fbda65b 100644 --- a/cde/programs/dthelp/parser/pass1/helptag/Imakefile +++ b/cde/programs/dthelp/parser/pass1/helptag/Imakefile @@ -44,10 +44,10 @@ APPLHDRS = $(PARSEHDRS) $(ELTHDRS) \ ../parser/pval.h ../parser/globdec.h ../parser/signonx.h \ ../parser/userinc.h -SRCS = custom.c default.c help.c make.c option.c out.c special.c xref.c \ +SRCS = custom.c default.c global.c help.c make.c option.c out.c special.c xref.c \ $(XLATESRCS) -OBJS = custom.o default.o help.o make.o option.o out.o special.o xref.o \ +OBJS = custom.o default.o global.o help.o make.o option.o out.o special.o xref.o \ $(XLATEOBJS) LOCAL_LIBRARIES = $(HELPUTILLIB) diff --git a/cde/programs/dthelp/parser/pass1/helptag/global.c b/cde/programs/dthelp/parser/pass1/helptag/global.c new file mode 100644 index 000000000..09c5c728f --- /dev/null +++ b/cde/programs/dthelp/parser/pass1/helptag/global.c @@ -0,0 +1,43 @@ +/* + * CDE - Common Desktop Environment + * + * Copyright (c) 1993-2012, The Open Group. All rights reserved. + * + * These libraries and programs are free software; you can + * redistribute them and/or modify them under the terms of the GNU + * Lesser General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) + * any later version. + * + * These libraries and programs are distributed in the hope that + * they will be useful, but WITHOUT ANY WARRANTY; without even the + * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU Lesser General Public License for more + * details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with these libraries and programs; if not, write + * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth + * Floor, Boston, MA 02110-1301 USA + */ + +#include "basic.h" +#include "trie.h" +#include "common.h" + +#include "global.h" + +/* Save these ids and reuse them on the current virpage. + * We need two of each (except for the first) so we can alternate to + * avoid thinking it is supposed to span them. The bullet id + * indexes will flip back and forth between 0 and 1 to pick an id. +*/ +int bulletId[2], looseBulletId[2], firstBulletId, firstLooseBulletId; +int bulletIdIndex = 1; +int looseBulletIdIndex = 1; + +LOGICAL inParText = FALSE; +LOGICAL inSdlP = FALSE; + +/* Should we use these BASENAME_LIMIT on the size of file names? */ +LOGICAL usingshortnames = FALSE; diff --git a/cde/programs/dthelp/parser/pass1/helptag/global.h b/cde/programs/dthelp/parser/pass1/helptag/global.h index d3b8d2015..d1fb2dba9 100644 --- a/cde/programs/dthelp/parser/pass1/helptag/global.h +++ b/cde/programs/dthelp/parser/pass1/helptag/global.h @@ -170,17 +170,17 @@ EXTERN M_WCHAR *imageghyperlinkp; EXTERN M_WCHAR *imageglinktypep; EXTERN M_WCHAR *imagegdescription; -LOGICAL inParText INIT(FALSE); -LOGICAL inSdlP INIT(FALSE); +extern LOGICAL inParText; +extern LOGICAL inSdlP; /* Save these ids and reuse them on the current virpage. * We need two of each (except for the first) so we can alternate to * avoid thinking it is supposed to span them. The bullet id * indexes will flip back and forth between 0 and 1 to pick an id. */ -int bulletId[2], looseBulletId[2], firstBulletId, firstLooseBulletId; -int bulletIdIndex INIT(1); -int looseBulletIdIndex INIT(1); +extern int bulletId[2], looseBulletId[2], firstBulletId, firstLooseBulletId; +extern int bulletIdIndex; +extern int looseBulletIdIndex; /* save the textsize to emit it on the

tag; this allows us to have * a single ssi= for the "ex" and modify the text size individually @@ -213,7 +213,7 @@ EXTERN char *helpbase INIT(NULL); EXTERN char *helpext; /* Should we use these BASENAME_LIMIT on the size of file names? */ -LOGICAL usingshortnames INIT(FALSE); +extern LOGICAL usingshortnames; /* Limit on how long the basename can be for a .ht file */ #define BASENAME_LIMIT 6 /* limit on how many additional character are allowed before the ext */ diff --git a/cde/programs/dthelp/parser/pass1/parser/Imakefile b/cde/programs/dthelp/parser/pass1/parser/Imakefile index db1cc93da..80d59d178 100644 --- a/cde/programs/dthelp/parser/pass1/parser/Imakefile +++ b/cde/programs/dthelp/parser/pass1/parser/Imakefile @@ -44,6 +44,7 @@ XLATEOBJECTS = $(HELPTAGSRC)/LocaleXlate.o $(HELPTAGSRC)/XlationSvc.o APPLOBJECTS = \ $(HELPTAGSRC)/custom.o \ $(HELPTAGSRC)/default.o \ + $(HELPTAGSRC)/global.o \ $(HELPTAGSRC)/help.o \ $(HELPTAGSRC)/make.o \ $(HELPTAGSRC)/option.o \ diff --git a/cde/programs/dthelp/parser/pass2/htag2/Imakefile b/cde/programs/dthelp/parser/pass2/htag2/Imakefile index 040d710a5..d421315d9 100644 --- a/cde/programs/dthelp/parser/pass2/htag2/Imakefile +++ b/cde/programs/dthelp/parser/pass2/htag2/Imakefile @@ -38,9 +38,9 @@ APPLHDRS = $(PARSEHDRS) $(ELTHDRS) \ ../parser/pval.h ../parser/globdec.h ../parser/signonx.h \ ../parser/userinc.h -SRCS = custom.c sdl.c option.c out.c $(XLATESRCS) +SRCS = custom.c global.c sdl.c option.c out.c $(XLATESRCS) -OBJS = custom.o sdl.o option.o out.o $(XLATEOBJS) +OBJS = custom.o global.o sdl.o option.o out.o $(XLATEOBJS) LOCAL_LIBRARIES = $(SDLUTILLIB) diff --git a/cde/programs/dthelp/parser/pass2/htag2/global.c b/cde/programs/dthelp/parser/pass2/htag2/global.c new file mode 100644 index 000000000..ea8b28031 --- /dev/null +++ b/cde/programs/dthelp/parser/pass2/htag2/global.c @@ -0,0 +1,48 @@ +/* + * CDE - Common Desktop Environment + * + * Copyright (c) 1993-2012, The Open Group. All rights reserved. + * + * These libraries and programs are free software; you can + * redistribute them and/or modify them under the terms of the GNU + * Lesser General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) + * any later version. + * + * These libraries and programs are distributed in the hope that + * they will be useful, but WITHOUT ANY WARRANTY; without even the + * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU Lesser General Public License for more + * details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with these libraries and programs; if not, write + * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth + * Floor, Boston, MA 02110-1301 USA + */ + +#include "basic.h" +#include "trie.h" +#include "common.h" + +#include "global.h" + + +/* + * Names for all the input, output and intermediate files we'll need. +*/ +char *inFileName; +char *outFileName; +char *errFileName; +char *idxFileName; +char *snbFileName; +char *sortedIdxFileName; +char *tossFileName; +char *vstructFileName; +char *tempFileName; +char *compFileName; +char *compZFileName; + +FILE *inFile; +FILE *outFile; + diff --git a/cde/programs/dthelp/parser/pass2/htag2/global.h b/cde/programs/dthelp/parser/pass2/htag2/global.h index e983ad9b3..b12441cd9 100644 --- a/cde/programs/dthelp/parser/pass2/htag2/global.h +++ b/cde/programs/dthelp/parser/pass2/htag2/global.h @@ -128,20 +128,20 @@ EXTERN char *progName INIT(NULL); /* * Names for all the input, output and intermediate files we'll need. */ -char *inFileName; -char *outFileName; -char *errFileName; -char *idxFileName; -char *snbFileName; -char *sortedIdxFileName; -char *tossFileName; -char *vstructFileName; -char *tempFileName; -char *compFileName; -char *compZFileName; +extern char *inFileName; +extern char *outFileName; +extern char *errFileName; +extern char *idxFileName; +extern char *snbFileName; +extern char *sortedIdxFileName; +extern char *tossFileName; +extern char *vstructFileName; +extern char *tempFileName; +extern char *compFileName; +extern char *compZFileName; -FILE *inFile; -FILE *outFile; +extern FILE *inFile; +extern FILE *outFile; typedef struct _loidsRec *LoidsPtr; typedef struct _loidsRec { diff --git a/cde/programs/dthelp/parser/pass2/parser/Imakefile b/cde/programs/dthelp/parser/pass2/parser/Imakefile index 701fe3652..46cc7c537 100644 --- a/cde/programs/dthelp/parser/pass2/parser/Imakefile +++ b/cde/programs/dthelp/parser/pass2/parser/Imakefile @@ -37,6 +37,7 @@ XLATEOBJECTS = $(HTAG2SRC)/LocaleXlate.o $(HTAG2SRC)/XlationSvc.o APPLOBJECTS = \ $(HTAG2SRC)/custom.o \ + $(HTAG2SRC)/global.o \ $(HTAG2SRC)/sdl.o \ $(HTAG2SRC)/option.o \ $(HTAG2SRC)/out.o \ diff --git a/cde/programs/dticon/graphics.c b/cde/programs/dticon/graphics.c index a253a4298..f17b01e45 100644 --- a/cde/programs/dticon/graphics.c +++ b/cde/programs/dticon/graphics.c @@ -60,11 +60,11 @@ extern GC scratch_gc; -Widget editMenu_cut_pb; -Widget editMenu_copy_pb; -Widget editMenu_rotate_pb; -Widget editMenu_flip_pb; -Widget editMenu_scale_pb; +extern Widget editMenu_cut_pb; +extern Widget editMenu_copy_pb; +extern Widget editMenu_rotate_pb; +extern Widget editMenu_flip_pb; +extern Widget editMenu_scale_pb; extern void Stop_HotBox(void); diff --git a/cde/programs/dticon/process.c b/cde/programs/dticon/process.c index d8cbb3a33..851c4a2b8 100644 --- a/cde/programs/dticon/process.c +++ b/cde/programs/dticon/process.c @@ -101,13 +101,13 @@ static void Do_DropCheckOp(DtDndTransferCallback); static void Do_DropOp(void); extern Widget optionsMenu_grid; -Widget editMenu_paste_pb; -Widget editMenu_cut_pb; -Widget editMenu_copy_pb; -Widget editMenu_rotate_pb; -Widget editMenu_flip_pb; -Widget editMenu_scale_pb; -Widget editMenu_undo_pb; +extern Widget editMenu_paste_pb; +extern Widget editMenu_cut_pb; +extern Widget editMenu_copy_pb; +extern Widget editMenu_rotate_pb; +extern Widget editMenu_flip_pb; +extern Widget editMenu_scale_pb; +extern Widget editMenu_undo_pb; extern Widget newWidthText, newHeightText; extern GC scratch_gc; diff --git a/cde/programs/dticon/utils.c b/cde/programs/dticon/utils.c index a4324ade3..87d6f07cf 100644 --- a/cde/programs/dticon/utils.c +++ b/cde/programs/dticon/utils.c @@ -138,7 +138,7 @@ extern Window tablet_win; static int jskXerrorDebug(); static int jskXerrorIODebug(); -Widget editMenu_undo_pb; +extern Widget editMenu_undo_pb; void GetSessionInfo( void ); void Set_Gfx_Labels( Boolean ); diff --git a/cde/programs/dtimsstart/remote.c b/cde/programs/dtimsstart/remote.c index 687736739..71d329777 100644 --- a/cde/programs/dtimsstart/remote.c +++ b/cde/programs/dtimsstart/remote.c @@ -37,10 +37,6 @@ #include /* for X_ChangeHosts */ #include /* for XA_STRING */ -#if !defined(__linux__) && !defined(CSRG_BASED) -extern char *sys_errlist[]; -#endif - static char *conf_msg_id = STR_CONFDATA; #define CONF_MSG_ID_LEN strlen(conf_msg_id) diff --git a/cde/programs/dtimsstart/start.c b/cde/programs/dtimsstart/start.c index 78fc2a382..1dafa1892 100644 --- a/cde/programs/dtimsstart/start.c +++ b/cde/programs/dtimsstart/start.c @@ -27,14 +27,10 @@ #include #include #include +#include #if (defined(__linux__) || defined(CSRG_BASED)) && !defined(_NFILE) #define _NFILE FOPEN_MAX -#endif - -#if !defined(__linux__) && !defined(CSRG_BASED) -extern char *sys_errlist[]; -extern int sys_nerr; #endif /* local functions */ @@ -599,8 +595,7 @@ static int invoke_ims(UserSelection *sel) pid = fork(); if (pid == (pid_t) -1) { - put_xims_log("fork failed [%s]", - (errno <= sys_nerr) ? sys_errlist[errno] : NULL, 0, 0); + put_xims_log("fork failed [%s]", strerror(errno), 0, 0); #ifdef DEBUG perror("fork"); #endif @@ -617,8 +612,7 @@ static int invoke_ims(UserSelection *sel) #endif execl(SH_PATH, "sh", "-c", renv->cmdbuf, NULL); - put_xims_log("%s: exec failed [%s]", SH_PATH, - (errno <= sys_nerr) ? sys_errlist[errno] : NULL, 0, 0); + put_xims_log("%s: exec failed [%s]", SH_PATH, strerror(errno) , 0, 0); /* perror(SH_PATH); */ sleep(1); _exit(1); diff --git a/cde/programs/dtinfo/dtinfo/src/external-api/comm.c b/cde/programs/dtinfo/dtinfo/src/external-api/comm.c index d61ccb7a9..6aa2fc91c 100644 --- a/cde/programs/dtinfo/dtinfo/src/external-api/comm.c +++ b/cde/programs/dtinfo/dtinfo/src/external-api/comm.c @@ -53,9 +53,6 @@ #include #endif -extern char *sys_errlist[]; - - static OliasEvent *current_event; static int reply_status; #define NO_REPLY 0 @@ -332,7 +329,7 @@ wait_for_reply (Widget toplevel) XtAppWarningMsg (XtWidgetToApplicationContext (toplevel), "communicationsError", "select", "Olias API", "Select failed: %s", - &sys_errlist[errno], &num_params); + strerror(errno), &num_params); continue; } continue; diff --git a/cde/programs/dtksh/ksh93 b/cde/programs/dtksh/ksh93 deleted file mode 160000 index 47468f56c..000000000 --- a/cde/programs/dtksh/ksh93 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 47468f56c2d0506045120fb4d0709f3a734693f5 diff --git a/cde/programs/dtlogin/dm.c b/cde/programs/dtlogin/dm.c index 54d1dbee5..a5b800d78 100644 --- a/cde/programs/dtlogin/dm.c +++ b/cde/programs/dtlogin/dm.c @@ -68,7 +68,7 @@ # include #endif -#if defined (SYSV) || defined (SVR4) +#if defined(SYSV) || defined(SVR4) || defined(__linux__) #ifndef F_TLOCK # include #endif @@ -529,11 +529,10 @@ WaitForChild( void ) waitType status; int mask; -#if defined(SYSV) || defined(SVR4) || defined(hpux) - +#if defined(SYSV) || defined(SVR4) || defined(hpux) || defined(__linux__) if (AnyWellKnownSockets()) { while ( ChildReady ) { -#ifdef SVR4 +#if defined(SVR4) || defined(__linux__) while ((pid = waitpid((pid_t) -1, &status, WNOHANG)) > 0 ) #else while ((pid = wait3 (&status, WNOHANG, NULL)) > 0 ) @@ -1337,7 +1336,7 @@ StorePid( void ) fseek (pidFilePtr, 0l, 0); if (lockPidFile) { -#if defined (SYSV) || defined (SVR4) +#if defined(SYSV) || defined(SVR4) || defined(__linux__) if (lockf (pidFd, F_TLOCK, 0) == -1) { if ((errno == EAGAIN) || (errno == EACCES)) @@ -1374,7 +1373,7 @@ static void UnlockPidFile( void ) { if (lockPidFile) -#if defined (SYSV) || defined (SVR4) +#if defined(SYSV) || defined(SVR4) || defined(__linux__) lockf (pidFd, F_ULOCK, 0); #else flock (pidFd, LOCK_UN); diff --git a/cde/programs/dtlogin/dm.h b/cde/programs/dtlogin/dm.h index 3e0f24997..e67edc3cb 100644 --- a/cde/programs/dtlogin/dm.h +++ b/cde/programs/dtlogin/dm.h @@ -68,8 +68,7 @@ # include /* for passwd structure */ # include # include /* for exit(), malloc(), abort() */ -# include /* for string functions, bcopy(), - sys_errlist */ +# include /* for string functions, bcopy() */ # include /* for NGROUPS */ # include /* for fd_set */ # include /* for Internet socket stuff */ @@ -475,10 +474,6 @@ struct verify_info { * ***************************************************************************/ -#if !defined(__linux__) && !defined(CSRG_BASED) -extern char *sys_errlist[]; /* system error msgs */ -extern int sys_nerr; /* system error msgs */ -#endif extern XrmDatabase XresourceDB; diff --git a/cde/programs/dtopen/dtopen.src b/cde/programs/dtopen/dtopen.src index 4f1d0c9a0..0e1b7eff1 100755 --- a/cde/programs/dtopen/dtopen.src +++ b/cde/programs/dtopen/dtopen.src @@ -50,8 +50,8 @@ XCOMM ## Utility Functions XCOMM ## Find the path of a program FindProg() { - # FindProg "program" - # - returns full path, or "" +XCOMM FindProg "program" +XCOMM - returns full path, or "" whence "$1" @@ -61,8 +61,8 @@ FindProg() XCOMM ## Show an error message ErrorMsg() { - # ErrorMsg "Title "Message" ["OK"] - # use dterror.ds to display it... +XCOMM ErrorMsg "Title "Message" ["OK"] +XCOMM use dterror.ds to display it... if [ -z "$3" ] then # default to 'OK' @@ -79,7 +79,7 @@ ErrorMsg() XCOMM ## do a simple command DoSimpleCmd() { - # DoSimpleCmd "commands" args +XCOMM DoSimpleCmd "commands" args didone=0 cmds="$1" @@ -131,7 +131,7 @@ case $APPNAME in DoSimpleCmd "$VVIDEO" "$*" ;; *) - # Unknown +XCOMM Unknown ErrorMsg "${DTOPEN}: Unknown Helper Application" \ "\"$APPNAME\" is not a recognized Helper Application. \nKnown Helper Applications are:\n\n$COMMANDS" ;; diff --git a/cde/programs/dtsession/SmUI.c b/cde/programs/dtsession/SmUI.c index 9ea710de9..263d8ff19 100644 --- a/cde/programs/dtsession/SmUI.c +++ b/cde/programs/dtsession/SmUI.c @@ -1161,7 +1161,7 @@ ImmediateExit( * Turn off SIGTERM so we don't catch one in the middle of shutting * down */ -#if !defined(SVR4) +#if !defined(SVR4) && !defined(__linux__) old = sigblock(sigmask(SIGTERM)); sigblock(sigmask(SIGHUP)); sigblock(sigmask(SIGPIPE)); diff --git a/cde/programs/dtstyle/ColorFile.c b/cde/programs/dtstyle/ColorFile.c index 28bc4287c..2a2e4b05a 100644 --- a/cde/programs/dtstyle/ColorFile.c +++ b/cde/programs/dtstyle/ColorFile.c @@ -125,8 +125,6 @@ static void InitializeBW( /*+++++++++++++++++++++++++++++++++++++++*/ /* Internal Variables */ /*+++++++++++++++++++++++++++++++++++++++*/ -int NumOfPalettes = 0; - static char *PALETTE_DIR = CDE_INSTALLATION_TOP "/palettes/"; static char *PALETTE_DIR_ADM = "/etc/dt/palettes/"; static char *DEFAULT_FILENAME = "palette.dt"; diff --git a/cde/programs/dtstyle/ColorMain.c b/cde/programs/dtstyle/ColorMain.c index 811c6c725..05b4b4c10 100644 --- a/cde/programs/dtstyle/ColorMain.c +++ b/cde/programs/dtstyle/ColorMain.c @@ -246,7 +246,7 @@ Widget paletteList; Widget deleteButton; char *defaultName; Bool WaitSelection; -int NumOfPalettes; +int NumOfPalettes = 0; /*+++++++++++++++++++++++++++++++++++++++*/ /* Internal Variables */ diff --git a/cde/programs/dtudcfonted/mtfgui.c b/cde/programs/dtudcfonted/mtfgui.c index 14acb0d0a..992ac017a 100644 --- a/cde/programs/dtudcfonted/mtfgui.c +++ b/cde/programs/dtudcfonted/mtfgui.c @@ -66,9 +66,9 @@ extern FalCodeRegion CodeArea[16]; structure of widgets ********************************************************************/ extern Widget toplevel; - Widget editPopW, - wgeScro, - wgeBulB_edit; +extern Widget wgeScro; +extern Widget editPopW; +Widget wgeBulB_edit; static Widget wgeStaT_form[EDLIST_MAX], wgeStaT_disp[EDLIST_MAX], wgeStaT_list[EDLIST_MAX], diff --git a/cde/programs/dtudcfonted/ufont.c b/cde/programs/dtudcfonted/ufont.c index 864610d10..5201684e9 100644 --- a/cde/programs/dtudcfonted/ufont.c +++ b/cde/programs/dtudcfonted/ufont.c @@ -56,6 +56,21 @@ GetMessage(int set, int number, char *string) * Widgets * ***************************************************************/ Widget toplevel; +Widget editPtnW; +Widget cpyPtnW; +Widget mngPtnW; + +EditChar edg; +EditList edlist; +EditPane edpane; +XlibInf xl; +DelInf dn; +DelPtnInf dl[D_MAX] ; +DelPtnInf dl_glyph[EDLIST_MAX]; /* add dl_disp 1995.09.20 */ +int sq_disp[EDLIST_MAX]; /* add sq_disp 1995.09.20 */ +EditPtnInf em; +CopyPtnInf cpm; + static Widget dnPopW; Widget wgeScro, editPopW; diff --git a/cde/programs/dtudcfonted/xoakufont.h b/cde/programs/dtudcfonted/xoakufont.h index 6d1261522..bf7f65669 100644 --- a/cde/programs/dtudcfonted/xoakufont.h +++ b/cde/programs/dtudcfonted/xoakufont.h @@ -255,23 +255,23 @@ typedef struct _FontInf { **********************************************************************/ -Widget toplevel; +extern Widget toplevel; -Widget editPtnW; -Widget cpyPtnW; -Widget mngPtnW; +extern Widget editPtnW; +extern Widget cpyPtnW; +extern Widget mngPtnW; -EditChar edg; -EditList edlist; -EditPane edpane; -XlibInf xl; -DelInf dn; -DelPtnInf dl[D_MAX] ; -DelPtnInf dl_glyph[EDLIST_MAX]; /* add dl_disp 1995.09.20 */ -int sq_disp[EDLIST_MAX]; /* add sq_disp 1995.09.20 */ +extern EditChar edg; +extern EditList edlist; +extern EditPane edpane; +extern XlibInf xl; +extern DelInf dn; +extern DelPtnInf dl[D_MAX] ; +extern DelPtnInf dl_glyph[EDLIST_MAX]; /* add dl_disp 1995.09.20 */ +extern int sq_disp[EDLIST_MAX]; /* add sq_disp 1995.09.20 */ -EditPtnInf em; -CopyPtnInf cpm; +extern EditPtnInf em; +extern CopyPtnInf cpm; /*