external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into master-ksh93-upgrade

Browse source
This commit is contained in:
Jon Trulson 2021-01-23 18:31:28 -07:00
commit 047cefcf32
166 changed files with 2287 additions and 2187 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -1,3 +0,0 @@
[submodule "cde/programs/dtksh/ksh93"]
path = cde/programs/dtksh/ksh93
url = https://github.com/ksh93/ksh.git

2
cde/Makefile
View file

@ -1,5 +1,5 @@
# $TOG: Makefile /main/15 1999/10/12 09:33:30 mgreess $ # $TOG: Makefile /main/15 1999/10/12 09:33:30 mgreess $
RELEASE = Release 2.3.1a RELEASE = Release 2.3.2a
PRODUCT = CDE PRODUCT = CDE
SHELL = /bin/sh SHELL = /bin/sh
RM = rm -f RM = rm -f

7
cde/admin/IntegTools/dbTools/udbParseLib.awk
View file

@ -350,9 +350,10 @@ function tokenize() {
# allow escaping of significant syntax characters # allow escaping of significant syntax characters
# #
gsub("[\\][{]","{") gsub("[\\][{]","{")
gsub("\\:",":") # These cause warnings in newer nawk, and aren't really necessary.
gsub("\\;",";") # gsub("\\:",":")
gsub("\\=","=") # gsub("\\;",";")
# gsub("\=","=")
gsub("[\\][}]","}") gsub("[\\][}]","}")
# #

13
cde/config/imake/imake.c
View file

@ -242,19 +242,6 @@ extern int errno;
#include <stdarg.h> #include <stdarg.h>
#include "imakemdep.h" #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 TRUE 1
#define FALSE 0 #define FALSE 0

4
cde/copyright
View file

@ -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 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/ Project Website: http://cdesktopenv.sourceforge.net/

2
cde/doc/common/help/HELPEnt.sgm
View file

@ -1,5 +1,5 @@
<!-- $TOG: HELPEnt.sgm /main/12 1999/10/12 09:35:15 mgreess $ --> <!-- $TOG: HELPEnt.sgm /main/12 1999/10/12 09:35:15 mgreess $ -->
<!ENTITY CDEcopyright "<GlossTerm Role=nogloss>Common Desktop Environment 2.3.1a</GlossTerm>, <!ENTITY CDEcopyright "<GlossTerm Role=nogloss>Common Desktop Environment 2.3.2a</GlossTerm>,
&copy; Copyright 1993-2012 The Open Group &copy; Copyright 1993-2012 The Open Group
&copy; Copyright 2012-2020 CDE Project contributors, see CONTRIBUTORS for details &copy; Copyright 2012-2020 CDE Project contributors, see CONTRIBUTORS for details

1
cde/lib/DtHelp/AccessI.h
View file

@ -44,6 +44,7 @@
#ifndef _DtHelpAccessI_h #ifndef _DtHelpAccessI_h
#define _DtHelpAccessI_h #define _DtHelpAccessI_h
#include <time.h>
#ifndef _XtIntrinsic_h #ifndef _XtIntrinsic_h
/* /*

6
cde/lib/DtSearch/raima/dbtype.h
View file

@ -405,7 +405,11 @@ typedef struct {struct CNTRY_TBL_S *ptr; LOCK_DESC} CNTRY_TBL_P;
struct sk { struct sk {
INT sk_fld; INT sk_fld;
CHAR_P sk_val; 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; typedef struct { struct sk *ptr; LOCK_DESC } SK_P;
/* node key search path stack entry: one per level per key field */ /* node key search path stack entry: one per level per key field */

4
cde/lib/DtSvc/DtUtil1/Dt.h
View file

@ -52,13 +52,13 @@ extern "C" {
#define DtVERSION 2 #define DtVERSION 2
#define DtREVISION 3 #define DtREVISION 3
#define DtUPDATE_LEVEL 1 #define DtUPDATE_LEVEL 2
#define DtVERSION_NUMBER (DtVERSION * 10000 + \ #define DtVERSION_NUMBER (DtVERSION * 10000 + \
DtREVISION * 100 + \ DtREVISION * 100 + \
DtUPDATE_LEVEL) DtUPDATE_LEVEL)
#define DtVERSION_STRING "CDE Version 2.3.1a" #define DtVERSION_STRING "CDE Version 2.3.2a"
/* /*

11
cde/lib/DtSvc/DtUtil2/XlationSvc.c
View file

@ -2199,18 +2199,15 @@ int _DtXlateGetXlateEnv(
/* then look up version number of execution host */ /* then look up version number of execution host */
if (ret_AppExecEnvVersion) if (ret_AppExecEnvVersion)
{ {
#if defined(sun) || defined(_AIX) || defined(__linux__) || defined(CSRG_BASED) char version[sizeof(names.release)+sizeof(names.version)-1];
char version[SYS_NMLN+SYS_NMLN+2];
#else
char version[UTSLEN+UTSLEN+2];
#endif
char * stdVer = NULL; char * stdVer = NULL;
int verNum = MATCHALL_VER; int verNum = MATCHALL_VER;
/* cat release version and do a translation on it to a std value */ /* cat release version and do a translation on it to a std value */
/* then convert the std value to a integer */ /* then convert the std value to a integer */
strcpy(version,names.release); strncpy(version,names.release,sizeof(names.release)-1);
strcat(version,names.version); version[sizeof(names.release)-1] = EOS;
strncat(version,names.version,sizeof(names.version)-1);
ret = _DtXlateOpToStdValue(db,names.sysname,0, ret = _DtXlateOpToStdValue(db,names.sysname,0,
_DtXLATE_OPER_VERSION,version,&stdVer,NULL); _DtXLATE_OPER_VERSION,version,&stdVer,NULL);
if (ret == 0) if (ret == 0)

13
cde/lib/DtSvc/DtUtil2/XlationSvc.h
View file

@ -109,14 +109,15 @@ platforms as part of a translation.
/*================================================$SKIP$==*/ /*================================================$SKIP$==*/
#endif #endif
/* $DEF$, Platform constants */ /* $DEF$, Platform constants */
#if defined(SVR4) || defined(_AIX) #if defined(SVR4) || defined(_AIX) || defined(SYS_NMLN)
#define _DtPLATFORM_MAX_LEN SYS_NMLN #define _DtPLATFORM_MAX_LEN SYS_NMLN
#else #elif defined(UTSLEN)
#if defined(SYS_NMLN)
#define _DtPLATFORM_MAX_LEN SYS_NMLN
#else
#define _DtPLATFORM_MAX_LEN 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 #endif
#define _DtPLATFORM_UNKNOWN ((const char *)0) #define _DtPLATFORM_UNKNOWN ((const char *)0)

6
cde/lib/csa/agent_p.h
View file

@ -33,8 +33,8 @@
#include "ansi_c.h" #include "ansi_c.h"
extern void _DtCm_init_agent P(()); extern void _DtCm_init_agent(void);
extern void _DtCm_destroy_agent P(()); extern void _DtCm_destroy_agent(void);
extern void _DtCm_process_updates P(()); extern void _DtCm_process_updates(void);
#endif /* _AGENT_P_H */ #endif /* _AGENT_P_H */

27
cde/lib/csa/ansi_c.h
View file

@ -36,28 +36,19 @@
#include <stdlib.h> #include <stdlib.h>
/*
** For all function declarations, if ANSI, then use a prototype
*/
#if defined(__STDC__)
#define P(args) args
#else
#define P(args) ()
#endif
#ifdef SunOS #ifdef SunOS
extern char *fconvert P((double, int, int*, int*, char*)); extern char *fconvert(double, int, int*, int*, char*))
extern int isascii P((int)); extern int isascii(int);
extern int kill P((long, int)); extern int kill(long, int);
extern char *mktemp P((char*)); extern char *mktemp(char*);
extern int strcasecmp P((const char*, const char*)); extern int strcasecmp(const char*, const char*);
extern int strncasecmp P((const char*, const char*, size_t)); extern int strncasecmp(const char*, const char*, size_t);
extern char *strdup P((const char*)); extern char *strdup (const char*);
#endif #endif
#ifdef NEED_STRCASECMP #ifdef NEED_STRCASECMP
int strcasecmp P((const char*, const char*)); int strcasecmp(const char*, const char*);
int strncasecmp P((const char*, const char*, size_t)); int strncasecmp(const char*, const char*, size_t);
#endif #endif
#endif #endif

38
cde/lib/csa/appt4.h
View file

@ -38,42 +38,42 @@
#include "rtable4.h" #include "rtable4.h"
#include "ansi_c.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 #endif

150
cde/lib/csa/attr.h
View file

@ -110,16 +110,16 @@ extern _DtCmAttrInfo _CSA_entry_attr_info[];
* external function declarations * external function declarations
*/ */
extern CSA_return_code _DtCm_check_cal_csa_attributes P(( extern CSA_return_code _DtCm_check_cal_csa_attributes(
int fvers, int fvers,
uint num_attrs, uint num_attrs,
CSA_attribute *attrs, CSA_attribute *attrs,
char *cname, char *cname,
boolean_t checkreadonly, boolean_t checkreadonly,
boolean_t firsttime, 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, int fvers,
uint num_attrs, uint num_attrs,
cms_attribute *attrs, cms_attribute *attrs,
@ -127,154 +127,154 @@ extern CSA_return_code _DtCm_check_cal_cms_attributes P((
char *cname, char *cname,
boolean_t checkreadonly, boolean_t checkreadonly,
boolean_t firsttime, 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, int fversion,
uint size, uint size,
CSA_attribute *attrs, CSA_attribute *attrs,
CSA_flags utype, 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, int fvers,
uint num_attrs, uint num_attrs,
cms_attribute *attrs, cms_attribute *attrs,
CSA_flags utype, 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, uint srcsize,
cms_attribute *srcattrs, cms_attribute *srcattrs,
uint *dstsize, 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 *to,
cms_attribute *from, 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 *from,
cms_attribute_value **to)); cms_attribute_value **to);
extern cms_access_entry *_DtCm_copy_cms_access_list P(( extern cms_access_entry *_DtCm_copy_cms_access_list(
cms_access_entry *alist)); cms_access_entry *alist);
extern CSA_date_time_list _DtCm_copy_date_time_list P(( extern CSA_date_time_list _DtCm_copy_date_time_list(
CSA_date_time_list dlist)); CSA_date_time_list dlist);
extern CSA_return_code _DtCm_cms2csa_attribute P(( extern CSA_return_code _DtCm_cms2csa_attribute(
cms_attribute from, 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, 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, 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, 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 *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 *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, uint size,
cms_attribute *attrs)); cms_attribute *attrs);
extern void _DtCm_free_attributes P(( extern void _DtCm_free_attributes(
uint size, 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, uint size,
cms_attribute *attrs)); cms_attribute *attrs);
extern void _DtCm_free_attribute_values P(( extern void _DtCm_free_attribute_values(
uint size, uint size,
CSA_attribute *attrs)); CSA_attribute *attrs);
extern void _DtCm_free_cms_attribute_value P(( extern void _DtCm_free_cms_attribute_value(
cms_attribute_value *val)); cms_attribute_value *val);
extern void _DtCm_free_attribute_value P(( extern void _DtCm_free_attribute_value(
CSA_attribute_value *val)); 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(( extern char *_DtCm_old_reminder_name_to_name(
char *oldname)); char *oldname);
extern int _DtCm_old_reminder_name_to_index P(( extern int _DtCm_old_reminder_name_to_index(
char *name)); 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, 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, 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, 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, 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, char *strval,
cms_attribute_value **val, 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, 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, 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_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, 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, 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, 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, char *strval,
CSA_attribute_value **attrval, CSA_attribute_value **attrval,
CSA_enum type)); CSA_enum type);
extern void _DtCm_get_attribute_types(uint size, int *types); extern void _DtCm_get_attribute_types(uint size, int *types);

44
cde/lib/csa/calendar.h
View file

@ -82,49 +82,49 @@ extern Calendar *_DtCm_active_cal_list;
/* function prototypes */ /* function prototypes */
extern Calendar * _DtCm_new_Calendar P(( extern Calendar * _DtCm_new_Calendar(
const char *calenadr)); const char *calenadr);
extern void _DtCm_free_Calendar P(( extern void _DtCm_free_Calendar(
Calendar *cal)); Calendar *cal);
extern Calendar *_DtCm_get_Calendar P(( extern Calendar *_DtCm_get_Calendar(
CSA_session_handle calhandle)); CSA_session_handle calhandle);
extern uint _DtCm_add_to_entry_list P(( extern uint _DtCm_add_to_entry_list(
Calendar *cal, 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, Calendar *cal,
caddr_t head, 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, Calendar *cal,
CSA_uint32 *num_names_r, 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, 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, Calendar *cal,
CSA_uint32 *num_attrs, 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, Calendar *cal,
CSA_uint32 num_names, CSA_uint32 num_names,
CSA_attribute_reference *names, CSA_attribute_reference *names,
CSA_uint32 *num_attrs, CSA_uint32 *num_attrs,
CSA_attribute **attrs)); CSA_attribute **attrs);
extern void _DtCm_reset_cal_attrs P(( extern void _DtCm_reset_cal_attrs(
Calendar *cal)); Calendar *cal);
extern void _DtCm_count_entry_in_list P(( extern void _DtCm_count_entry_in_list(
caddr_t elist)); caddr_t elist);
#endif #endif

16
cde/lib/csa/cmsdata.h
View file

@ -40,21 +40,21 @@
extern _DtCmNameTable *_DtCm_cal_name_tbl; extern _DtCmNameTable *_DtCm_cal_name_tbl;
extern _DtCmNameTable *_DtCm_entry_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,
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, uint *num_attr,
cms_attribute **attrs, cms_attribute **attrs,
cms_attribute *attr)); cms_attribute *attr);
#endif #endif

22
cde/lib/csa/cmxdr.h
View file

@ -39,27 +39,27 @@
* xdr routines for xapia csa data structures * 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 #endif

24
cde/lib/csa/connection.h
View file

@ -73,40 +73,40 @@ typedef struct conn {
} _DtCm_Connection; } _DtCm_Connection;
#ifdef SunOS #ifdef SunOS
extern enum clnt_stat _DtCm_clnt_call P(( extern enum clnt_stat _DtCm_clnt_call(
_DtCm_Connection *conn, _DtCm_Connection *conn,
u_long proc, u_long proc,
xdrproc_t inproc, xdrproc_t inproc,
caddr_t in, caddr_t in,
xdrproc_t outproc, xdrproc_t outproc,
caddr_t out, caddr_t out,
struct timeval tout)); struct timeval tout);
#endif #endif
extern CSA_return_code _DtCm_add_registration P(( extern CSA_return_code _DtCm_add_registration(
_DtCm_Client_Info *ci, _DtCm_Client_Info *ci,
char *cal, 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, _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, char *host,
int version, int version,
int timeout, 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, char *host,
int version, int version,
int timeout, 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 #endif

16
cde/lib/csa/convert2-4.h
View file

@ -37,13 +37,13 @@
rpc.cmsd version 4 data types rpc.cmsd version 4 data types
*/ */
extern Table_Args_4 *_DtCm_tableargs2_to_tableargs4 P((Table_Args_2*)); extern Table_Args_4 *_DtCm_tableargs2_to_tableargs4(Table_Args_2*);
extern Table_Args_4 *_DtCm_tabledelargs2_to_tabledelargs4 P((Table_Args_2*, Options_4)); extern Table_Args_4 *_DtCm_tabledelargs2_to_tabledelargs4(Table_Args_2*, Options_4);
extern Registration_4 *_DtCm_reg2_to_reg4 P((Registration_2*)); extern Registration_4 *_DtCm_reg2_to_reg4(Registration_2*);
extern Access_Args_4 *_DtCm_accargs2_to_accargs4 P((Access_Args_2*)); extern Access_Args_4 *_DtCm_accargs2_to_accargs4(Access_Args_2*);
extern Table_Res_4 *_DtCm_tableres2_to_tableres4 P((Table_Res_2*)); extern Table_Res_4 *_DtCm_tableres2_to_tableres4(Table_Res_2*);
extern Table_Status_4 _DtCm_tablestat2_to_tablestat4 P((Table_Status_2)); extern Table_Status_4 _DtCm_tablestat2_to_tablestat4(Table_Status_2);
extern Access_Status_4 _DtCm_accstat2_to_accstat4 P((Access_Status_2)); extern Access_Status_4 _DtCm_accstat2_to_accstat4(Access_Status_2);
extern Registration_Status_4 _DtCm_regstat2_to_regstat4 P((Registration_Status_2)); extern Registration_Status_4 _DtCm_regstat2_to_regstat4(Registration_Status_2);
#endif #endif

16
cde/lib/csa/convert3-4.h
View file

@ -37,13 +37,13 @@
rpc.cmsd version 4 data types rpc.cmsd version 4 data types
*/ */
extern Table_Args_4 *_DtCm_tableargs3_to_tableargs4 P((Table_Args_3*)); extern Table_Args_4 *_DtCm_tableargs3_to_tableargs4(Table_Args_3*);
extern Table_Args_4 *_DtCm_tabledelargs3_to_tabledelargs4 P((Table_Args_3*, Options_4)); extern Table_Args_4 *_DtCm_tabledelargs3_to_tabledelargs4(Table_Args_3*, Options_4);
extern Registration_4 *_DtCm_reg3_to_reg4 P((Registration_3*)); extern Registration_4 *_DtCm_reg3_to_reg4(Registration_3*);
extern Access_Args_4 *_DtCm_accargs3_to_accargs4 P((Access_Args_3*)); extern Access_Args_4 *_DtCm_accargs3_to_accargs4(Access_Args_3*);
extern Table_Res_4 *_DtCm_tableres3_to_tableres4 P((Table_Res_3*)); extern Table_Res_4 *_DtCm_tableres3_to_tableres4(Table_Res_3*);
extern Table_Status_4 _DtCm_tablestat3_to_tablestat4 P((Table_Status_3)); extern Table_Status_4 _DtCm_tablestat3_to_tablestat4(Table_Status_3);
extern Access_Status_4 _DtCm_accstat3_to_accstat4 P((Access_Status_3)); extern Access_Status_4 _DtCm_accstat3_to_accstat4(Access_Status_3);
extern Registration_Status_4 _DtCm_regstat3_to_regstat4 P((Registration_Status_3)); extern Registration_Status_4 _DtCm_regstat3_to_regstat4(Registration_Status_3);
#endif #endif

26
cde/lib/csa/convert4-2.h
View file

@ -37,18 +37,18 @@
rpc.cmsd version 2 data types rpc.cmsd version 2 data types
*/ */
extern Table_Res_2 *_DtCm_tableres4_to_tableres2 P((Table_Res_4 *)); extern Table_Res_2 *_DtCm_tableres4_to_tableres2(Table_Res_4 *);
extern Table_Status_2 _DtCm_tablestat4_to_tablestat2 P((Table_Status_4)); extern Table_Status_2 _DtCm_tablestat4_to_tablestat2(Table_Status_4);
extern Registration_Status_2 _DtCm_regstat4_to_regstat2 P((Registration_Status_4)); extern Registration_Status_2 _DtCm_regstat4_to_regstat2(Registration_Status_4);
extern Access_Status_2 _DtCm_accstat4_to_accstat2 P((Access_Status_4)); extern Access_Status_2 _DtCm_accstat4_to_accstat2(Access_Status_4);
extern Access_Args_2 *_DtCm_accargs4_to_accargs2 P((Access_Args_4*)); extern Access_Args_2 *_DtCm_accargs4_to_accargs2(Access_Args_4*);
extern Uid_2 *_DtCm_uid4_to_uid2 P((Uid_4*)); extern Uid_2 *_DtCm_uid4_to_uid2(Uid_4*);
extern Range_2 *_DtCm_range4_to_range2 P((Range_4*)); extern Range_2 *_DtCm_range4_to_range2(Range_4*);
extern Appt_2 *_DtCm_appt4_to_appt2 P((Appt_4*)); extern Appt_2 *_DtCm_appt4_to_appt2(Appt_4*);
extern void _DtCm_id4_to_id2 P((Id_4*, Id_2*)); extern void _DtCm_id4_to_id2(Id_4*, Id_2*);
extern Access_Entry_2 *_DtCm_acclist4_to_acclist2 P((Access_Entry_4*)); extern Access_Entry_2 *_DtCm_acclist4_to_acclist2(Access_Entry_4*);
extern Uid_2 *_DtCm_uidopt4_to_uid2 P((Uidopt_4*)); extern Uid_2 *_DtCm_uidopt4_to_uid2(Uidopt_4*);
extern void _DtCm_free_attr2 P((Attribute_2 *a)); extern void _DtCm_free_attr2(Attribute_2 *a);
extern void _DtCm_free_appt2 P((Appt_2 *a)); extern void _DtCm_free_appt2(Appt_2 *a);
#endif #endif

28
cde/lib/csa/convert4-3.h
View file

@ -37,19 +37,19 @@
rpc.cmsd version 3 data types rpc.cmsd version 3 data types
*/ */
extern Table_Res_3 *_DtCm_tableres4_to_tableres3 P((Table_Res_4*)); extern Table_Res_3 *_DtCm_tableres4_to_tableres3(Table_Res_4*);
extern Table_Status_3 _DtCm_tablestat4_to_tablestat3 P((Table_Status_4)); extern Table_Status_3 _DtCm_tablestat4_to_tablestat3(Table_Status_4);
extern Registration_Status_3 _DtCm_regstat4_to_regstat3 P((Registration_Status_4)); extern Registration_Status_3 _DtCm_regstat4_to_regstat3(Registration_Status_4);
extern Access_Status_3 _DtCm_accstat4_to_accstat3 P((Access_Status_4)); extern Access_Status_3 _DtCm_accstat4_to_accstat3(Access_Status_4);
extern Access_Args_3 *_DtCm_accargs4_to_accargs3 P((Access_Args_4*)); extern Access_Args_3 *_DtCm_accargs4_to_accargs3(Access_Args_4*);
extern Uid_3 *_DtCm_uid4_to_uid3 P((Uid_4*)); extern Uid_3 *_DtCm_uid4_to_uid3(Uid_4*);
extern Range_3 *_DtCm_range4_to_range3 P((Range_4*)); extern Range_3 *_DtCm_range4_to_range3(Range_4*);
extern Appt_3 *_DtCm_appt4_to_appt3 P((Appt_4*)); extern Appt_3 *_DtCm_appt4_to_appt3(Appt_4*);
extern void _DtCm_id4_to_id3 P((Id_4*, Id_3*)); extern void _DtCm_id4_to_id3(Id_4*, Id_3*);
extern Access_Entry_3 *_DtCm_acclist4_to_acclist3 P((Access_Entry_4*)); extern Access_Entry_3 *_DtCm_acclist4_to_acclist3(Access_Entry_4*);
extern Keyrange_3 *_DtCm_keyrange4_to_keyrange3 P((Keyrange_4*)); extern Keyrange_3 *_DtCm_keyrange4_to_keyrange3(Keyrange_4*);
extern Uid_3 *_DtCm_uidopt4_to_uid3 P((Uidopt_4*)); extern Uid_3 *_DtCm_uidopt4_to_uid3(Uidopt_4*);
extern void _DtCm_free_attr3 P((Attribute_3 *a)); extern void _DtCm_free_attr3(Attribute_3 *a);
extern void _DtCm_free_appt3 P((Appt_3 *appts)); extern void _DtCm_free_appt3(Appt_3 *appts);
#endif #endif

22
cde/lib/csa/convert4-5.h
View file

@ -39,29 +39,29 @@
/* /*
* functions to convert v4 data structures * 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, 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, char *calname,
Appt_4 *a4, Appt_4 *a4,
uint num_attrs, uint num_attrs,
cms_attribute *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, Attribute_4 *remval,
cms_attribute_value **attrval)); cms_attribute_value **attrval);
#endif #endif

52
cde/lib/csa/convert5-4.h
View file

@ -39,61 +39,61 @@
/* /*
* conversion routines for rpc.cmsd version 5 to rpc.cmsd version 4 data types * 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, uint num_attrs,
cms_attribute *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, uint size,
CSA_attribute *attrs, 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, 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, uint num_attrs,
CSA_attribute *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, 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, 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, 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, int val,
Interval_4 *period)); Interval_4 *period);
extern int _DtCm_status_to_apptstatus4 P(( extern int _DtCm_status_to_apptstatus4(
int val, 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, 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 *type,
cms_attribute_value *stype, 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, char *rem,
CSA_reminder * val, CSA_reminder * val,
Appt_4 *appt)); Appt_4 *appt);
extern int _DtCmAccessRightToV4AccessType P((unsigned int access)); extern int _DtCmAccessRightToV4AccessType(unsigned int access);
#endif #endif

4
cde/lib/csa/debug.h
View file

@ -39,8 +39,8 @@
#define DP(a) #define DP(a)
#endif /* CM_DEBUG */ #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 */ #endif /* _DEBUG_H */

62
cde/lib/csa/entry.h
View file

@ -52,76 +52,76 @@ typedef struct _libentry {
/* function prototypes */ /* 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, 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, _DtCm_libentry *entry,
CSA_uint32 *num_names_r, 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, _DtCm_libentry *entry,
CSA_uint32 num_names, CSA_uint32 num_names,
CSA_attribute_reference *names, CSA_attribute_reference *names,
CSA_uint32 *num_attrs, 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, _DtCm_libentry *entry,
CSA_uint32 *num_attrs, 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, _DtCm_libentry *elist,
CSA_uint32 *size, 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, _DtCmNameTable **tbl,
cms_entry *entries, 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, char *calname,
Appt_4 *appt4, 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, _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, Reminder_4 *r4,
CSA_uint32 *num_rems, 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 *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, 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, 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, cms_reminder_ref *cmsrems,
CSA_uint32 *num_rems, CSA_uint32 *num_rems,
CSA_reminder_reference **csarems)); CSA_reminder_reference **csarems);
#endif #endif

2
cde/lib/csa/free.h
View file

@ -49,7 +49,7 @@ extern void *_DtCm_alloc_entry();
extern CSA_return_code _DtCm_free(void *ptr); 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 #endif

8
cde/lib/csa/hash.h
View file

@ -33,13 +33,13 @@
#include "ansi_c.h" #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 */ #endif /* _HASH_H */

4
cde/lib/csa/laccess.h
View file

@ -33,8 +33,8 @@
#include "ansi_c.h" #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 #endif

12
cde/lib/csa/lutil.h
View file

@ -33,16 +33,16 @@
#include "ansi_c.h" #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 #endif

44
cde/lib/csa/match.h
View file

@ -36,7 +36,7 @@
#include "cm.h" #include "cm.h"
#include "rtable4.h" #include "rtable4.h"
extern CSA_return_code _DtCmHashCriteria P(( extern CSA_return_code _DtCmHashCriteria(
_DtCmNameTable *tbl, _DtCmNameTable *tbl,
CSA_uint32 num_attrs, CSA_uint32 num_attrs,
CSA_attribute *csaattrs, CSA_attribute *csaattrs,
@ -52,14 +52,14 @@ extern CSA_return_code _DtCmHashCriteria P((
long *id, long *id,
CSA_uint32 *hnum, CSA_uint32 *hnum,
cms_attribute **hattrs, cms_attribute **hattrs,
CSA_enum **hops)); CSA_enum **hops);
extern void _DtCmFreeHashedArrays P(( extern void _DtCmFreeHashedArrays(
CSA_uint32 hnum, CSA_uint32 hnum,
cms_attribute *hattrs, 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, Appt_4 *appts,
long id, long id,
boolean_t no_end_time_range, boolean_t no_end_time_range,
@ -67,7 +67,7 @@ extern Appt_4 *_DtCm_match_appts P((
time_t end2, time_t end2,
CSA_uint32 num_attrs, CSA_uint32 num_attrs,
cms_attribute *attrs, cms_attribute *attrs,
CSA_enum *ops)); CSA_enum *ops);
extern boolean_t _DtCm_match_one_appt( extern boolean_t _DtCm_match_one_appt(
Appt_4 *appt, Appt_4 *appt,
@ -75,45 +75,45 @@ extern boolean_t _DtCm_match_one_appt(
cms_attribute * attrs, cms_attribute * attrs,
CSA_enum *ops); CSA_enum *ops);
extern Reminder_4 *_DtCm_match_reminders P(( extern Reminder_4 *_DtCm_match_reminders(
Reminder_4 *rems, Reminder_4 *rems,
uint num_names, uint num_names,
char **names)); char **names);
extern CSA_return_code _DtCm_check_operator P(( extern CSA_return_code _DtCm_check_operator(
uint size, uint size,
CSA_attribute *csaattrs, CSA_attribute *csaattrs,
cms_attribute *cmsattrs, 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 *val1,
cms_attribute_value *val2, 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 *val1,
cms_attribute_value *val2, 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 *val1,
cms_attribute_value *val2, 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 *val1,
cms_attribute_value *val2, 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 *val1,
cms_attribute_value *val2, 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 *val1,
cms_attribute_value *val2, cms_attribute_value *val2,
CSA_enum op)); CSA_enum op);
#endif #endif

18
cde/lib/csa/nametbl.h
View file

@ -52,22 +52,22 @@ typedef struct {
char **names; char **names;
} _DtCmNameTable; } _DtCmNameTable;
extern _DtCmNameTable *_DtCm_make_name_table P(( extern _DtCmNameTable *_DtCm_make_name_table(
int size, 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, _DtCmNameTable *tbl,
int index, int index,
char *newname)); char *newname);
extern int _DtCm_get_index_from_table P(( extern int _DtCm_get_index_from_table(
_DtCmNameTable *tbl, _DtCmNameTable *tbl,
char *name)); char *name);
extern CSA_return_code _DtCmExtendNameTable P(( extern CSA_return_code _DtCmExtendNameTable(
char *name, char *name,
int index, int index,
int type, int type,
@ -75,7 +75,7 @@ extern CSA_return_code _DtCmExtendNameTable P((
int basesize, int basesize,
char **basenames, char **basenames,
_DtCmNameTable **tbl, _DtCmNameTable **tbl,
int **types)); int **types);
#endif /* _NAMETBL_H */ #endif /* _NAMETBL_H */

68
cde/lib/csa/rpccalls.h
View file

@ -40,98 +40,98 @@
* interface to cm rpc calls * 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, Calendar *cal,
CSA_uint32 num_attrs, 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, 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, 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, Calendar *cal,
_DtCm_libentry *entry, _DtCm_libentry *entry,
time_t start, time_t start,
time_t end, 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, Calendar *cal,
CSA_uint32 size, CSA_uint32 size,
CSA_attribute * attrs, CSA_attribute * attrs,
CSA_enum *ops, 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, 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, Calendar *cal,
time_t tick, time_t tick,
CSA_uint32 num_names, CSA_uint32 num_names,
char **reminder_names, char **reminder_names,
CSA_uint32 *num_rems, 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, Calendar *cal,
CSA_uint32 num_attrs, 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, Calendar *cal,
int index, int index,
CSA_uint32 num_attrs, 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, Calendar *cal,
CSA_uint32 num_attrs, CSA_uint32 num_attrs,
CSA_attribute * 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, Calendar *cal,
_DtCm_libentry *entry, _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, Calendar *cal,
_DtCm_libentry *oentry, _DtCm_libentry *oentry,
CSA_uint32 num_attrs, CSA_uint32 num_attrs,
CSA_attribute * attrs, CSA_attribute * attrs,
CSA_enum scope, 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, Calendar *cal,
CSA_uint32 *number_names, 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, char *location,
CSA_uint32 *number_names, 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, _DtCm_Connection *conn,
char *cal, 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, _DtCm_Connection *conn,
char *cal, char *cal,
unsigned long update_type)); unsigned long update_type);
#endif #endif

50
cde/lib/csa/table.h
View file

@ -42,24 +42,24 @@
* Interface to rpc calls of version 2-4 * 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, 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, 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, Calendar *cal,
CSA_uint32 num_names, CSA_uint32 num_names,
char **reminder_names, char **reminder_names,
CSA_uint32 *num_rems, 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, Calendar *cal,
long start1, long start1,
long start2, long start2,
@ -70,11 +70,11 @@ extern CSA_return_code _DtCm_table_lookup_range P((
uint num_attrs, uint num_attrs,
cms_attribute *attrs, cms_attribute *attrs,
CSA_enum *ops, 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, Calendar *cal,
_DtCm_libentry *entry)); _DtCm_libentry *entry);
/* /*
* This routine looks up events of a repeating sequence. * 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 * in the key of the first entry which will be returned in the cms_key
* structure pointed to by 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, Calendar *cal,
_DtCm_libentry *entry, _DtCm_libentry *entry,
long id, long id,
time_t start, time_t start,
time_t end, time_t end,
cms_key *key, 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, Calendar *cal,
uint num_attrs, uint num_attrs,
CSA_attribute * 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, Calendar *cal,
_DtCm_libentry *entry, _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, Calendar *cal,
_DtCm_libentry *oentry, _DtCm_libentry *oentry,
uint num_attrs, uint num_attrs,
CSA_attribute * attrs, CSA_attribute * attrs,
CSA_enum scope, 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, 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, _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, _DtCm_Connection *conn,
char *cal)); char *cal);
#endif #endif

32
cde/lib/csa/updateattrs.h
View file

@ -37,7 +37,7 @@
#include "cm.h" #include "cm.h"
#include "nametbl.h" #include "nametbl.h"
extern CSA_return_code _DtCmUpdateAttributes P(( extern CSA_return_code _DtCmUpdateAttributes(
uint numsrc, uint numsrc,
cms_attribute *srcattrs, cms_attribute *srcattrs,
uint *numdst, uint *numdst,
@ -45,34 +45,34 @@ extern CSA_return_code _DtCmUpdateAttributes P((
_DtCmNameTable **tbl, _DtCmNameTable **tbl,
boolean_t caltbl, boolean_t caltbl,
int **types, int **types,
boolean_t makecopy)); boolean_t makecopy);
extern CSA_return_code _DtCmUpdateAttribute P(( extern CSA_return_code _DtCmUpdateAttribute(
cms_attribute *from, 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 *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 *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 *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 *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 *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 *newval,
cms_attribute_value **attrval)); cms_attribute_value **attrval);
#endif #endif

2
cde/lib/csa/xtclient.h
View file

@ -34,6 +34,6 @@
#include <X11/Intrinsic.h> #include <X11/Intrinsic.h>
#include "ansi_c.h" #include "ansi_c.h"
extern void _DtCm_register_xtcallback P((XtAppContext appct)); extern void _DtCm_register_xtcallback(XtAppContext appct);
#endif /* _XTCLIENT_H */ #endif /* _XTCLIENT_H */

8
cde/lib/tt/bin/dbck/spec.C
View file

@ -44,14 +44,6 @@
#include "ttdbck.h" #include "ttdbck.h"
#include "tt_db_server_consts.h" #include "tt_db_server_consts.h"
#if !defined(OPT_STRERROR)
// No strerror(), fake it
char *
strerror(int e)
{
return ((e<sys_nerr) ? sys_errlist[e] : "unknown");
}
#endif
Spec:: Spec::
Spec() Spec()

2
cde/lib/tt/bin/ttauth/ttauth.man
View file

@ -18,7 +18,7 @@
.\" not be used in advertising or otherwise to promote the sale, use or .\" not be used in advertising or otherwise to promote the sale, use or
.\" other dealings in this Software without prior written authorization .\" other dealings in this Software without prior written authorization
.\" from The Open Group. .\" from The Open Group.
.TH TTAUTH 1 "Release 2.3.1a" "CDE" .TH TTAUTH 1 "Release 2.3.2a" "CDE"
.SH NAME .SH NAME
ttauth \- ToolTalk authority file utility ttauth \- ToolTalk authority file utility
.SH SYNOPSIS .SH SYNOPSIS

14
cde/lib/tt/bin/tttar/tttar_file_utils.C
View file

@ -231,8 +231,8 @@ realtrees( _Tt_string_list_ptr paths, bool_t follow_symlinks )
* symlink instead of the path of the * symlink instead of the path of the
* linked file. * linked file.
*/ */
char *dir = dirname( (char *)path ); char *dir = dirname_tt( (char *)path );
char *base = basename( (char *)path ); char *base = basename_tt( (char *)path );
resolved_path = _tt_get_realpath( dir, resolved_path = _tt_get_realpath( dir,
resolved_path_buf ); resolved_path_buf );
if (resolved_path != NULL) { if (resolved_path != NULL) {
@ -354,10 +354,9 @@ append_real_subtrees( _Tt_string_list_ptr realtrees, _Tt_string path )
} /* append_real_subtrees() */ } /* append_real_subtrees() */
/* /*
* basename() - Return the last component of a pathname. * basename_tt() - Return the last component of a pathname.
*/ */
#if !defined(__linux__) char *basename_tt( char *pathname ) {
char *basename( char *pathname ) {
char *the_basename; char *the_basename;
the_basename = strrchr( pathname, '/' ); the_basename = strrchr( pathname, '/' );
@ -368,14 +367,13 @@ char *basename( char *pathname ) {
} }
return the_basename; return the_basename;
} }
#endif
/* /*
* dirname() - Return the pathname minus the basename, or "." if the * dirname_tt() - Return the pathname minus the basename, or "." if the
* basename is all there is. Caller is responsible for free()ing * basename is all there is. Caller is responsible for free()ing
* the storage returned. * the storage returned.
*/ */
char *dirname( char *pathname ) { char *dirname_tt( char *pathname ) {
char *the_basename; char *the_basename;
char *the_dirname; char *the_dirname;

4
cde/lib/tt/bin/tttar/tttar_file_utils.h
View file

@ -49,7 +49,7 @@ _Tt_string_list_ptr realtrees( _Tt_string_list_ptr paths,
bool_t follow_symlinks ); bool_t follow_symlinks );
void append_real_subtrees( _Tt_string_list_ptr realtrees, void append_real_subtrees( _Tt_string_list_ptr realtrees,
_Tt_string path ); _Tt_string path );
char *basename( char *pathname ); char *basename_tt( char *pathname );
char *dirname( char *pathname ); char *dirname_tt( char *pathname );
#endif /* _LSTAR_FILE_UTILS_H */ #endif /* _LSTAR_FILE_UTILS_H */

12
cde/lib/tt/lib/tt_options.h
View file

@ -107,10 +107,6 @@
* OPT_CPP_OPTIONS - string, options to pass to cpp. For example, on * OPT_CPP_OPTIONS - string, options to pass to cpp. For example, on
* some platforms -B is used so C++ comments are processed by cpp. * some platforms -B is used so C++ comments are processed by cpp.
* *
*
* OPT_STRERROR - set if strerror() is available, otherwise we assume
* global symbol sys_errlist is defined in errno.h.
*
* OPT_SVR4_GETMNTENT - set to use new SVR4 flavor of getmntent. * OPT_SVR4_GETMNTENT - set to use new SVR4 flavor of getmntent.
* *
* OPT_LOCKF_MNTTAB - set to hold a lockf lock on MNTTAB while doing * OPT_LOCKF_MNTTAB - set to hold a lockf lock on MNTTAB while doing
@ -242,7 +238,6 @@
# undef OPT_SYSINFO # undef OPT_SYSINFO
# define OPT_CPP_PATH "/usr/ccs/lib/cpp" # define OPT_CPP_PATH "/usr/ccs/lib/cpp"
# define OPT_CPP_OPTIONS "" # define OPT_CPP_OPTIONS ""
# define OPT_STRERROR
# undef OPT_SVR4_GETMNTENT # undef OPT_SVR4_GETMNTENT
# undef OPT_LOCKF_MNTENT # undef OPT_LOCKF_MNTENT
# define OPT_DEFINE_SIG_PF # define OPT_DEFINE_SIG_PF
@ -273,7 +268,6 @@
# undef OPT_SYSINFO # undef OPT_SYSINFO
# define OPT_CPP_PATH "/usr/lib/cpp" # define OPT_CPP_PATH "/usr/lib/cpp"
# define OPT_CPP_OPTIONS "-B" # define OPT_CPP_OPTIONS "-B"
# undef OPT_STRERROR
# undef OPT_SVR4_GETMNTENT # undef OPT_SVR4_GETMNTENT
# undef OPT_LOCKF_MNTENT # undef OPT_LOCKF_MNTENT
# define OPT_LOCAL_MOUNT_TYPE MNTTYPE_42 # define OPT_LOCAL_MOUNT_TYPE MNTTYPE_42
@ -302,7 +296,6 @@
# define OPT_CATGETS # define OPT_CATGETS
# undef OPT_GETDTABLESIZE # undef OPT_GETDTABLESIZE
# define OPT_SYSINFO # define OPT_SYSINFO
# define OPT_STRERROR
# define OPT_CPP_PATH "/usr/ccs/lib/cpp" # define OPT_CPP_PATH "/usr/ccs/lib/cpp"
# define OPT_CPP_OPTIONS "-B" # define OPT_CPP_OPTIONS "-B"
# define OPT_SVR4_GETMNTENT # define OPT_SVR4_GETMNTENT
@ -389,7 +382,6 @@
# define OPT_CPP_PATH "/opt/langtools/lbin/cpp" # define OPT_CPP_PATH "/opt/langtools/lbin/cpp"
# endif # endif
# define OPT_CPP_OPTIONS "" # define OPT_CPP_OPTIONS ""
# define OPT_STRERROR
# undef OPT_SVR4_GETMNTENT # undef OPT_SVR4_GETMNTENT
# undef OPT_LOCKF_MNTENT # undef OPT_LOCKF_MNTENT
# define OPT_LOCAL_MOUNT_TYPE MNTTYPE_HFS # define OPT_LOCAL_MOUNT_TYPE MNTTYPE_HFS
@ -415,7 +407,6 @@
# undef OPT_SYSINFO # undef OPT_SYSINFO
# define OPT_CPP_PATH "/usr/bin/cpp" # define OPT_CPP_PATH "/usr/bin/cpp"
# define OPT_CPP_OPTIONS "" # define OPT_CPP_OPTIONS ""
# define OPT_STRERROR
# undef OPT_SVR4_GETMNTENT # undef OPT_SVR4_GETMNTENT
# undef OPT_LOCKF_MNTENT # undef OPT_LOCKF_MNTENT
# define OPT_LOCAL_MOUNT_TYPE "ext2fs" # define OPT_LOCAL_MOUNT_TYPE "ext2fs"
@ -446,7 +437,6 @@
# undef OPT_SYSINFO # undef OPT_SYSINFO
# define OPT_CPP_PATH "/usr/libexec/cpp" # define OPT_CPP_PATH "/usr/libexec/cpp"
# define OPT_CPP_OPTIONS "" # define OPT_CPP_OPTIONS ""
# define OPT_STRERROR
# undef OPT_SVR4_GETMNTENT # undef OPT_SVR4_GETMNTENT
# undef OPT_LOCKF_MNTENT # undef OPT_LOCKF_MNTENT
# define OPT_LOCAL_MOUNT_TYPE MNTTYPE_UFS # define OPT_LOCAL_MOUNT_TYPE MNTTYPE_UFS
@ -479,7 +469,6 @@
# define OPT_CPP_PATH "/usr/libexec/cpp" # define OPT_CPP_PATH "/usr/libexec/cpp"
# endif # endif
# define OPT_CPP_OPTIONS "" # define OPT_CPP_OPTIONS ""
# define OPT_STRERROR
# undef OPT_SVR4_GETMNTENT # undef OPT_SVR4_GETMNTENT
# undef OPT_LOCKF_MNTENT # undef OPT_LOCKF_MNTENT
# define OPT_LOCAL_MOUNT_TYPE MNTTYPE_UFS # define OPT_LOCAL_MOUNT_TYPE MNTTYPE_UFS
@ -509,7 +498,6 @@
# undef OPT_SYSINFO # undef OPT_SYSINFO
# define OPT_CPP_PATH "/usr/bin/cpp" # define OPT_CPP_PATH "/usr/bin/cpp"
# define OPT_CPP_OPTIONS "" # define OPT_CPP_OPTIONS ""
# define OPT_STRERROR
# undef OPT_SVR4_GETMNTENT # undef OPT_SVR4_GETMNTENT
# undef OPT_LOCKF_MNTENT # undef OPT_LOCKF_MNTENT
# define OPT_LOCAL_MOUNT_TYPE MNTTYPE_UFS # define OPT_LOCAL_MOUNT_TYPE MNTTYPE_UFS

2
cde/lib/tt/tooltalk.tmpl
View file

@ -6,7 +6,7 @@
/* TT_VERSION defines the version string which is imbedded in all the */ /* TT_VERSION defines the version string which is imbedded in all the */
/* binaries and shipped libraries. */ /* binaries and shipped libraries. */
TT_VERSION = "CDE Version 2.3.1a" TT_VERSION = "CDE Version 2.3.2a"
TT_VERSION_DEFINE = -DTT_VERSION_STRING=\"$(TT_VERSION)\" TT_VERSION_DEFINE = -DTT_VERSION_STRING=\"$(TT_VERSION)\"

2
cde/programs/dtappbuilder/src/ab/ab_bil.c
View file

@ -88,7 +88,7 @@ static int print_load_stats(
ABProfiledInterval configTime ABProfiledInterval configTime
); );
char Buf[MAXPATHLEN]; /* Work buffer */ extern char Buf[MAXPATHLEN]; /* Work buffer */
/* /*
* Loads in a new project, replacing the current project. * Loads in a new project, replacing the current project.

2
cde/programs/dtappbuilder/src/ab/cgen_utils.c
View file

@ -108,7 +108,7 @@ typedef enum
} CG_STATUS; } CG_STATUS;
CGenOptions CodeGenOptions; extern CGenOptions CodeGenOptions;
StringList user_env_vars = NULL; StringList user_env_vars = NULL;
StringList module_list = NULL; StringList module_list = NULL;
static CG_GOAL user_goal = CG_GOAL_UNDEF; static CG_GOAL user_goal = CG_GOAL_UNDEF;

2
cde/programs/dtappbuilder/src/ab/proj.c
View file

@ -228,7 +228,7 @@ static XtTranslations proj_transtbl = NULL;
static XRectangle *rband_rect = NULL; static XRectangle *rband_rect = NULL;
static Boolean mselect_adjust = False; static Boolean mselect_adjust = False;
char Buf[MAXPATHLEN]; /* Work buffer */ extern char Buf[MAXPATHLEN]; /* Work buffer */
/************************************************************************* /*************************************************************************
** **

2
cde/programs/dtappbuilder/src/ab/projP_utils.c
View file

@ -93,7 +93,7 @@ static void mult_module_selected(
** ** ** **
**************************************************************************/ **************************************************************************/
char Buf[MAXPATHLEN]; /* Work buffer */ extern char Buf[MAXPATHLEN]; /* Work buffer */
/************************************************************************* /*************************************************************************
** ** ** **

2
cde/programs/dtappbuilder/src/ab/proj_utils.c
View file

@ -79,7 +79,7 @@
const char mod_path[] = "*proj_mod_path"; const char mod_path[] = "*proj_mod_path";
const char proj_path[] = "*proj_proj_path"; const char proj_path[] = "*proj_proj_path";
char Buf[MAXPATHLEN]; /* Work buffer */ extern char Buf[MAXPATHLEN]; /* Work buffer */
/* Whether we are to export a module as BIL (default) or UIL */ /* Whether we are to export a module as BIL (default) or UIL */
static BOOL ExportAsUIL = FALSE; static BOOL ExportAsUIL = FALSE;

6
cde/programs/dtappbuilder/src/abmf/write_c.c
View file

@ -350,10 +350,10 @@ write_func_def_params(
va_list va_params va_list va_params
) )
{ {
#if defined(__ppc) || defined(__linux__) #if defined(va_copy) || defined(CSRG_BASED)
#define va_start_params() __va_copy(params, va_params)
#elif defined(CSRG_BASED)
#define va_start_params() va_copy(params, va_params) #define va_start_params() va_copy(params, va_params)
#elif defined(__ppc) || defined(__linux__)
#define va_start_params() __va_copy(params, va_params)
#else #else
#define va_start_params() (params = va_params) #define va_start_params() (params = va_params)
#endif #endif

2
cde/programs/dtappbuilder/src/libABil/bil_loadfile.c
View file

@ -60,7 +60,7 @@
#include "bilP.h" #include "bilP.h"
BIL_LOAD_INFO bilP_load; BIL_LOAD_INFO bilP_load;
char Buf[MAXPATHLEN]; static char Buf[MAXPATHLEN];
/* /*
* Read a BIL file into memory. Returns a project node. * Read a BIL file into memory. Returns a project node.

104
cde/programs/dtcalc/calctool.c
View file

@ -318,7 +318,7 @@ clear_display(void)
v->defState = 1 ; v->defState = 1 ;
i = 0 ; i = 0 ;
mpcim(&i, v->MPdisp_val) ; 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) ; set_item(DISPLAYITEM, v->display) ;
v->hyperbolic = 0 ; v->hyperbolic = 0 ;
@ -419,7 +419,7 @@ void
doerr(char *errmes) doerr(char *errmes)
{ {
if (!v->started) return ; if (!v->started) return ;
STRCPY(v->display, errmes) ; strcpy(v->display, errmes) ;
set_item(DISPLAYITEM, v->display) ; set_item(DISPLAYITEM, v->display) ;
v->error = 1 ; v->error = 1 ;
beep() ; beep() ;
@ -434,7 +434,7 @@ get_bool_resource(enum res_type rtype, int *boolval)
int len, n ; int len, n ;
if ((val = get_resource(rtype)) == NULL) return(0) ; if ((val = get_resource(rtype)) == NULL) return(0) ;
STRCPY(tempstr, val) ; strcpy(tempstr, val) ;
len = strlen(tempstr) ; len = strlen(tempstr) ;
for (n = 0; n < len; n++) for (n = 0; n < len; n++)
if (isupper(tempstr[n])) tempstr[n] = tolower(tempstr[n]) ; if (isupper(tempstr[n])) tempstr[n] = tolower(tempstr[n]) ;
@ -504,9 +504,9 @@ get_label(int n)
temp = buttons[n].str; temp = buttons[n].str;
if(temp != NULL) if(temp != NULL)
STRCPY(v->pstr, temp) ; strcpy(v->pstr, temp) ;
else else
STRCPY(v->pstr, ""); strcpy(v->pstr, "");
} }
/* Extract command line options. */ /* Extract command line options. */
@ -546,7 +546,7 @@ get_options(int argc, char *argv[])
sprintf(msg, opts[(int) O_MODE], next); sprintf(msg, opts[(int) O_MODE], next);
getparam(next, argv, msg) ; getparam(next, argv, msg) ;
XtFree(msg); XtFree(msg);
STRCPY(strval, next) ; strcpy(strval, next) ;
len = strlen(strval) ; len = strlen(strval) ;
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
{ {
@ -571,7 +571,7 @@ get_options(int argc, char *argv[])
break ; break ;
case 'b' : INC ; case 'b' : INC ;
getparam(next, argv, opts[(int) O_BASE]) ; getparam(next, argv, opts[(int) O_BASE]) ;
STRCPY(strval, next) ; strcpy(strval, next) ;
len = strlen(strval) ; len = strlen(strval) ;
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
{ {
@ -605,7 +605,7 @@ get_options(int argc, char *argv[])
sprintf(msg, opts[(int) O_DISPLAY], next); sprintf(msg, opts[(int) O_DISPLAY], next);
getparam(next, argv, msg) ; getparam(next, argv, msg) ;
XtFree(msg); XtFree(msg);
STRCPY(strval, next) ; strcpy(strval, next) ;
len = strlen(strval) ; len = strlen(strval) ;
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
{ {
@ -645,7 +645,7 @@ get_options(int argc, char *argv[])
sprintf(msg, opts[(int) O_TRIG], next); sprintf(msg, opts[(int) O_TRIG], next);
getparam(next, argv, msg) ; getparam(next, argv, msg) ;
XtFree(msg); XtFree(msg);
STRCPY(strval, next) ; strcpy(strval, next) ;
len = strlen(strval) ; len = strlen(strval) ;
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
{ {
@ -695,14 +695,14 @@ getparam(char *s, char *argv[], char *errmes)
{ {
char *msg; char *msg;
if (*argv != NULL && argv[0][0] != '-') STRCPY(s, *argv) ; if (*argv != NULL && argv[0][0] != '-') strcpy(s, *argv) ;
else else
{ {
msg = (char *) XtMalloc(strlen(mess[(int) MESS_PARAM]) + msg = (char *) XtMalloc(strlen(mess[(int) MESS_PARAM]) +
strlen(errmes) + 3); strlen(errmes) + 3);
sprintf(msg, mess[(int) MESS_PARAM], errmes); sprintf(msg, mess[(int) MESS_PARAM], errmes);
_DtSimpleError (v->appname, DtError, NULL, msg); _DtSimpleError (v->appname, DtError, NULL, msg);
FPRINTF(stderr, mess[(int) MESS_PARAM], errmes) ; fprintf(stderr, mess[(int) MESS_PARAM], errmes) ;
exit(1) ; exit(1) ;
} }
} }
@ -783,8 +783,8 @@ get_rcfile(char *name)
} }
else if (isval == 'f') else if (isval == 'f')
{ {
SSCANF(&line[3], "%s", tmp) ; sscanf(&line[3], "%s", tmp) ;
STRCPY(v->fun_vals[i], convert(tmp)) ; strcpy(v->fun_vals[i], convert(tmp)) ;
} }
else if (isval == 'r') else if (isval == 'r')
{ {
@ -800,18 +800,18 @@ get_rcfile(char *name)
line[strlen(line)-1] = '\0' ; line[strlen(line)-1] = '\0' ;
if (isval == 'c') if (isval == 'c')
{ {
STRCPY(tmp, make_number(v->MPcon_vals[i], TRUE)) ; strcpy(tmp, make_number(v->MPcon_vals[i], TRUE)) ;
SPRINTF(v->con_names[i], "%1d: %s [%s]", sprintf(v->con_names[i], "%1d: %s [%s]",
i, tmp, &line[n]) ; i, tmp, &line[n]) ;
} }
else else
SPRINTF(v->fun_names[i], "%1d: %s [%s]", sprintf(v->fun_names[i], "%1d: %s [%s]",
i, tmp, &line[n]) ; i, tmp, &line[n]) ;
break ; break ;
} }
} }
} }
FCLOSE(rcfd) ; fclose(rcfd) ;
} }
/* Get a string resource from database. */ /* Get a string resource from database. */
@ -822,7 +822,7 @@ get_str_resource(enum res_type rtype, char *strval)
int i, len ; int i, len ;
if ((val = get_resource(rtype)) == NULL) return(0) ; if ((val = get_resource(rtype)) == NULL) return(0) ;
STRCPY(strval, val) ; strcpy(strval, val) ;
len = strlen(strval) ; len = strlen(strval) ;
if(rtype != R_TRIG && rtype != R_DISPLAY) 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) ; len = strlen(fixed) ;
for (i = 0; i < len; i++) *optr++ = fixed[i] ; for (i = 0; i < len; i++) *optr++ = fixed[i] ;
@ -1515,7 +1515,7 @@ process_stack(int startop, int startnum, int n)
int i ; int i ;
int nptr ; /* Pointer to next number from numeric stack. */ 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 ; nptr = startnum ;
v->pending = 0 ; v->pending = 0 ;
v->cur_op = '?' ; /* Current operation is initially undefined. */ v->cur_op = '?' ; /* Current operation is initially undefined. */
@ -1546,7 +1546,7 @@ process_stack(int startop, int startnum, int n)
v->opsptr = startop - 1 ; v->opsptr = startop - 1 ;
push_op(-1) ; push_op(-1) ;
save_pending_values(KEY_LPAR) ; 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]; char save[80];
len = strlen(str) ; len = strlen(str) ;
STRCPY(save, v->display) ; strcpy(save, v->display) ;
STRCPY(v->display, " ") ; strcpy(v->display, " ") ;
set_item(DISPLAYITEM, v->display); set_item(DISPLAYITEM, v->display);
for (i = 0 ; i < len; i++) for (i = 0 ; i < len; i++)
{ {
@ -1568,7 +1568,7 @@ process_str(char *str, enum menu_type mtype)
{ {
if(mtype == M_FUN) if(mtype == M_FUN)
{ {
STRCPY(v->display, save); strcpy(v->display, save);
set_item(DISPLAYITEM, v->display); set_item(DISPLAYITEM, v->display);
v->error = 0; v->error = 0;
} }
@ -1613,11 +1613,11 @@ read_rcfiles(void) /* Read .dtcalcrc's from home and current directories. */
for (n = 0; n < MAXREGS; n++) for (n = 0; n < MAXREGS; n++)
{ {
STRCPY(tmp, make_number(v->MPcon_vals[n], FALSE)) ; strcpy(tmp, make_number(v->MPcon_vals[n], FALSE)) ;
SPRINTF(name, "%1d: %s [%s]", n, tmp, v->con_names[n]) ; sprintf(name, "%1d: %s [%s]", n, tmp, v->con_names[n]) ;
STRCPY(v->con_names[n], name) ; strcpy(v->con_names[n], name) ;
STRCPY(v->fun_vals[n], "") ; /* Initially empty function strings. */ strcpy(v->fun_vals[n], "") ; /* Initially empty function strings. */
} }
if ((home = getenv("HOME")) == NULL) if ((home = getenv("HOME")) == NULL)
@ -1638,7 +1638,7 @@ show_display(int *MPval)
{ {
if (!v->error) if (!v->error)
{ {
STRCPY(v->display, make_number(MPval, TRUE)) ; strcpy(v->display, make_number(MPval, TRUE)) ;
set_item(DISPLAYITEM, v->display) ; set_item(DISPLAYITEM, v->display) ;
} }
} }
@ -1647,9 +1647,9 @@ show_display(int *MPval)
void void
usage(char *progname) usage(char *progname)
{ {
FPRINTF(stderr, ustrs[(int) USAGE1], PATCHLEVEL) ; fprintf(stderr, ustrs[(int) USAGE1], PATCHLEVEL) ;
FPRINTF(stderr, "%s", ustrs[(int) USAGE2]) ; fprintf(stderr, "%s", ustrs[(int) USAGE2]) ;
FPRINTF(stderr, "%s", ustrs[(int) USAGE3]) ; fprintf(stderr, "%s", ustrs[(int) USAGE3]) ;
exit(1) ; 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. */ struct passwd *entry ; /* The user's /etc/passwd entry. */
rcexists = 0 ; 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 ; if (access(rcname, F_OK) == 0) rcexists = 1 ;
else 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 ; if ((entry = getpwuid(getuid())) == NULL) return ;
home = entry->pw_dir ; home = entry->pw_dir ;
} }
SPRINTF(rcname, "%s/%s", home, RCNAME) ; sprintf(rcname, "%s/%s", home, RCNAME) ;
if (access(rcname, F_OK) == 0) rcexists = 1 ; if (access(rcname, F_OK) == 0) rcexists = 1 ;
} }
STRCPY(tmp_filename, "/tmp/.dtcalcrcXXXXXX") ; strcpy(tmp_filename, "/tmp/.dtcalcrcXXXXXX") ;
MKTEMP(tmp_filename) ; mktemp(tmp_filename) ;
if ((tmpfd = fopen(tmp_filename, "w+")) == NULL) return ; if ((tmpfd = fopen(tmp_filename, "w+")) == NULL) return ;
if (rcexists) if (rcexists)
{ {
rcfd = fopen(rcname, "r") ; rcfd = fopen(rcname, "r") ;
SPRINTF(sval, " %1d", cfno) ; sprintf(sval, " %1d", cfno) ;
while (fgets(str, MAXLINE, rcfd)) while (fgets(str, MAXLINE, rcfd))
{ {
if (exists) if (exists)
@ -1695,40 +1695,40 @@ write_rcfile(enum menu_type mtype, int exists, int cfno, char *val, char *commen
switch (mtype) switch (mtype)
{ {
case M_CON : sval[0] = 'c' ; case M_CON : sval[0] = 'c' ;
if (!strncmp(str, sval, 2)) FPUTS("#", tmpfd) ; if (!strncmp(str, sval, 2)) fputs("#", tmpfd) ;
sval[0] = 'C' ; sval[0] = 'C' ;
if (!strncmp(str, sval, 2)) FPUTS("#", tmpfd) ; if (!strncmp(str, sval, 2)) fputs("#", tmpfd) ;
break ; break ;
case M_FUN : sval[0] = 'f' ; case M_FUN : sval[0] = 'f' ;
if (!strncmp(str, sval, 2)) FPUTS("#", tmpfd) ; if (!strncmp(str, sval, 2)) fputs("#", tmpfd) ;
sval[0] = 'F' ; sval[0] = 'F' ;
if (!strncmp(str, sval, 2)) FPUTS("#", tmpfd) ; if (!strncmp(str, sval, 2)) fputs("#", tmpfd) ;
break; break;
default: break; default: break;
} }
} }
FPRINTF(tmpfd, "%s", str) ; fprintf(tmpfd, "%s", str) ;
} }
FCLOSE(rcfd) ; fclose(rcfd) ;
} }
switch (mtype) 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 ; break ;
case M_FUN : case M_FUN :
if(strcmp(val, "") != 0) 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; break;
default: break; default: break;
} }
UNLINK(rcname) ; unlink(rcname) ;
rcfd = fopen(rcname, "w") ; rcfd = fopen(rcname, "w") ;
REWIND(tmpfd) ; rewind(tmpfd) ;
while (fgets(str, MAXLINE, tmpfd)) FPRINTF(rcfd, "%s", str) ; while (fgets(str, MAXLINE, tmpfd)) fprintf(rcfd, "%s", str) ;
FCLOSE(rcfd) ; fclose(rcfd) ;
FCLOSE(tmpfd); fclose(tmpfd);
UNLINK(tmp_filename) ; unlink(tmp_filename) ;
} }
@ -1738,7 +1738,7 @@ write_resources(char *filename)
char intval[5] ; char intval[5] ;
int MPtemp[MP_SIZE]; int MPtemp[MP_SIZE];
SPRINTF(intval, "%d", v->accuracy) ; sprintf(intval, "%d", v->accuracy) ;
put_resource(R_ACCURACY, intval) ; put_resource(R_ACCURACY, intval) ;
put_resource(R_DISPLAYED, v->display) ; put_resource(R_DISPLAYED, v->display) ;
put_resource(R_BASE, base_str[(int) v->base]) ; put_resource(R_BASE, base_str[(int) v->base]) ;

405
cde/programs/dtcalc/calctool.h
View file

@ -31,6 +31,9 @@
* (c) Copyright 1993, 1994 Sun Microsystems, Inc. * * (c) Copyright 1993, 1994 Sun Microsystems, Inc. *
* (c) Copyright 1993, 1994 Novell, Inc. * * (c) Copyright 1993, 1994 Novell, Inc. *
*/ */
#ifndef _calctool_h
#define _calctool_h
#include <float.h> #include <float.h>
@ -88,14 +91,6 @@ extern char *_DtGetMessage(char *filename, int set, int n, char *s);
#endif #endif
#endif /* sun */ #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 #ifdef hpux
#define HIL_PC101_KBD 1 #define HIL_PC101_KBD 1
#define HIL_ITF_KBD 2 #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 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. */ /* Various pseudo events used by the dtcalc program. */
#define KEYBOARD_DOWN 100 /* Keyboard character was pressed. */ #define KEYBOARD_DOWN 100 /* Keyboard character was pressed. */
#define KEYBOARD_UP 101 /* Keyboard character was released. */ #define KEYBOARD_UP 101 /* Keyboard character was released. */
@ -552,7 +534,9 @@ struct calcVars { /* Calctool variables and options. */
#ifdef hpux #ifdef hpux
int keybdID; int keybdID;
#endif #endif
} CalcVars ; };
extern struct calcVars CalcVars;
typedef struct calcVars *Vars ; typedef struct calcVars *Vars ;
@ -568,7 +552,7 @@ typedef struct
char *session; char *session;
} ApplicationArgs, *ApplicationArgsPtr; } ApplicationArgs, *ApplicationArgsPtr;
ApplicationArgs application_args; extern ApplicationArgs application_args;
/* MP definitions. */ /* MP definitions. */
@ -579,205 +563,206 @@ ApplicationArgs application_args;
#define dmax(a, b) (double) max(a, b) #define dmax(a, b) (double) max(a, b)
#define dmin(a, b) (double) min(a, b) #define dmin(a, b) (double) min(a, b)
BOOLEAN ibool P((double)) ; BOOLEAN ibool(double);
BOOLEAN ibool2 P((double)) ; BOOLEAN ibool2(double);
char *convert P((char *)) ; char *convert(char *);
char *get_resource P((enum res_type)) ; char *get_resource(enum res_type);
char *make_eng_sci P((int *)) ; char *make_eng_sci(int *);
char *make_fixed P((int *, int)) ; char *make_fixed(int *, int);
char *make_number P((int *, BOOLEAN)) ; char *make_number(int *, BOOLEAN);
double mppow_di P((double *, int *)) ; double mppow_di(double *, int *);
double mppow_ri P((float *, int *)) ; double mppow_ri(float *, int *);
double setbool P((BOOLEAN)) ; double setbool(BOOLEAN);
int char_val P((char)) ; int char_val(char);
int get_bool_resource P((enum res_type, int *)) ; int get_bool_resource(enum res_type, int *);
int get_index P((char)) ; int get_index(char);
int get_int_resource P((enum res_type, int *)) ; int get_int_resource(enum res_type, int *);
int get_str_resource P((enum res_type, char *)) ; int get_str_resource(enum res_type, char *);
int main P((int, char **)) ; int main(int, char **);
void beep P(()) ; void beep(void);
void check_ow_beep P(()) ; void check_ow_beep(void);
void clear_display P(()) ; void clear_display(void);
void doerr P((char *)) ; void doerr(char *);
void do_accuracy P(()) ; void do_accuracy(void);
void do_ascii P(()) ; void do_ascii(void);
void do_base P(()) ; void do_base(void);
void set_base P(()) ; void set_base(enum base_type type);
void do_business P(()) ; void do_business(void);
void do_calc P(()) ; void do_calc(void);
void do_dtcalc P((int, char **)) ; void do_dtcalc(int, char **);
void do_clear P(()) ; void do_clear(void);
void do_constant P(()) ; void do_constant(void);
void do_delete P(()) ; void do_delete(void);
void do_exchange P(()) ; void do_exchange(void);
void do_expno P(()) ; void do_expno(void);
void do_factorial P((int *, int *)) ; void do_factorial(int *, int *);
void do_frame P(()) ; void do_frame(void);
void do_function P(()) ; void do_function(void);
void do_immed P(()) ; void do_immed(void);
void do_keys P(()) ; void do_keys(void);
void do_mode P(()) ; void do_mode(void);
void do_none P(()) ; void do_none(void);
void do_number P(()) ; void do_number(void);
void do_numtype P(()) ; void do_numtype(void);
void do_paren P(()) ; void do_paren(void);
void set_numtype P((enum num_type dtype)); void set_numtype(enum num_type dtype);
void do_nothing P(()) ; void do_nothing(void);
void do_pending P(()) ; void do_pending(void);
void do_point P(()) ; void do_point(void);
void do_portion P(()) ; void do_portion(void);
double do_round P((double, int)) ; double do_round(double, int);
void do_shift P(()) ; void do_shift(void);
void do_sto_rcl P(()) ; void do_sto_rcl(void);
void do_trig P(()) ; void do_trig(void);
void do_trigtype P(()) ; void do_trigtype(void);
void draw_button P((int, enum fcp_type, int, int, int)) ; void draw_button(int, enum fcp_type, int, int, int);
void get_display P(()) ; void get_display(void);
void get_key_val P((char *, char *)) ; void get_key_val(char *, char *);
void get_label P((int)) ; void get_label(int);
void get_options P((int, char **)) ; void get_options(int, char **);
void getparam P((char *, char **, char *)) ; void getparam(char *, char **, char *);
void get_rcfile P((char *)) ; void get_rcfile(char *);
void grey_button P((int, int, int)) ; void grey_button(int, int, int);
void grey_buttons P((enum base_type)) ; void grey_buttons(enum base_type);
void handle_menu_selection P((int, int)) ; void handle_menu_selection(int, int);
void handle_selection P(()) ; void handle_selection(void);
void initialize P(()) ; void initialize(void);
void init_cmdline_opts P(()) ; void init_cmdline_opts(void);
void init_graphics P(()) ; void init_graphics(void);
void init_options P(()) ; void init_options(void);
void init_text P(()) ; void init_text(void);
void init_vars P(()) ; void init_vars(void);
void key_init P(()) ; void key_init(void);
void load_resources P(()) ; void load_resources(void);
void make_frames P(()) ; void make_frames(void);
void make_items P(()) ; void make_items(void);
void make_modewin P(()) ; void make_modewin(void);
void make_fin_registers P(()) ; void make_fin_registers(void);
void make_registers P((int)) ; void make_registers(int);
void MPstr_to_num P((char *, enum base_type, int *)) ; void MPstr_to_num(char *, enum base_type, int *);
void paren_disp P((char)) ; void paren_disp(char);
void process_event P((int)) ; void process_event(int);
void process_item P((int)) ; void process_item(int);
void process_parens P((char)) ; void process_parens(char);
void process_stack P((int, int, int)) ; void process_stack(int, int, int);
void process_str P((char *, enum menu_type)) ; void process_str(char *, enum menu_type);
void push_num P((int *)) ; void push_num(int *);
void push_op P((int)) ; void push_op(int);
void put_resource P((enum res_type, char *)) ; void put_resource(enum res_type, char *);
void read_rcfiles P(()) ; void read_rcfiles(void);
void read_resources P(()) ; void read_resources(void);
void redraw_buttons P(()) ; void redraw_buttons(void);
void save_cmdline P((int, char **)) ; void save_cmdline(int, char **);
void save_pending_values P((int)) ; void save_pending_values(int);
void save_resources P((char *)) ; void save_resources(char *);
void blank_display P(()) ; void blank_display(void);
void ErrorDialog P((char *string)); void ErrorDialog(char *string);
void set_item P((enum item_type, char *)) ; void set_item(enum item_type, char *);
void set_title P((enum fcp_type, char *)) ; void set_title(enum fcp_type, char *);
void show_ascii_frame P(()) ; void show_ascii_frame(void);
void show_display P((int *)) ; void show_display(int *);
void srand48 P(()) ; void srand48(long);
void start_tool P(()) ; void start_tool(void);
void switch_hands P((int)) ; void switch_hands(int);
void usage P((char *)) ; void usage(char *);
void win_display P((enum fcp_type, int)) ; void win_display(enum fcp_type, int);
void write_cmdline P(()) ; void write_cmdline(void);
void write_rcfile P((enum menu_type, int, int, char *, char *)) ; void write_rcfile(enum menu_type, int, int, char *, char *);
void write_resources P((char *)) ; void write_resources(char *);
void RestoreSession P(()) ; void RestoreSession(void);
void TimerEvent P(( XtPointer, XtIntervalId *)) ; void TimerEvent(XtPointer, XtIntervalId *);
void ErrDialog P(( char *, Widget )); void ErrDialog(char *, Widget );
/* MP routines not found in the Brent FORTRAN package. */ /* MP routines not found in the Brent FORTRAN package. */
void mpacos P((int *, int *)) ; void mpacos(int *, int *);
void mpacosh P((int *, int *)) ; void mpacosh(int *, int *);
void mpasinh P((int *, int *)) ; void mpasinh(int *, int *);
void mpatanh P((int *, int *)) ; void mpatanh(int *, int *);
void mplog10 P((int *, int *)) ; void mplog10(int *, int *);
/* Brent MP routines in mp.c. */ /* Brent MP routines in mp.c. */
int mpcmpi P((int *, int *)) ; int mpcmpi(int *, int *);
int mpcmpr P((int *, float *)) ; int mpcmpr(int *, float *);
int mpcomp P((int *, int *)) ; int mpcomp(int *, int *);
int pow_ii P((int *, int *)) ; int pow_ii(int *, int *);
int mpeq P((int *, int *)) ; int mpeq(int *, int *);
int mpge P((int *, int *)) ; int mpge(int *, int *);
int mpgt P((int *, int *)) ; int mpgt(int *, int *);
int mple P((int *, int *)) ; int mple(int *, int *);
int mplt P((int *, int *)) ; int mplt(int *, int *);
void mpabs P((int *, int *)) ; void mpabs(int *, int *);
void mpadd P((int *, int *, int *)) ; void mpadd(int *, int *, int *);
void mpadd2 P((int *, int *, int *, int *, int *)) ; void mpadd2(int *, int *, int *, int *, int *);
void mpadd3 P((int *, int *, int *, int *, int *)) ; void mpadd3(int *, int *, int *, int *, int *);
void mpaddi P((int *, int *, int *)) ; void mpaddi(int *, int *, int *);
void mpaddq P((int *, int *, int *, int *)) ; void mpaddq(int *, int *, int *, int *);
void mpart1 P((int *, int *)) ; void mpart1(int *, int *);
void mpasin P((int *, int *)) ; void mpasin(int *, int *);
void mpatan P((int *, int *)) ; void mpatan(int *, int *);
void mpcdm P((double *, int *)) ; void mpcdm(double *, int *);
void mpchk P((int *, int *)) ; void mpchk(int *, int *);
void mpcim P((int *, int *)) ; void mpcim(int *, int *);
void mpcmd P((int *, double *)) ; void mpcmd(int *, double *);
void mpcmf P((int *, int *)) ; void mpcmf(int *, int *);
void mpcmi P((int *, int *)) ; void mpcmi(int *, int *);
void mpcmim P((int *, int *)) ; void mpcmim(int *, int *);
void mpcmr P((int *, float *)) ; void mpcmr(int *, float *);
void mpcos P((int *, int *)) ; void mpcos(int *, int *);
void mpcosh P((int *, int *)) ; void mpcosh(int *, int *);
void mpcqm P((int *, int *, int *)) ; void mpcqm(int *, int *, int *);
void mpcrm P((float *, int *)) ; void mpcrm(float *, int *);
void mpdiv P((int *, int *, int *)) ; void mpdiv(int *, int *, int *);
void mpdivi P((int *, int *, int *)) ; void mpdivi(int *, int *, int *);
void mperr P(()) ; void mperr(void);
void mpexp P((int *, int *)) ; void mpexp(int *, int *);
void mpexp1 P((int *, int *)) ; void mpexp1(int *, int *);
void mpext P((int *, int *, int *)) ; void mpext(int *, int *, int *);
void mpgcd P((int *, int *)) ; void mpgcd(int *, int *);
void mpln P((int *, int *)) ; void mpln(int *, int *);
void mplns P((int *, int *)) ; void mplns(int *, int *);
void mpmaxr P((int *)) ; void mpmaxr(int *);
void mpmlp P((int *, int *, int *, int *)) ; void mpmlp(int *, int *, int *, int *);
void mpmul P((int *, int *, int *)) ; void mpmul(int *, int *, int *);
void mpmul2 P((int *, int *, int *, int *)) ; void mpmul2(int *, int *, int *, int *);
void mpmuli P((int *, int *, int *)) ; void mpmuli(int *, int *, int *);
void mpmulq P((int *, int *, int *, int *)) ; void mpmulq(int *, int *, int *, int *);
void mpneg P((int *, int *)) ; void mpneg(int *, int *);
void mpnzr P((int *, int *, int *, int *)) ; void mpnzr(int *, int *, int *, int *);
void mpovfl P((int *)) ; void mpovfl(int *);
void mppi P((int *)) ; void mppi(int *);
void mppwr P((int *, int *, int *)) ; void mppwr(int *, int *, int *);
void mppwr2 P((int *, int *, int *)) ; void mppwr2(int *, int *, int *);
void mprec P((int *, int *)) ; void mprec(int *, int *);
void mproot P((int *, int *, int *)) ; void mproot(int *, int *, int *);
void mpset P((int *, int *, int *)) ; void mpset(int *, int *, int *);
void mpsin P((int *, int *)) ; void mpsin(int *, int *);
void mpsin1 P((int *, int *, int *)) ; void mpsin1(int *, int *, int *);
void mpsinh P((int *, int *)) ; void mpsinh(int *, int *);
void mpsqrt P((int *, int *)) ; void mpsqrt(int *, int *);
void mpstr P((int *, int *)) ; void mpstr(int *, int *);
void mpsub P((int *, int *, int *)) ; void mpsub(int *, int *, int *);
void mptanh P((int *, int *)) ; void mptanh(int *, int *);
void mpunfl P((int *)) ; void mpunfl(int *);
/* Help routines */ /* Help routines */
void Help P((char *, char *)) ; void Help(char *, char *);
void HelpRequestCB P(()) ; void HelpRequestCB(Widget, caddr_t, caddr_t);
void HelpModeCB P(()) ; void HelpModeCB(Widget, caddr_t, caddr_t);
void HelpCloseCB P(()) ; void HelpCloseCB(Widget, caddr_t, caddr_t);
void HelpHyperlinkCB P(()) ; void HelpHyperlinkCB(Widget, caddr_t, caddr_t);
void DisplayHelp P((char *, char *)) ; void DisplayHelp(char *, char *);
void CenterMsgCB P(()) ; void CenterMsgCB(Widget, XtPointer, XtPointer);
void HelpHelp P(()) ; void HelpHelp(void);
void SetWmHnts P(()) ; 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 */

8
cde/programs/dtcalc/ds_common.c
View file

@ -36,18 +36,14 @@
#include <stdlib.h> #include <stdlib.h>
#include "ds_common.h" #include "ds_common.h"
#define FREE (void) free
#define STRCPY (void) strcpy
void void
read_str(char **str, char *value) read_str(char **str, char *value)
{ {
if (*str != NULL) FREE(*str) ; if (*str != NULL) free(*str) ;
if (value != NULL && strlen(value)) if (value != NULL && strlen(value))
{ {
*str = (char *) malloc((unsigned) (strlen(value) + 1)) ; *str = (char *) malloc((unsigned) (strlen(value) + 1)) ;
STRCPY(*str, value) ; strcpy(*str, value) ;
} }
else *str = NULL ; else *str = NULL ;
} }

12
cde/programs/dtcalc/ds_common.h
View file

@ -38,16 +38,8 @@
#include <X11/Xresource.h> #include <X11/Xresource.h>
#include <X11/Intrinsic.h> #include <X11/Intrinsic.h>
/* For all function declarations, if ANSI then use a prototype. */ char *set_bool(int);
#if defined(__STDC__) void read_str(char **, char *);
#define P(args) args
#else /* ! __STDC__ */
#define P(args) ()
#endif /* STDC */
char *set_bool P((int)) ;
void read_str P((char **, char *)) ;
#endif /*_ds_common_h*/ #endif /*_ds_common_h*/

2
cde/programs/dtcalc/ds_popup.c
View file

@ -50,7 +50,7 @@ extern XmWidgetExtData _XmGetWidgetExtData(
#include "calctool.h" #include "calctool.h"
#include "motif.h" #include "motif.h"
void _DtChildPosition P((Widget, Widget, Position *, Position *)) ; void _DtChildPosition(Widget, Widget, Position *, Position *);
/* ARGSUSED */ /* ARGSUSED */
void void

18
cde/programs/dtcalc/ds_popup.h
View file

@ -38,14 +38,6 @@
#include <X11/Intrinsic.h> #include <X11/Intrinsic.h>
#include <Xm/Xm.h> #include <Xm/Xm.h>
/* 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(). */ /* Location ops for ds_position_popup(). */
enum ds_location_op { enum ds_location_op {
@ -58,12 +50,12 @@ enum ds_location_op {
DS_POPUP_CENTERED /* Center popup within baseframe */ DS_POPUP_CENTERED /* Center popup within baseframe */
} ; } ;
int ds_position_popup P((Widget, Widget, enum ds_location_op)) ; int ds_position_popup(Widget, Widget, enum ds_location_op);
int ds_force_popup_on_screen P((Widget, int *, int *)) ; 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 _DtGenericMapWindow(Widget shell, Widget parent);
void _DtChildPosition P((Widget w, Widget parent, Position *newX, Position *newY)); void _DtChildPosition(Widget w, Widget parent, Position *newX, Position *newY);
#endif /*!_ds_popup_h*/ #endif /*!_ds_popup_h*/

32
cde/programs/dtcalc/ds_widget.h
View file

@ -45,14 +45,6 @@
#include <Xm/PushB.h> #include <Xm/PushB.h>
#include <Xm/TextF.h> #include <Xm/TextF.h>
/* 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. */ enum choice_type { CH_ACTIVE, CH_VALUE } ; /* Choice operations. */
/* Text widget operations. */ /* Text widget operations. */
@ -74,20 +66,20 @@ struct tW_struct { /* Text widget structure. */
Widget textfield ; /* xmTextWidgetClass. */ 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, struct cW_struct *make_choiceW(Widget, char *, char **, int, int,
int, void (*)())) ; int, void (*)());
struct tW_struct *make_textW P((Widget, char *)) ; struct tW_struct *make_textW(Widget, char *);
Widget make_butW P((Widget, char *)) ; Widget make_butW(Widget, char *);
Widget make_labelW P((Widget, char *)) ; Widget make_labelW(Widget, char *);
Widget make_manW P((char *, Widget, int, int)) ; Widget make_manW(char *, Widget, int, int);
Widget make_toggleW P((Widget, char *)) ; Widget make_toggleW(Widget, char *);
void set_choice P((struct cW_struct *, enum choice_type, int)) ; void set_choice(struct cW_struct *, enum choice_type, int);
void set_choice_help P((struct cW_struct *, char *)) ; void set_choice_help(struct cW_struct *, char *);
void set_text_help P((struct tW_struct *, char *)) ; void set_text_help(struct tW_struct *, char *);
void set_text_str P((struct tW_struct *, enum text_type, char *)) ; void set_text_str(struct tW_struct *, enum text_type, char *);
#endif /*_ds_widget_h*/ #endif /*_ds_widget_h*/

34
cde/programs/dtcalc/ds_xlib.h
View file

@ -39,31 +39,23 @@
#include <X11/Intrinsic.h> #include <X11/Intrinsic.h>
#include <Xm/Xm.h> #include <Xm/Xm.h>
/* 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. */ /* 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_choice_value(Widget) ;
int ds_get_strwidth P((XFontStruct *, char *)) ; int ds_get_strwidth(XFontStruct *, char *);
int ds_save_resources P((XrmDatabase, char *)) ; int ds_save_resources(XrmDatabase, char *) ;
void ds_add_help P((Widget, char *)) ; void ds_add_help(Widget, char *);
void ds_beep P((Display *)) ; void ds_beep(Display *);
void ds_get_geometry_size P((char *, int *, int *)) ; void ds_get_geometry_size(char *, int *, int *);
void ds_get_frame_size P((Widget, int *, int *, int *, int *)) ; void ds_get_frame_size(Widget, int *, int *, int *, int *);
void ds_put_resource P((XrmDatabase *, char *, char *, char *)) ; void ds_put_resource(XrmDatabase *, char *, char *, char *);
void ds_save_cmdline P((Display *, Window, int, char **)) ; void ds_save_cmdline(Display *, Window, int, char **);
void ds_set_choice_value P((Widget, int)) ; void ds_set_choice_value(Widget, int);
void ds_set_frame_size P((Widget, int, int, int, 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*/ #endif /*_ds_xlib_h*/

24
cde/programs/dtcalc/functions.c
View file

@ -336,7 +336,7 @@ do_business(void) /* Perform special business mode calculations. */
make_registers(FIN) ; make_registers(FIN) ;
v->funstate = 1; v->funstate = 1;
STRCPY(v->display, display_number); strcpy(v->display, display_number);
set_item(DISPLAYITEM, v->display); set_item(DISPLAYITEM, v->display);
need_show = FALSE; need_show = FALSE;
} }
@ -641,15 +641,15 @@ do_expno(void) /* Get exponential number. */
v->pointed = (strchr(v->display, '.') != NULL) ; v->pointed = (strchr(v->display, '.') != NULL) ;
if (!v->new_input) if (!v->new_input)
{ {
STRCPY(v->display, "1.0 +") ; strcpy(v->display, "1.0 +") ;
v->new_input = v->pointed = 1 ; v->new_input = v->pointed = 1 ;
} }
else if (!v->pointed) else if (!v->pointed)
{ {
STRNCAT(v->display, ". +", 3) ; strncat(v->display, ". +", 3) ;
v->pointed = 1 ; 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->toclear = 0 ;
v->key_exp = 1 ; v->key_exp = 1 ;
v->exp_posn = strchr(v->display, '+') ; v->exp_posn = strchr(v->display, '+') ;
@ -910,7 +910,7 @@ do_number(void)
if (v->toclear) if (v->toclear)
{ {
SPRINTF(v->display, "%c", nextchar) ; sprintf(v->display, "%c", nextchar) ;
v->toclear = 0 ; v->toclear = 0 ;
} }
else else
@ -990,7 +990,7 @@ do_paren(void)
if(tmpdb == 0.0) if(tmpdb == 0.0)
{ {
v->cur_op = '?'; v->cur_op = '?';
STRCPY(v->display, "") ; strcpy(v->display, "") ;
set_item(DISPLAYITEM, v->display) ; set_item(DISPLAYITEM, v->display) ;
} }
else else
@ -1009,7 +1009,7 @@ do_paren(void)
} }
else else
{ {
STRCPY(v->display, "") ; strcpy(v->display, "") ;
set_item(DISPLAYITEM, v->display) ; set_item(DISPLAYITEM, v->display) ;
} }
} }
@ -1127,10 +1127,10 @@ do_point(void) /* Handle numeric point. */
{ {
if (v->toclear) if (v->toclear)
{ {
STRCPY(v->display, ".") ; strcpy(v->display, ".") ;
v->toclear = 0 ; v->toclear = 0 ;
} }
else STRNCAT(v->display, ".", 1) ; else strncat(v->display, ".", 1) ;
v->pointed = 1 ; v->pointed = 1 ;
} }
else else
@ -1644,7 +1644,7 @@ process_parens(char current)
{ {
set_item(DISPLAYITEM, vstrs[(int) V_ERROR]) ; set_item(DISPLAYITEM, vstrs[(int) V_ERROR]) ;
set_item(OPITEM, vstrs[(int) V_CLR]) ; set_item(OPITEM, vstrs[(int) V_CLR]) ;
STRCPY(v->display, vstrs[(int) V_ERROR]) ; strcpy(v->display, vstrs[(int) V_ERROR]) ;
} }
else 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 < 0) return ;
if (v->numsptr >= MAXSTACK) if (v->numsptr >= MAXSTACK)
{ {
STRCPY(v->display, vstrs[(int) V_NUMSTACK]) ; strcpy(v->display, vstrs[(int) V_NUMSTACK]) ;
set_item(DISPLAYITEM, v->display) ; set_item(DISPLAYITEM, v->display) ;
v->error = 1 ; v->error = 1 ;
beep() ; 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 < 0) return ;
if (v->opsptr >= MAXSTACK) if (v->opsptr >= MAXSTACK)
{ {
STRCPY(v->display, vstrs[(int) V_OPSTACK]) ; strcpy(v->display, vstrs[(int) V_OPSTACK]) ;
set_item(DISPLAYITEM, v->display) ; set_item(DISPLAYITEM, v->display) ;
v->error = 1 ; v->error = 1 ;
set_item(OPITEM, vstrs[(int) V_CLR]) ; set_item(OPITEM, vstrs[(int) V_CLR]) ;

6
cde/programs/dtcalc/help.c
View file

@ -56,7 +56,7 @@ extern struct button buttons[] ; /* Calculator button values. */
extern Boolean ignore_event; extern Boolean ignore_event;
extern XtIntervalId timerId; extern XtIntervalId timerId;
extern void _DtChildPosition P((Widget, Widget, Position *, Position *)) ; extern void _DtChildPosition(Widget, Widget, Position *, Position *);
typedef struct _helpStruct { typedef struct _helpStruct {
struct _helpStruct *pNext; struct _helpStruct *pNext;
@ -65,8 +65,8 @@ typedef struct _helpStruct {
Boolean inUse; Boolean inUse;
} HelpStruct; } HelpStruct;
static Widget GetHelpDialog P(()) ; static Widget GetHelpDialog(void);
static void UnmanageCB P(()) ; static void UnmanageCB(Widget, XtPointer, XtPointer) ;
void void
Help(char *helpVolume, char *locationId) Help(char *helpVolume, char *locationId)

167
cde/programs/dtcalc/motif.c
View file

@ -112,6 +112,9 @@ extern XmWidgetExtData _XmGetWidgetExtData(
#include "ds_popup.h" #include "ds_popup.h"
#include "ds_xlib.h" #include "ds_xlib.h"
ApplicationArgs application_args;
XVars X;
Boolean colorSrv; Boolean colorSrv;
static XtResource resources[] = static XtResource resources[] =
@ -184,47 +187,47 @@ typedef struct
Window icon; Window icon;
} WM_STATE; } WM_STATE;
void menu_proc P((Widget, XtPointer, XtPointer)) ; void menu_proc(Widget, XtPointer, XtPointer);
void show_ascii P((Widget, XtPointer, XtPointer)) ; void show_ascii(Widget, XtPointer, XtPointer);
void write_cf_value P((Widget, XtPointer, XtPointer)) ; void write_cf_value(Widget, XtPointer, XtPointer);
void close_cf P((Widget, XtPointer, XtPointer)) ; void close_cf(Widget, XtPointer, XtPointer);
void close_ascii P((Widget, XtPointer, XtPointer)) ; void close_ascii(Widget, XtPointer, XtPointer);
void move_cf P((Widget, XtPointer, XtPointer)) ; void move_cf(Widget, XtPointer, XtPointer);
void FocusInCB P((Widget, XtPointer, XtPointer)) ; void FocusInCB(Widget, XtPointer, XtPointer);
void map_popup P((Widget, XtPointer, XtPointer)) ; void map_popup(Widget, XtPointer, XtPointer);
static int event_is_keypad P((XEvent *)) ; static int event_is_keypad(XEvent *);
static int get_next_event P((Widget, int, XEvent *)) ; static int get_next_event(Widget, int, XEvent *);
static int is_window_showing P((Widget)) ; 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 modelineValueChanged(Widget, XtPointer, XtPointer);
static void dtcalc_kkeyboard_create P((Widget)) ; static void dtcalc_kkeyboard_create(Widget);
static void dtcalc_kpanel_create P((Widget)) ; static void dtcalc_kpanel_create(Widget);
static void confirm_callback P((Widget, XtPointer, XtPointer)) ; static void confirm_callback(Widget, XtPointer, XtPointer);
static void create_cfframe P(()) ; static void create_cfframe(void);
static void create_menu P((enum menu_type, Widget, int)) ; static void create_menu(enum menu_type, Widget, int);
static void do_button P((Widget, XtPointer, XtPointer)) ; static void do_button(Widget, XtPointer, XtPointer);
static void do_confirm_notice P((Widget, char *)) ; static void do_confirm_notice(Widget, char *);
static void do_continue_notice P((Widget, char *)) ; static void do_continue_notice(Widget, char *);
static void close_reg P((Widget, XtPointer, XtPointer)) ; static void close_reg(Widget, XtPointer, XtPointer);
static void event_proc P((Widget, XtPointer, XEvent *, Boolean *)) ; static void event_proc(Widget, XtPointer, XEvent *, Boolean *);
static void frame_interpose P((Widget, XtPointer, XEvent *, Boolean *)) ; static void frame_interpose(Widget, XtPointer, XEvent *, Boolean *);
static void menu_handler P((Widget, XtPointer, XEvent *, Boolean *)) ; static void menu_handler(Widget, XtPointer, XEvent *, Boolean *);
static void popupHandler P((Widget, XtPointer, XEvent *, Boolean *)) ; static void popupHandler(Widget, XtPointer, XEvent *, Boolean *);
static void new_cf_value P((Widget, XtPointer, XtPointer)) ; static void new_cf_value(Widget, XtPointer, XtPointer);
static void do_memory P((Widget, XtPointer, XtPointer)) ; static void do_memory(Widget, XtPointer, XtPointer);
static void switch_mode P((enum mode_type)) ; static void switch_mode(enum mode_type);
static void update_cf_value P(()) ; static void update_cf_value(void);
static void xerror_interpose P((Display *, XErrorEvent *)) ; static void xerror_interpose(Display *, XErrorEvent *);
static Widget button_create P((Widget, int, int, int, int)) ; static Widget button_create(Widget, int, int, int, int);
static void save_state P((Widget, XtPointer, XtPointer)) ; static void save_state(Widget, XtPointer, XtPointer);
static void SaveSession P(( char *, char * )) ; static void SaveSession(char *, char *);
static void setCalcHints P(()) ; static void setCalcHints(void);
static char * _DtcalcStripSpaces P(( char * )) ; static char * _DtcalcStripSpaces(char *);
static void ProcessMotifSelection(Widget); static void ProcessMotifSelection(Widget);
static void create_menu_bar(Widget parent); 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"); tmpStr = GETMESSAGE(2, 31, "Could not open display.\n");
msg = XtNewString(tmpStr); msg = XtNewString(tmpStr);
FPRINTF(stderr, "%s", msg) ; fprintf(stderr, "%s", msg) ;
exit(1) ; 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) ; if (mtype != M_NONE) create_menu(mtype, button, n) ;
val = (v->curwin << 16) + n ; val = (v->curwin << 16) + n ;
XtAddCallback(button, XmNactivateCallback, do_button, (XtPointer) val) ; 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, XtAddEventHandler(button, KeyPressMask | KeyReleaseMask,
FALSE, event_proc, NULL) ; FALSE, event_proc, NULL) ;
@ -501,7 +504,7 @@ dtcalc_initialize_rframe(Widget owner, int type)
XmNdefaultPosition, FALSE, XmNdefaultPosition, FALSE,
NULL) ; NULL) ;
SPRINTF(str, "register%1d", 0) ; sprintf(str, "register%1d", 0) ;
X->registers[0] = XtVaCreateManagedWidget(str, X->registers[0] = XtVaCreateManagedWidget(str,
xmLabelWidgetClass, xmLabelWidgetClass,
form, form,
@ -515,7 +518,7 @@ dtcalc_initialize_rframe(Widget owner, int type)
for (i = 1; i < MAXREGS; i++) for (i = 1; i < MAXREGS; i++)
{ {
SPRINTF(str, "register%1d", i) ; sprintf(str, "register%1d", i) ;
X->registers[i] = XtVaCreateManagedWidget(str, X->registers[i] = XtVaCreateManagedWidget(str,
xmLabelWidgetClass, xmLabelWidgetClass,
form, form,
@ -584,7 +587,7 @@ dtcalc_initialize_rframe(Widget owner, int type)
XmNdefaultPosition, FALSE, XmNdefaultPosition, FALSE,
NULL) ; NULL) ;
SPRINTF(str, "fregister%1d", 0) ; sprintf(str, "fregister%1d", 0) ;
X->fregisters[0] = XtVaCreateManagedWidget(str, X->fregisters[0] = XtVaCreateManagedWidget(str,
xmLabelWidgetClass, xmLabelWidgetClass,
form, form,
@ -598,7 +601,7 @@ dtcalc_initialize_rframe(Widget owner, int type)
for (i = 1; i < FINREGS; i++) for (i = 1; i < FINREGS; i++)
{ {
SPRINTF(str, "fregister%1d", i) ; sprintf(str, "fregister%1d", i) ;
X->fregisters[i] = XtVaCreateManagedWidget(str, X->fregisters[i] = XtVaCreateManagedWidget(str,
xmLabelWidgetClass, xmLabelWidgetClass,
form, form,
@ -612,7 +615,7 @@ dtcalc_initialize_rframe(Widget owner, int type)
NULL) ; NULL) ;
} }
SPRINTF(str, "fregistervals%1d", 0) ; sprintf(str, "fregistervals%1d", 0) ;
X->fregistersvals[0] = XtVaCreateManagedWidget(str, X->fregistersvals[0] = XtVaCreateManagedWidget(str,
xmLabelWidgetClass, xmLabelWidgetClass,
form, form,
@ -629,7 +632,7 @@ dtcalc_initialize_rframe(Widget owner, int type)
for (i = 1; i < FINREGS; i++) for (i = 1; i < FINREGS; i++)
{ {
SPRINTF(str, "fregistervals%1d", i) ; sprintf(str, "fregistervals%1d", i) ;
X->fregistersvals[i] = XtVaCreateManagedWidget(str, X->fregistersvals[i] = XtVaCreateManagedWidget(str,
xmLabelWidgetClass, xmLabelWidgetClass,
form, form,
@ -803,7 +806,7 @@ dtcalc_kpanel_create(Widget owner)
XmNleftAttachment, XmATTACH_FORM, XmNleftAttachment, XmATTACH_FORM,
XmNnavigationType, XmTAB_GROUP, XmNnavigationType, XmTAB_GROUP,
NULL) ; NULL) ;
XtAddCallback(X->textFrame, XmNhelpCallback, HelpRequestCB, XtAddCallback(X->textFrame, XmNhelpCallback, (void (*)(Widget, XtPointer, XtPointer)) HelpRequestCB,
(XtPointer)HELP_DISPLAY) ; (XtPointer)HELP_DISPLAY) ;
X->textForm = XtVaCreateManagedWidget("textForm", X->textForm = XtVaCreateManagedWidget("textForm",
@ -813,7 +816,7 @@ dtcalc_kpanel_create(Widget owner)
XmNbackground, tmp_pixelbg, XmNbackground, tmp_pixelbg,
XmNforeground, tmp_pixelfg, XmNforeground, tmp_pixelfg,
NULL) ; NULL) ;
XtAddCallback(X->textForm, XmNhelpCallback, HelpRequestCB, XtAddCallback(X->textForm, XmNhelpCallback, (void (*)(Widget, XtPointer, XtPointer)) HelpRequestCB,
(XtPointer)HELP_DISPLAY) ; (XtPointer)HELP_DISPLAY) ;
X->modevals[(int) DISPLAYITEM] = XtVaCreateManagedWidget("display", X->modevals[(int) DISPLAYITEM] = XtVaCreateManagedWidget("display",
@ -830,7 +833,7 @@ dtcalc_kpanel_create(Widget owner)
XmNbackground, tmp_pixelbg, XmNbackground, tmp_pixelbg,
XmNforeground, tmp_pixelfg, XmNforeground, tmp_pixelfg,
NULL) ; NULL) ;
XtAddCallback(X->modevals[(int) DISPLAYITEM], XmNhelpCallback, HelpRequestCB, XtAddCallback(X->modevals[(int) DISPLAYITEM], XmNhelpCallback, (void (*)(Widget, XtPointer, XtPointer)) HelpRequestCB,
(XtPointer) HELP_DISPLAY) ; (XtPointer) HELP_DISPLAY) ;
XtAddEventHandler(X->modevals[(int) DISPLAYITEM], XtAddEventHandler(X->modevals[(int) DISPLAYITEM],
KeyPressMask | KeyReleaseMask, FALSE, event_proc, NULL) ; KeyPressMask | KeyReleaseMask, FALSE, event_proc, NULL) ;
@ -848,7 +851,7 @@ dtcalc_kpanel_create(Widget owner)
XmNleftAttachment, XmATTACH_FORM, XmNleftAttachment, XmATTACH_FORM,
XmNnavigationType, XmTAB_GROUP, XmNnavigationType, XmTAB_GROUP,
NULL) ; NULL) ;
XtAddCallback(X->modeFrame, XmNhelpCallback, HelpRequestCB, XtAddCallback(X->modeFrame, XmNhelpCallback, (void (*)(Widget, XtPointer, XtPointer)) HelpRequestCB,
(XtPointer) HELP_MODELINE) ; (XtPointer) HELP_MODELINE) ;
X->modeline = XtVaCreateManagedWidget("modeline", X->modeline = XtVaCreateManagedWidget("modeline",
@ -856,7 +859,7 @@ dtcalc_kpanel_create(Widget owner)
X->modeFrame, X->modeFrame,
XmNshadowThickness, 0, XmNshadowThickness, 0,
NULL) ; NULL) ;
XtAddCallback(X->modeline, XmNhelpCallback, HelpRequestCB, XtAddCallback(X->modeline, XmNhelpCallback, (void (*)(Widget, XtPointer, XtPointer)) HelpRequestCB,
(XtPointer) HELP_MODELINE) ; (XtPointer) HELP_MODELINE) ;
label_string = XmStringCreateLocalized (" "); label_string = XmStringCreateLocalized (" ");
@ -870,7 +873,7 @@ dtcalc_kpanel_create(Widget owner)
XmNalignment, XmALIGNMENT_CENTER, XmNalignment, XmALIGNMENT_CENTER,
XmNlabelString, label_string, XmNlabelString, label_string,
NULL) ; NULL) ;
XtAddCallback(X->modevals[i], XmNhelpCallback, HelpRequestCB, XtAddCallback(X->modevals[i], XmNhelpCallback, (void (*)(Widget, XtPointer, XtPointer)) HelpRequestCB,
(XtPointer) HELP_MODELINE) ; (XtPointer) HELP_MODELINE) ;
i = (int) HYPITEM; i = (int) HYPITEM;
@ -884,7 +887,7 @@ dtcalc_kpanel_create(Widget owner)
XmNalignment, XmALIGNMENT_CENTER, XmNalignment, XmALIGNMENT_CENTER,
XmNlabelString, label_string, XmNlabelString, label_string,
NULL) ; NULL) ;
XtAddCallback(X->modevals[i], XmNhelpCallback, HelpRequestCB, XtAddCallback(X->modevals[i], XmNhelpCallback, (void (*)(Widget, XtPointer, XtPointer)) HelpRequestCB,
(XtPointer) HELP_MODELINE) ; (XtPointer) HELP_MODELINE) ;
i = (int) INVITEM; i = (int) INVITEM;
@ -898,7 +901,7 @@ dtcalc_kpanel_create(Widget owner)
XmNalignment, XmALIGNMENT_CENTER, XmNalignment, XmALIGNMENT_CENTER,
XmNlabelString, label_string, XmNlabelString, label_string,
NULL) ; NULL) ;
XtAddCallback(X->modevals[i], XmNhelpCallback, HelpRequestCB, XtAddCallback(X->modevals[i], XmNhelpCallback, (void (*)(Widget, XtPointer, XtPointer)) HelpRequestCB,
(XtPointer) HELP_MODELINE) ; (XtPointer) HELP_MODELINE) ;
XmStringFree(label_string); XmStringFree(label_string);
@ -949,7 +952,7 @@ dtcalc_kpanel_create(Widget owner)
XtSetArg(args[n], XmNmenuHistory, modeArry[(int)v->modetype]); n++; XtSetArg(args[n], XmNmenuHistory, modeArry[(int)v->modetype]); n++;
X->modevals[i] = XmCreateOptionMenu(X->modeline, "mode", args, n); X->modevals[i] = XmCreateOptionMenu(X->modeline, "mode", args, n);
XtManageChild (X->modevals[i]); XtManageChild (X->modevals[i]);
XtAddCallback(X->modevals[i], XmNhelpCallback, HelpRequestCB, XtAddCallback(X->modevals[i], XmNhelpCallback, (void (*)(Widget, XtPointer, XtPointer)) HelpRequestCB,
(XtPointer) HELP_MODE) ; (XtPointer) HELP_MODE) ;
XtOverrideTranslations(X->modevals[i], trans_table); 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++; XtSetArg(args[n], XmNmenuHistory, X->baseWidgArry[(int)v->base]); n++;
X->modevals[i] = XmCreateOptionMenu(X->modeline, "base", args, n); X->modevals[i] = XmCreateOptionMenu(X->modeline, "base", args, n);
XtManageChild (X->modevals[i]); XtManageChild (X->modevals[i]);
XtAddCallback(X->modevals[i], XmNhelpCallback, HelpRequestCB, XtAddCallback(X->modevals[i], XmNhelpCallback, (void (*)(Widget, XtPointer, XtPointer)) HelpRequestCB,
(XtPointer) HELP_BASE) ; (XtPointer) HELP_BASE) ;
XtOverrideTranslations(X->modevals[i], trans_table); 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++; XtSetArg(args[n], XmNmenuHistory, X->numWidgArry[(int)v->dtype]); n++;
X->modevals[i] = XmCreateOptionMenu(X->modeline, "num", args, n); X->modevals[i] = XmCreateOptionMenu(X->modeline, "num", args, n);
XtManageChild (X->modevals[i]); XtManageChild (X->modevals[i]);
XtAddCallback(X->modevals[i], XmNhelpCallback, HelpRequestCB, XtAddCallback(X->modevals[i], XmNhelpCallback, (void (*)(Widget, XtPointer, XtPointer)) HelpRequestCB,
(XtPointer) HELP_NOTATION) ; (XtPointer) HELP_NOTATION) ;
XtOverrideTranslations(X->modevals[i], trans_table); 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++; XtSetArg(args[n], XmNmenuHistory, X->ttypeWidgArry[(int)v->ttype]); n++;
X->modevals[i] = XmCreateOptionMenu(X->modeline, "trig", args, n); X->modevals[i] = XmCreateOptionMenu(X->modeline, "trig", args, n);
XtManageChild (X->modevals[i]); XtManageChild (X->modevals[i]);
XtAddCallback(X->modevals[i], XmNhelpCallback, HelpRequestCB, XtAddCallback(X->modevals[i], XmNhelpCallback, (void (*)(Widget, XtPointer, XtPointer)) HelpRequestCB,
(XtPointer) HELP_TRIG) ; (XtPointer) HELP_TRIG) ;
XtOverrideTranslations(X->modevals[i], trans_table); XtOverrideTranslations(X->modevals[i], trans_table);
@ -1822,7 +1825,7 @@ ProcessMotifSelection(Widget W)
display[i+1] = '\0'; display[i+1] = '\0';
} }
STRCPY(v->display, display); strcpy(v->display, display);
XtFree(display); XtFree(display);
} }
@ -2051,7 +2054,7 @@ get_resource(enum res_type rtype)
{ {
char str[MAXLINE] ; char str[MAXLINE] ;
STRCPY(str, calc_res[(int) rtype]) ; strcpy(str, calc_res[(int) rtype]) ;
return(ds_get_resource(X->rDB, v->appname, str)) ; 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); 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) ; else read_str(&tool_label, v->titleline) ;
@ -2224,7 +2227,7 @@ make_registers(int type)
{ {
for (i = 0; i < MAXREGS; i++) 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)) ; make_number(v->MPmvals[i], FALSE)) ;
{ {
@ -2347,7 +2350,7 @@ new_cf_value(Widget widget, XtPointer client_data, XtPointer call_data)
XmStringFree(cstr) ; XmStringFree(cstr) ;
XtRemoveAllCallbacks(X->CFpi_butHelp, XmNactivateCallback); XtRemoveAllCallbacks(X->CFpi_butHelp, XmNactivateCallback);
XtAddCallback(X->CFpi_butHelp, XmNactivateCallback, HelpRequestCB, XtAddCallback(X->CFpi_butHelp, XmNactivateCallback, (void (*)(Widget, XtPointer, XtPointer)) HelpRequestCB,
(XtPointer) HELP_CONSTANT); (XtPointer) HELP_CONSTANT);
} }
else else
@ -2360,7 +2363,7 @@ new_cf_value(Widget widget, XtPointer client_data, XtPointer call_data)
XmStringFree(cstr) ; XmStringFree(cstr) ;
XtRemoveAllCallbacks(X->CFpi_butHelp, XmNactivateCallback); XtRemoveAllCallbacks(X->CFpi_butHelp, XmNactivateCallback);
XtAddCallback(X->CFpi_butHelp, XmNactivateCallback, HelpRequestCB, XtAddCallback(X->CFpi_butHelp, XmNactivateCallback, (void (*)(Widget, XtPointer, XtPointer)) HelpRequestCB,
(XtPointer) HELP_FUNCTION); (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_butOK, XmNactivateCallback, show_ascii, NULL) ;
XtAddCallback(X->Api_butClose, XmNactivateCallback, close_ascii, XtAddCallback(X->Api_butClose, XmNactivateCallback, close_ascii,
(XtPointer) NULL) ; (XtPointer) NULL) ;
XtAddCallback(X->Api_butHelp, XmNactivateCallback, HelpRequestCB, XtAddCallback(X->Api_butHelp, XmNactivateCallback, (void (*)(Widget, XtPointer, XtPointer)) HelpRequestCB,
(XtPointer) HELP_ASCII) ; (XtPointer) HELP_ASCII) ;
j = 0; j = 0;
@ -2972,7 +2975,7 @@ update_cf_value(void)
} }
/* need to run a "compute" of what was typed in */ /* need to run a "compute" of what was typed in */
len = strlen(X->vval) ; len = strlen(X->vval) ;
STRCPY(str, X->vval); strcpy(str, X->vval);
if(X->vval[len - 1] != '=') if(X->vval[len - 1] != '=')
{ {
/* need to add an '=' at the end of the string so it /* need to add an '=' at the end of the string so it
@ -3004,8 +3007,8 @@ update_cf_value(void)
toclear = v->toclear; toclear = v->toclear;
tstate = v->tstate; tstate = v->tstate;
pending = v->pending; pending = v->pending;
STRCPY(display, v->display); strcpy(display, v->display);
STRCPY(fnum, v->fnum); strcpy(fnum, v->fnum);
mpstr(v->MPdisp_val, MPdisp_val); mpstr(v->MPdisp_val, MPdisp_val);
mpstr(v->MPlast_input, MPlast_input); mpstr(v->MPlast_input, MPlast_input);
mpstr(v->MPresult, MPresult); mpstr(v->MPresult, MPresult);
@ -3022,7 +3025,7 @@ update_cf_value(void)
/* get the computed value */ /* get the computed value */
accuracy = v->accuracy; accuracy = v->accuracy;
v->accuracy = 9 ; v->accuracy = 9 ;
STRCPY(result, make_number(v->MPresult, FALSE)) ; strcpy(result, make_number(v->MPresult, FALSE)) ;
v->accuracy = accuracy ; v->accuracy = accuracy ;
/* return to previous state */ /* return to previous state */
@ -3033,8 +3036,8 @@ update_cf_value(void)
v->toclear = toclear; v->toclear = toclear;
v->tstate = tstate; v->tstate = tstate;
v->pending = pending; v->pending = pending;
STRCPY(v->display, display); strcpy(v->display, display);
STRCPY(v->fnum, fnum); strcpy(v->fnum, fnum);
mpstr(MPdisp_val, v->MPdisp_val); mpstr(MPdisp_val, v->MPdisp_val);
mpstr(MPlast_input, v->MPlast_input); mpstr(MPlast_input, v->MPlast_input);
mpstr(MPresult, v->MPresult); mpstr(MPresult, v->MPresult);
@ -3045,7 +3048,7 @@ update_cf_value(void)
ptr = DtStrchr(result, 'e'); ptr = DtStrchr(result, 'e');
if (n != 1 || ptr != NULL || v->error == TRUE) 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]) ; vstrs[(int) V_NOCHANGE]) ;
do_continue_notice(X->CFframe, message) ; do_continue_notice(X->CFframe, message) ;
set_item(OPITEM, "") ; set_item(OPITEM, "") ;
@ -3063,7 +3066,7 @@ update_cf_value(void)
{ {
len = strlen(result); len = strlen(result);
STRCPY(str, result); strcpy(str, result);
for(i=0; i < len; i++) for(i=0; i < len; i++)
str[i] = str[i+1]; str[i] = str[i+1];
MPstr_to_num(str, DEC, v->MPcon_vals[X->cfno]) ; MPstr_to_num(str, DEC, v->MPcon_vals[X->cfno]) ;
@ -3082,7 +3085,7 @@ update_cf_value(void)
len--; len--;
} }
} }
SPRINTF(v->con_names[X->cfno], "%1d: %s [%s]", sprintf(v->con_names[X->cfno], "%1d: %s [%s]",
X->cfno, result, X->dval) ; X->cfno, result, X->dval) ;
break ; break ;
case M_FUN : tmpStr = GETMESSAGE(3, 45, "."); case M_FUN : tmpStr = GETMESSAGE(3, 45, ".");
@ -3097,14 +3100,14 @@ update_cf_value(void)
ptr = DtStrchr(X->vval, tmpStr[0]); 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) 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) ; X->cfno, X->vval, X->dval) ;
} }
else else
STRCPY(v->fun_names[X->cfno], ""); strcpy(v->fun_names[X->cfno], "");
break; break;
default : break; default : break;
} }
@ -3208,13 +3211,13 @@ write_cf_value(Widget widget, XtPointer client_data, XtPointer call_data)
X->dval[40] = '\0'; X->dval[40] = '\0';
X->vval = XmTextFieldGetString(X->CFpi_vtext->textfield); X->vval = XmTextFieldGetString(X->CFpi_vtext->textfield);
X->cfval = XmTextFieldGetString(X->CFpi_cftext->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' || if ((strcmp(X->cfval, "") == 0) || X->cfval[0] < '0' || X->cfval[0] > '9' ||
X->cfno < 0 || X->cfno > 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]) ; : 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) ; do_continue_notice(X->CFframe, message) ;
return ; return ;
} }
@ -3231,10 +3234,10 @@ write_cf_value(Widget widget, XtPointer client_data, XtPointer call_data)
} }
if (X->cfexists) if (X->cfexists)
{ {
SPRINTF(str, mess[(int) MESS_CON], sprintf(str, mess[(int) MESS_CON],
(X->CFtype == M_CON) ? vstrs[(int) V_UCON] (X->CFtype == M_CON) ? vstrs[(int) V_UCON]
: vstrs[(int) V_UFUN], X->cfno) ; : 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) ; XtUnmanageChild(X->CFframe) ;
do_confirm_notice(X->CFframe, message) ; do_confirm_notice(X->CFframe, message) ;
} }
@ -3307,7 +3310,7 @@ create_menu_bar(Widget parent)
XtSetArg(args[n], XmNtopAttachment, XmATTACH_FORM); n++; XtSetArg(args[n], XmNtopAttachment, XmATTACH_FORM); n++;
X->menubar = XmCreateMenuBar(parent, "mainMenu", args, n); X->menubar = XmCreateMenuBar(parent, "mainMenu", args, n);
XtManageChild(X->menubar); XtManageChild(X->menubar);
XtAddCallback(X->menubar, XmNhelpCallback, HelpRequestCB, XtAddCallback(X->menubar, XmNhelpCallback, (void (*)(Widget, XtPointer, XtPointer)) HelpRequestCB,
(XtPointer)HELP_MENUBAR); (XtPointer)HELP_MENUBAR);
mnemonic = GETMESSAGE(2, 13, "O"); mnemonic = GETMESSAGE(2, 13, "O");
@ -4399,7 +4402,7 @@ RestoreSession(void)
if (get_str_resource(R_DISPLAYED, str)) if (get_str_resource(R_DISPLAYED, str))
{ {
STRCPY(v->display, str); strcpy(v->display, str);
MPstr_to_num(str, v->base, v->MPdisp_val) ; MPstr_to_num(str, v->base, v->MPdisp_val) ;
} }

2
cde/programs/dtcalc/motif.h
View file

@ -87,7 +87,7 @@ typedef struct Xobject { /* Motif/Xlib graphics object. */
typedef struct Xobject *XVars ; typedef struct Xobject *XVars ;
XVars X ; extern XVars X ;
#ifndef CDE_INSTALLATION_TOP #ifndef CDE_INSTALLATION_TOP
#define CDE_INSTALLATION_TOP "/usr/dt" #define CDE_INSTALLATION_TOP "/usr/dt"

22
cde/programs/dtcalc/text.c
View file

@ -43,7 +43,7 @@ extern struct menu_entry menu_entries[] ; /* All the menu strings. */
extern Vars v ; /* Calctool variables and options. */ 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. /* The following are all the strings used by the dtcalc program.
* They are initialized in init_text() to the local language equivalents. * 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_MENUBAR] = DGET("postMenuBar") ;
calc_res[(int) R_KEYS] = DGET("keys") ; 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[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[1], LGET(GETMESSAGE(3, 120, "square root of 2."))) ;
STRCPY(v->con_names[2], LGET(GETMESSAGE(3, 121, "e."))) ; strcpy(v->con_names[2], LGET(GETMESSAGE(3, 121, "e."))) ;
STRCPY(v->con_names[3], LGET(GETMESSAGE(3, 122, "pi."))) ; 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[4], LGET(GETMESSAGE(3, 123, "centimeters <=> inch."))) ;
STRCPY(v->con_names[5], LGET(GETMESSAGE(3, 124, "degrees in a radian."))) ; 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[6], LGET(GETMESSAGE(3, 125, "2 ^ 20."))) ;
STRCPY(v->con_names[7], LGET(GETMESSAGE(3, 126, "grams <=> ounce."))) ; 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[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[9], LGET(GETMESSAGE(3, 128, "cubic centimeters <=> cubic inches."))) ;
/* Keyboard equivalents for the dtcalc menu entries. */ /* Keyboard equivalents for the dtcalc menu entries. */

17
cde/programs/dtcm/dtcm/alarm.h
View file

@ -53,15 +53,14 @@
#include <X11/Intrinsic.h> #include <X11/Intrinsic.h>
#include <csa.h> #include <csa.h>
#include "ansi_c.h"
extern void compose P((Calendar*, CSA_reminder_reference *, char**)); extern void compose(Calendar*, CSA_reminder_reference *, char**);
extern void flash_it P((XtPointer, XtIntervalId*)); extern void flash_it(XtPointer, XtIntervalId*);
extern void mail_it P((XtPointer, XtIntervalId*, CSA_reminder_reference *)); extern void mail_it(XtPointer, XtIntervalId*, CSA_reminder_reference *);
extern void open_it P((XtPointer, XtIntervalId*, CSA_reminder_reference *)); extern void open_it(XtPointer, XtIntervalId*, CSA_reminder_reference *);
extern void postup_show_proc P((Calendar*, CSA_reminder_reference *)); extern void postup_show_proc(Calendar*, CSA_reminder_reference *);
extern void reminder_driver P((XtPointer, XtIntervalId*)); extern void reminder_driver(XtPointer, XtIntervalId*);
extern void ring_it P((XtPointer, XtIntervalId*)); extern void ring_it(XtPointer, XtIntervalId*);
extern void slp P((int x)); extern void slp(int x);
#endif #endif

13
cde/programs/dtcm/dtcm/blist.h
View file

@ -52,7 +52,6 @@
#ifndef _BLIST_H #ifndef _BLIST_H
#define _BLIST_H #define _BLIST_H
#include "ansi_c.h"
#include "util.h" #include "util.h"
/* /*
@ -107,11 +106,11 @@ typedef struct browser_state {
struct browser_state *next; struct browser_state *next;
} BrowserState; } BrowserState;
extern void blist_clean P((Browselist*, Boolean)); extern void blist_clean(Browselist*, Boolean);
extern void blist_init_names P((Calendar*)); extern void blist_init_names(Calendar*);
extern void blist_init_ui P((Calendar*)); extern void blist_init_ui(Calendar*);
extern void blist_reset P((Calendar*)); extern void blist_reset(Calendar*);
extern void make_browselist P((Calendar*)); extern void make_browselist(Calendar*);
extern void show_browselist P((Calendar*)); extern void show_browselist(Calendar*);
#endif #endif

37
cde/programs/dtcm/dtcm/browser.h
View file

@ -52,7 +52,6 @@
#ifndef _BROWSER_H #ifndef _BROWSER_H
#define _BROWSER_H #define _BROWSER_H
#include "ansi_c.h"
#include "timeops.h" #include "timeops.h"
#include "calendar.h" #include "calendar.h"
@ -112,23 +111,23 @@ typedef struct {
#define MB_PREVMONTH 4 #define MB_PREVMONTH 4
#define MB_NEXTMONTH 5 #define MB_NEXTMONTH 5
extern void br_display P((Calendar*)); extern void br_display(Calendar *);
extern Boolean browser_exists P(()); extern Boolean browser_exists(void);
extern void browser_reset_list P((Calendar*)); extern void browser_reset_list(Calendar*);
extern Boolean browser_showing P(()); extern Boolean browser_showing(void);
extern void make_browser P(()); extern void make_browser(Calendar *c);
extern void mb_draw_chartgrid P(()); extern void mb_draw_chartgrid(Browser *b, Calendar *c);
extern void mb_draw_appts P(()); extern void mb_draw_appts(Browser *b, int start, int end, Calendar *c);
extern void mb_update_segs P(()); extern void mb_update_segs(Browser *, Tick, Tick, int *, int *);
extern void mb_update_busyicon P(()); extern void mb_update_busyicon(void);
extern void mb_init_blist P(()); extern void mb_init_blist(void);
extern void mb_init_canvas P(()); extern void mb_init_canvas(Calendar *c);
extern void mb_deregister_names P(()); extern void mb_deregister_names(char *, Calendar *);
extern void mb_refresh_canvas P(()); extern void mb_refresh_canvas(Browser *b, Calendar *c);
extern void sched_proc P(()); extern void sched_proc(void);
extern void set_default_reminders P(()); extern void set_default_reminders(void);
extern void set_default_scope_plus P(()); extern void set_default_scope_plus(void);
extern void set_default_what P(()); extern void set_default_what(void);
extern void mb_refigure_chart P((Calendar *)); extern void mb_refigure_chart(Calendar *);
#endif #endif

115
cde/programs/dtcm/dtcm/calendar.h
View file

@ -56,7 +56,6 @@
#include <csa.h> #include <csa.h>
#include <nl_types.h> #include <nl_types.h>
#include <Xm/Xm.h> #include <Xm/Xm.h>
#include "ansi_c.h"
#include "util.h" #include "util.h"
#include "timeops.h" #include "timeops.h"
#include "props.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) (int)(r2)->y<=(int)(r1)->y+(int)(r1)->height)
extern void cache_dims P((Calendar*, Dimension, extern void cache_dims(Calendar*, Dimension,
Dimension)); Dimension);
extern char* cm_get_relname P(()); extern char* cm_get_relname(void);
extern Boolean in_range P((time_t, time_t, time_t)); extern Boolean in_range(time_t, time_t, time_t);
extern int report_err P((char*)); extern int report_err(char*);
extern void reset_alarm P((Calendar*)); extern void reset_alarm(Calendar*);
extern CSA_return_code reset_timer P((Calendar*)); extern CSA_return_code reset_timer(Calendar*);
extern CSA_return_code paint_canvas P((Calendar*, XRectangle*, extern CSA_return_code paint_canvas(Calendar*, XRectangle*,
Render_Type)); Render_Type);
extern void switch_it P((Calendar*, char*, extern void switch_it(Calendar*, char*,
WindowType)); WindowType);
extern int yyyerror P((char*)); extern int yyyerror(char*);
extern void gr_clear_area P((new_XContext*, int, int, extern void gr_clear_area(new_XContext*, int, int,
Dimension, Dimension)); Dimension, Dimension);
extern void gr_clear_box P((new_XContext*, int, int, int, extern void gr_clear_box(new_XContext*, int, int, int,
int)); int);
extern void gr_make_grayshade P((new_XContext*, int, int, int, extern void gr_make_grayshade(new_XContext*, int, int, int,
int, int)); int, int);
extern void gr_make_gray P((new_XContext*, int, int, int, extern void gr_make_gray(new_XContext*, int, int, int,
int, int)); int, int);
extern void gr_make_rgbcolor P((new_XContext*, Colormap, int, extern void gr_make_rgbcolor(new_XContext*, Colormap, int,
int, int, int, int, int, int, int, int, int, int,
int)); int);
extern int gr_nchars P((int, char*, Cal_Font *)); extern int gr_nchars(int, char*, Cal_Font *);
extern void gr_draw_rgb_box P((new_XContext*, int, int, int, extern void gr_draw_rgb_box (new_XContext*, int, int, int,
int, int, int, Colormap)); int, int, int, Colormap);
extern void gr_dissolve_box P((new_XContext*, int, int, int, extern void gr_dissolve_box (new_XContext*, int, int, int,
int, int)); int, int);
extern int gr_center P((int, char*, Cal_Font *)); extern int gr_center(int, char*, Cal_Font *);
extern void gr_text P((new_XContext*, int, int, extern void gr_text(new_XContext*, int, int,
Cal_Font *, char*, Cal_Font *, char*,
XRectangle*)); XRectangle*);
extern void gr_text_rgb P((new_XContext*, int, int, extern void gr_text_rgb(new_XContext*, int, int,
Cal_Font *, char*, Pixel, Cal_Font *, char*, Pixel,
Colormap, XRectangle*)); Colormap, XRectangle*);
extern void gr_draw_line P((new_XContext*, int, int, int, extern void gr_draw_line(new_XContext*, int, int, int,
int, GR_Line_Style, int, GR_Line_Style,
XRectangle*)); XRectangle*);
extern void gr_draw_box P((new_XContext*, int, int, int, extern void gr_draw_box(new_XContext*, int, int, int,
int, XRectangle*)); int, XRectangle*);
extern void gr_draw_glyph P((new_XContext*, new_XContext*, extern void gr_draw_glyph(new_XContext*, new_XContext*,
Pixmap, int, int, int, int)); Pixmap, int, int, int, int);
extern void gr_set_clip_rectangles P((new_XContext*, int, int, extern void gr_set_clip_rectangles(new_XContext*, int, int,
XRectangle*, int, int)); XRectangle*, int, int);
extern void gr_clear_clip_rectangles P((new_XContext*)); extern void gr_clear_clip_rectangles(new_XContext*);
extern Boolean gr_init P((new_XContext*, Widget)); extern Boolean gr_init(new_XContext*, Widget);
extern new_XContext *gr_create_xcontext P((Calendar*, Widget, GR_depth, extern new_XContext *gr_create_xcontext(Calendar*, Widget, GR_depth,
XtAppContext)); XtAppContext);
extern Boolean today_inrange P((Calendar*, time_t)); extern Boolean today_inrange(Calendar*, time_t);
extern void update_browse_menu_names P((Calendar*)); extern void update_browse_menu_names(Calendar*);
extern char* get_user_calendar P(()); extern char* get_user_calendar(void);
extern void destroy_paint_cache P((Paint_cache *, int)); extern void destroy_paint_cache(Paint_cache *, int);
extern void invalidate_cache P((Calendar *)); 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 Boolean fontlist_to_font(XmFontList, Cal_Font *);
extern void CalTextExtents P((Cal_Font *, char *, int, extern void CalTextExtents (Cal_Font *, char *, int,
int *, int *, int *, int *)); int *, int *, int *, int *);
extern void CalDrawString P((Display *, Drawable, extern void CalDrawString (Display *, Drawable,
Cal_Font *, GC, int, int, Cal_Font *, GC, int, int,
char *, int)); char *, int);
extern void CalFontExtents P((Cal_Font *, extern void CalFontExtents (Cal_Font *,
XFontSetExtents *)); XFontSetExtents *);
#endif #endif

14
cde/programs/dtcm/dtcm/cm_i18n.h
View file

@ -92,10 +92,10 @@ extern char *cm_printf();
int is_comment(); int is_comment();
int match_locale(); int match_locale();
extern int cm_get_fonts P((char *)); extern int cm_get_fonts(char *);
extern int is_comment P((char[MAX_LINE_LEN])); extern int is_comment(char[MAX_LINE_LEN]);
extern int match_locale P((char *, char[MAX_LINE_LEN])); extern int match_locale(char *, char[MAX_LINE_LEN]);
extern void ps_i18n_header P((FILE *, Widget)); extern void ps_i18n_header(FILE *, Widget);
extern char* euc_to_octal P((char *)); extern char* euc_to_octal(char *);
extern char* cm_get_i18n_date P((Widget, char *)); extern char* cm_get_i18n_date(Widget, char *);
extern char* cm_printf P((double, int)); extern char* cm_printf(double, int);

18
cde/programs/dtcm/dtcm/common.h
View file

@ -52,22 +52,20 @@
#ifndef _COMMON_H #ifndef _COMMON_H
#define _COMMON_H #define _COMMON_H
#include "ansi_c.h"
#if LATER #if LATER
typedef struct { typedef struct {
int data_version; int data_version;
char* target; char* target;
} Cdata; } Cdata;
extern Cdata *get_cdata P(()); extern Cdata *get_cdata();
extern void free_cd_from_blist P(()); extern void free_cd_from_blist();
#endif #endif
extern void reset_values P(()); extern void reset_values(void);
extern void backup_values P(()); extern void backup_values(void);
extern void blist_write_names P(()); extern void blist_write_names(void);
extern Boolean duplicate_cd P(()); extern Boolean duplicate_cd(void);
extern char *get_appt_str P(()); extern char *get_appt_str(void);
extern void common_update_lists P(()); extern void common_update_lists(void);
#endif #endif

9
cde/programs/dtcm/dtcm/datefield.h
View file

@ -53,16 +53,15 @@
#define _DATEFIELD_H #define _DATEFIELD_H
#include <X11/Intrinsic.h> #include <X11/Intrinsic.h>
#include "ansi_c.h"
#include "props.h" #include "props.h"
#include "timeops.h" #include "timeops.h"
/* /*
** External function declaration ** External function declaration
*/ */
extern char *get_date_from_widget P((Tick, Widget, OrderingType, extern char *get_date_from_widget(Tick, Widget, OrderingType,
SeparatorType)); SeparatorType);
extern void set_date_in_widget P((Tick, Widget, OrderingType, extern void set_date_in_widget(Tick, Widget, OrderingType,
SeparatorType)); SeparatorType);
#endif #endif

27
cde/programs/dtcm/dtcm/dayglance.h
View file

@ -53,7 +53,6 @@
#define _DAYGLANCE_H #define _DAYGLANCE_H
#include <csa.h> #include <csa.h>
#include "ansi_c.h"
#include "props.h" #include "props.h"
#define MOBOX_AREA_WIDTH (int)(c->view->winw*.4) #define MOBOX_AREA_WIDTH (int)(c->view->winw*.4)
@ -82,17 +81,17 @@ typedef struct dayglance {
Widget *month_panels; Widget *month_panels;
} Day; } Day;
extern void init_dayview P((Calendar*)); extern void init_dayview(Calendar*);
extern void day_button P((Widget, XtPointer, XtPointer)); extern void day_button(Widget, XtPointer, XtPointer);
extern void init_mo P((Calendar*)); extern void init_mo(Calendar*);
extern void monthbox_datetoxy P((Calendar*)); extern void monthbox_datetoxy(Calendar*);
extern void monthbox_xytodate P((Calendar*, int x, int y)); extern void monthbox_xytodate(Calendar*, int x, int y);
extern void paint_dayview P((Calendar*, Boolean, extern void paint_dayview(Calendar*, Boolean,
XRectangle*, Boolean)); XRectangle*, Boolean);
extern void paint_day P((Calendar*)); extern void paint_day(Calendar*);
extern void print_day_range P((Calendar*, Tick, Tick)); extern void print_day_range (Calendar*, Tick, Tick);
extern void day_event P((XEvent*)); extern void day_event(XEvent*);
extern int morning P((int)); extern int morning(int);
extern void paint_day_header P((Calendar *, Tick, void *)); extern void paint_day_header(Calendar *, Tick, void *);
extern void cleanup_after_dayview P((Calendar *)); extern void cleanup_after_dayview(Calendar *);
#endif #endif

11
cde/programs/dtcm/dtcm/deskset.h
View file

@ -54,7 +54,6 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Intrinsic.h> #include <X11/Intrinsic.h>
#include "ansi_c.h"
/* /*
** Location ops for ds_position_popup(). ** Location ops for ds_position_popup().
@ -72,10 +71,10 @@ typedef enum {
/* /*
** Function declarations. ** Function declarations.
*/ */
extern int ds_force_popup_on_screen P((Widget, int*, int*)) ; extern int ds_force_popup_on_screen(Widget, int*, int*);
extern void ds_get_screen_size P((Widget, int*, int*)) ; extern void ds_get_screen_size(Widget, int*, int*);
extern int ds_position_popup P((Widget, Widget, extern int ds_position_popup(Widget, Widget,
ds_location_op)) ; ds_location_op);
extern char *ds_relname P(()); extern char *ds_relname();
#endif #endif

4
cde/programs/dtcm/dtcm/dnd.c
View file

@ -72,10 +72,6 @@
static Bool lookForButton(Display *, XEvent *, XPointer); static Bool lookForButton(Display *, XEvent *, XPointer);
#if !defined(__linux__) && !defined(CSRG_BASED)
extern char *sys_errlist[];
#endif
extern int drag_load_proc(char*, Calendar *); extern int drag_load_proc(char*, Calendar *);
static char dnd_filename[20]; static char dnd_filename[20];

16
cde/programs/dtcm/dtcm/dnd.h
View file

@ -52,8 +52,6 @@
#ifndef _DND_H #ifndef _DND_H
#define _DND_H #define _DND_H
#include "ansi_c.h"
typedef enum {SingleEditorList, typedef enum {SingleEditorList,
SingleEditorIcon, SingleEditorIcon,
GroupEditorList, GroupEditorList,
@ -72,12 +70,12 @@ typedef struct {
#define DRAG_THRESHOLD 4 #define DRAG_THRESHOLD 4
extern void cm_register_drop_site P((Calendar *c, Widget w)); extern void cm_register_drop_site(Calendar *c, Widget w);
extern void ApptDragStart P((Widget, XEvent *, Calendar *, extern void ApptDragStart(Widget, XEvent *, Calendar *,
EditorType)); EditorType);
extern void TranslationDragStart P((Widget, XEvent *, String *, extern void TranslationDragStart(Widget, XEvent *, String *,
Cardinal *)); Cardinal *);
extern void DtcmProcessPress P((Widget, XEvent *, String *, extern void DtcmProcessPress(Widget, XEvent *, String *,
Cardinal *)); Cardinal *);
#endif #endif

33
cde/programs/dtcm/dtcm/dssw.h
View file

@ -53,7 +53,6 @@
#define _DSSW_H #define _DSSW_H
#include <csa.h> #include <csa.h>
#include "ansi_c.h"
#include "calendar.h" #include "calendar.h"
#define DATE_LEN 100 #define DATE_LEN 100
@ -121,21 +120,21 @@ typedef struct {
** DSSW external function declarations ** DSSW external function declarations
** **
*******************************************************************************/ *******************************************************************************/
extern void build_dssw P((DSSW*, Calendar*, Widget, Boolean, Boolean)); extern void build_dssw(DSSW*, Calendar*, Widget, Boolean, Boolean);
extern Boolean dssw_appt_to_form P((DSSW*, CSA_entry_handle)); extern Boolean dssw_appt_to_form(DSSW*, CSA_entry_handle);
extern Boolean dssw_attrs_to_form P((DSSW*, Dtcm_appointment*)); extern Boolean dssw_attrs_to_form(DSSW*, Dtcm_appointment*);
extern Boolean dssw_form_to_appt P((DSSW*, Dtcm_appointment*, char*, extern Boolean dssw_form_to_appt(DSSW*, Dtcm_appointment*, char*,
Tick)); Tick);
extern Boolean dssw_form_flags_to_appt P((DSSW*, Dtcm_appointment*, char*, extern Boolean dssw_form_flags_to_appt(DSSW*, Dtcm_appointment*, char*,
Tick, int *)); Tick, int *);
extern Boolean dssw_form_to_todo P((DSSW*, Dtcm_appointment*, char*, extern Boolean dssw_form_to_todo(DSSW*, Dtcm_appointment*, char*,
Tick)); Tick);
extern void load_dssw_times P((DSSW*, Tick, Tick, Boolean)); extern void load_dssw_times(DSSW*, Tick, Tick, Boolean);
extern void get_dssw_times P((DSSW*)); extern void get_dssw_times(DSSW*);
extern void get_dssw_vals P((DSSW*, Tick)); extern void get_dssw_vals(DSSW*, Tick);
extern void set_dssw_defaults P((DSSW*, Tick, Boolean)); extern void set_dssw_defaults(DSSW*, Tick, Boolean);
extern void set_dssw_times P((DSSW*)); extern void set_dssw_times(DSSW*);
extern void set_dssw_vals P((DSSW*, Tick)); extern void set_dssw_vals(DSSW*, Tick);
extern void set_dssw_menus P((DSSW*, Props *)); extern void set_dssw_menus(DSSW*, Props *);
#endif #endif

45
cde/programs/dtcm/dtcm/editor.h
View file

@ -53,7 +53,6 @@
#define _EDITOR_H #define _EDITOR_H
#include <csa.h> #include <csa.h>
#include "ansi_c.h"
#include "calendar.h" #include "calendar.h"
#include "misc.h" #include "misc.h"
#include "dssw.h" #include "dssw.h"
@ -115,27 +114,27 @@ typedef struct {
** Editor external function declarations ** Editor external function declarations
** **
*******************************************************************************/ *******************************************************************************/
extern void add_to_appt_list P((CSA_entry_handle, Editor*)); extern void add_to_appt_list(CSA_entry_handle, Editor*);
extern void add_all_appt P((Editor*)); extern void add_all_appt(Editor*);
extern void build_editor_list P((Editor*, Tick, Glance, CSA_entry_handle**, extern void build_editor_list(Editor*, Tick, Glance, CSA_entry_handle**,
CSA_uint32*)); CSA_uint32*);
extern int build_editor_view P((Editor*, Glance, Boolean)); extern int build_editor_view(Editor*, Glance, Boolean);
extern Boolean editor_change P((Dtcm_appointment*, CSA_entry_handle, extern Boolean editor_change(Dtcm_appointment*, CSA_entry_handle,
CSA_entry_handle*, Calendar*)); CSA_entry_handle*, Calendar*);
extern void editor_clean_up P((Editor*)); extern void editor_clean_up (Editor*);
extern Boolean editor_created P((Editor*)); extern Boolean editor_created(Editor*);
extern Boolean editor_delete P((CSA_entry_handle, Calendar*)); extern Boolean editor_delete(CSA_entry_handle, Calendar*);
extern Boolean editor_insert P((Dtcm_appointment*, CSA_entry_handle*, extern Boolean editor_insert(Dtcm_appointment*, CSA_entry_handle*,
Calendar*)); Calendar*);
extern CSA_entry_handle editor_nth_appt P((Editor*, int)); extern CSA_entry_handle editor_nth_appt(Editor*, int);
extern Boolean editor_showing P((Editor*)); extern Boolean editor_showing(Editor*);
extern Boolean editor_view_showing P((Editor*)); extern Boolean editor_view_showing(Editor*);
extern void get_editor_vals P((Editor*)); extern void get_editor_vals (Editor*);
extern void set_editor_defaults P((Editor*, Tick, Tick, Boolean)); extern void set_editor_defaults(Editor*, Tick, Tick, Boolean);
extern void set_editor_title P((Editor*, char *)); extern void set_editor_title(Editor*, char *);
extern void set_editor_vals P((Editor*, Tick, Tick)); extern void set_editor_vals (Editor*, Tick, Tick);
extern void show_editor P((Calendar*, Tick, Tick, Boolean)); extern void show_editor (Calendar*, Tick, Tick, Boolean);
extern void show_editor_view P((Calendar*, Glance)); extern void show_editor_view(Calendar*, Glance);
extern void e_make_editor P((Calendar*)); extern void e_make_editor(Calendar*);
#endif #endif

6
cde/programs/dtcm/dtcm/find.h
View file

@ -52,8 +52,6 @@
#ifndef _FIND_H #ifndef _FIND_H
#define _FIND_H #define _FIND_H
#include "ansi_c.h"
typedef struct tick_list { typedef struct tick_list {
Tick tick; Tick tick;
struct tick_list *next; struct tick_list *next;
@ -88,7 +86,7 @@ typedef struct {
Tick search_to_date; Tick search_to_date;
}Find; }Find;
extern caddr_t make_find P((Calendar*)); extern caddr_t make_find(Calendar*);
static Tick f_get_searchdate P((Widget, Props*)); static Tick f_get_searchdate(Widget, Props*);
#endif #endif

25
cde/programs/dtcm/dtcm/format.h
View file

@ -53,24 +53,23 @@
#define _FORMAT_H #define _FORMAT_H
#include <csa.h> #include <csa.h>
#include "ansi_c.h"
#include "props.h" #include "props.h"
#define DEFAULT_APPT_LEN 50 #define DEFAULT_APPT_LEN 50
#define DEFAULT_GAPPT_LEN 80 #define DEFAULT_GAPPT_LEN 80
extern void format_date P((Tick, OrderingType, char*, int, int, int)); extern void format_date(Tick, OrderingType, char*, int, int, int);
extern void format_date3 P((Tick, OrderingType, SeparatorType, char*)); extern void format_date3(Tick, OrderingType, SeparatorType, char*);
extern Boolean format_line P((Tick, char*, char*, int, Boolean, extern Boolean format_line(Tick, char*, char*, int, Boolean,
DisplayType)); DisplayType);
extern void format_line2 P((Dtcm_appointment*, char*, char*, extern void format_line2(Dtcm_appointment*, char*, char*,
DisplayType)); DisplayType);
extern void format_appt P((Dtcm_appointment*, char*, DisplayType, int)); extern void format_appt (Dtcm_appointment*, char*, DisplayType, int);
extern void format_abbrev_appt P((Dtcm_appointment*, char*, Boolean, extern void format_abbrev_appt(Dtcm_appointment*, char*, Boolean,
DisplayType)); DisplayType);
extern void format_maxchars P((Dtcm_appointment*, char*, int, DisplayType)); extern void format_maxchars(Dtcm_appointment*, char*, int, DisplayType);
extern void format_gappt P((Dtcm_appointment*, char*, char*, extern void format_gappt(Dtcm_appointment*, char*, char*,
DisplayType, int)); DisplayType, int);
#endif #endif

4
cde/programs/dtcm/dtcm/goto.h
View file

@ -52,8 +52,6 @@
#ifndef _GOTO_H #ifndef _GOTO_H
#define _GOTO_H #define _GOTO_H
#include "ansi_c.h"
typedef struct { typedef struct {
Widget frame; Widget frame;
Widget form; Widget form;
@ -65,7 +63,7 @@ typedef struct {
Widget goto_message; Widget goto_message;
}Goto; }Goto;
extern caddr_t make_goto P((Calendar*)); extern caddr_t make_goto(Calendar*);
#define DATESIZ 40 #define DATESIZ 40

31
cde/programs/dtcm/dtcm/group_editor.h
View file

@ -53,7 +53,6 @@
#define _GEDITOR_H #define _GEDITOR_H
#include <csa.h> #include <csa.h>
#include "ansi_c.h"
#include "util.h" #include "util.h"
#include "calendar.h" #include "calendar.h"
#include "misc.h" #include "misc.h"
@ -127,21 +126,21 @@ typedef struct {
** Group Editor external function declarations ** 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*, unsigned int, int, GEditor*,
Boolean)); Boolean);
extern void add_all_gappt P((GEditor*)); extern void add_all_gappt(GEditor*);
extern void geditor_clean_up P((GEditor*)); extern void geditor_clean_up(GEditor*);
extern CSA_entry_handle geditor_nth_appt P((GEditor*, int, extern CSA_entry_handle geditor_nth_appt(GEditor*, int,
Access_data**)); Access_data**);
extern Boolean geditor_showing P((GEditor*)); extern Boolean geditor_showing(GEditor*);
extern void get_geditor_vals P((GEditor*)); extern void get_geditor_vals(GEditor*);
extern void remove_all_gaccess_data P((GEditor*)); extern void remove_all_gaccess_data(GEditor*);
extern void remove_all_gaccess P((GEditor*)); extern void remove_all_gaccess(GEditor*);
extern void remove_from_gaccess_list P((char*, GEditor*)); extern void remove_from_gaccess_list(char*, GEditor*);
extern void set_geditor_defaults P((GEditor*, Tick, Tick)); extern void set_geditor_defaults(GEditor*, Tick, Tick);
extern void set_geditor_title P((GEditor*, char*)); extern void set_geditor_title(GEditor*, char*);
extern void set_geditor_vals P((GEditor*, Tick, Tick)); extern void set_geditor_vals(GEditor*, Tick, Tick);
extern void show_geditor P((Calendar*, Tick, Tick)); extern void show_geditor(Calendar*, Tick, Tick);
#endif #endif

6
cde/programs/dtcm/dtcm/help.h
View file

@ -114,9 +114,9 @@
#define DURATION_ERROR_HELP "CalendarDurationError" #define DURATION_ERROR_HELP "CalendarDurationError"
#define ADVANCE_ERROR_HELP "CalendarAdvanceError" #define ADVANCE_ERROR_HELP "CalendarAdvanceError"
extern void show_main_help P((Widget, XtPointer, XtPointer)); extern void show_main_help(Widget, XtPointer, XtPointer);
extern void help_cb P((Widget, XtPointer, XtPointer)); extern void help_cb(Widget, XtPointer, XtPointer);
extern void help_view_cb P((Widget, XtPointer, XtPointer)); extern void help_view_cb(Widget, XtPointer, XtPointer);
#endif #endif

47
cde/programs/dtcm/dtcm/misc.h
View file

@ -55,7 +55,6 @@
#include <X11/Intrinsic.h> #include <X11/Intrinsic.h>
#include <Xm/Xm.h> #include <Xm/Xm.h>
#include <csa.h> #include <csa.h>
#include "ansi_c.h"
#include "calendar.h" #include "calendar.h"
#include "cm_tty.h" #include "cm_tty.h"
#include "datefield.h" #include "datefield.h"
@ -81,31 +80,31 @@ typedef enum {
/* /*
** External function declarations ** External function declarations
*/ */
extern char *cm_mbchar P((char*)); extern char *cm_mbchar(char*);
extern int cm_mbstrlen P((char*)); extern int cm_mbstrlen(char*);
extern Widget create_for_menu P((Widget)); extern Widget create_for_menu (Widget);
extern Widget create_privacy_menu P((Widget)); extern Widget create_privacy_menu(Widget);
extern Widget create_repeat_menu P((Widget, XtCallbackProc, XtPointer)); extern Widget create_repeat_menu(Widget, XtCallbackProc, XtPointer);
extern Widget create_repeat_scope_menu P((Widget, XmString, XtCallbackProc, extern Widget create_repeat_scope_menu(Widget, XmString, XtCallbackProc,
XtPointer)); XtPointer);
extern Widget create_start_stop_time_menu P((Widget, XmString, XtCallbackProc, extern Widget create_start_stop_time_menu(Widget, XmString, XtCallbackProc,
XtPointer, Props*, Boolean, XtPointer, Props*, Boolean,
Boolean, Widget**, int*)); Boolean, Widget**, int*);
extern Widget create_time_scope_menu P((Widget, XmString, XtCallbackProc, extern Widget create_time_scope_menu(Widget, XmString, XtCallbackProc,
XtPointer)); XtPointer);
#ifndef _AIX #ifndef _AIX
extern int dialog_popup P((Widget, ...)); extern int dialog_popup(Widget, ...);
#endif /* _AIX */ #endif /* _AIX */
extern void editor_err_msg P((Widget, char*, Validate_op, Pixmap)); extern void editor_err_msg(Widget, char*, Validate_op, Pixmap);
extern void backend_err_msg P((Widget, char*, CSA_return_code, Pixmap)); extern void backend_err_msg(Widget, char*, CSA_return_code, Pixmap);
extern void get_range P((Glance, time_t, time_t*, time_t*)); extern void get_range(Glance, time_t, time_t*, time_t*);
extern boolean_t query_user P((void*)); extern boolean_t query_user(void*);
extern void set_message P((Widget, char*)); extern void set_message (Widget, char*);
extern void setup_quit_handler P((Widget, XtCallbackProc, caddr_t)); extern void setup_quit_handler(Widget, XtCallbackProc, caddr_t);
extern int ds_is_double_click P((XEvent*, XEvent*)); extern int ds_is_double_click(XEvent*, XEvent*);
extern int cm_select_text P((Widget, Time)); extern int cm_select_text(Widget, Time);
extern void set_time_submenu P((Widget, Widget, Props*, extern void set_time_submenu(Widget, Widget, Props*,
XtCallbackProc, XtPointer, XtCallbackProc, XtPointer,
Boolean, Boolean, Widget**, int*)); Boolean, Boolean, Widget**, int*);
extern void ManageChildren P((Widget)); extern void ManageChildren(Widget);
#endif #endif

6
cde/programs/dtcm/dtcm/monthglance.c
View file

@ -286,7 +286,7 @@ paint_month(Calendar *c, Tick key, XRectangle *rect)
tm = *_XLocaltime(&key, localtime_buf); tm = *_XLocaltime(&key, localtime_buf);
tm.tm_mday = 1; tm.tm_mday = 1;
#ifdef SVR4 #if defined(SVR4) || defined(__linux__)
tm.tm_isdst = -1; tm.tm_isdst = -1;
day = mktime(&tm); day = mktime(&tm);
#else #else
@ -466,7 +466,7 @@ layout_month(
tm = *_XLocaltime(&date, localtime_buf); tm = *_XLocaltime(&date, localtime_buf);
tm.tm_mday = 1; tm.tm_mday = 1;
#ifdef SVR4 #if defined(SVR4) || defined(__linux__)
tm.tm_isdst = -1; tm.tm_isdst = -1;
day = mktime(&tm); day = mktime(&tm);
#else #else
@ -703,7 +703,7 @@ count_month_pages(Calendar *c, Tick start_date, int lines_per_box)
tm = *_XLocaltime(&start_date, localtime_buf); tm = *_XLocaltime(&start_date, localtime_buf);
tm.tm_mday = 1; tm.tm_mday = 1;
#ifdef SVR4 #if defined(SVR4) || defined(__linux__)
tm.tm_isdst = -1; tm.tm_isdst = -1;
day = (int)mktime(&tm); day = (int)mktime(&tm);
#else #else

15
cde/programs/dtcm/dtcm/monthglance.h
View file

@ -53,7 +53,6 @@
#define _MONTHGLANCE_H #define _MONTHGLANCE_H
#include <csa.h> #include <csa.h>
#include "ansi_c.h"
typedef struct month { typedef struct month {
Widget *hot_button; Widget *hot_button;
@ -63,13 +62,13 @@ typedef struct month {
int dayname_height; int dayname_height;
} Month; } Month;
extern void prepare_to_paint_monthview P((Calendar*, XRectangle*)); extern void prepare_to_paint_monthview(Calendar*, XRectangle*);
extern void get_time_str P((Dtcm_appointment*, char*)); extern void get_time_str(Dtcm_appointment*, char*);
extern void month_button P((Widget, XtPointer, XtPointer)); extern void month_button(Widget, XtPointer, XtPointer);
extern void month_event P((XEvent*)); extern void month_event(XEvent*);
extern void paint_grid P((Calendar*, XRectangle*)); extern void paint_grid(Calendar*, XRectangle*);
extern void print_month_range P((Calendar*, Tick, Tick)); extern void print_month_range(Calendar*, Tick, Tick);
extern void cleanup_after_monthview P((Calendar*)); extern void cleanup_after_monthview(Calendar*);
#endif #endif

39
cde/programs/dtcm/dtcm/props_pu.h
View file

@ -31,7 +31,6 @@
#ifndef _PROPS_PU_H #ifndef _PROPS_PU_H
#define _PROPS_PU_H #define _PROPS_PU_H
#include "ansi_c.h"
#include "dssw.h" #include "dssw.h"
#include "props.h" #include "props.h"
#include "reminders.h" #include "reminders.h"
@ -244,25 +243,25 @@ enum
** External function declarations ** External function declarations
** **
*******************************************************************************/ *******************************************************************************/
extern void create_all_pixmaps P((Props_pu*, Widget)); extern void create_all_pixmaps(Props_pu*, Widget);
extern Boolean get_date_vals_from_ui P((Props_pu*, Props*)); extern Boolean get_date_vals_from_ui(Props_pu*, Props*);
extern Boolean get_display_vals_from_ui P((Props_pu*, Props*)); extern Boolean get_display_vals_from_ui(Props_pu*, Props*);
extern Boolean get_editor_vals_from_ui P((Props_pu*, Props*)); extern Boolean get_editor_vals_from_ui(Props_pu*, Props*);
extern Boolean get_gap_vals_from_ui P((Props_pu*, Props*)); extern Boolean get_gap_vals_from_ui(Props_pu*, Props*);
extern Boolean get_printer_vals_from_ui P((Props_pu*, Props*)); extern Boolean get_printer_vals_from_ui(Props_pu*, Props*);
extern Boolean get_props_from_ui P((Props_pu*, Props*, int*)); extern Boolean get_props_from_ui(Props_pu*, Props*, int*);
extern void set_date_vals_on_ui P((Props_pu*, Props*)); extern void set_date_vals_on_ui(Props_pu*, Props*);
extern void set_display_vals_on_ui P((Props_pu*, Props*)); extern void set_display_vals_on_ui(Props_pu*, Props*);
extern void set_editor_vals_on_ui P((Props_pu*, Props*)); extern void set_editor_vals_on_ui(Props_pu*, Props*);
extern void set_gap_vals_on_ui P((Props_pu*, Props*)); extern void set_gap_vals_on_ui(Props_pu*, Props*);
extern void set_printer_vals_on_ui P((Props_pu*, Props*)); extern void set_printer_vals_on_ui(Props_pu*, Props*);
extern void set_props_on_ui P((Props_pu*, Props*)); extern void set_props_on_ui (Props_pu*, Props*);
extern void set_props_pu_defaults P((Props_pu*, Props*)); extern void set_props_pu_defaults(Props_pu*, Props*);
extern void show_props_pu P((Calendar*)); extern void show_props_pu(Calendar*);
extern void props_pu_clean_up P((Props_pu*)); extern void props_pu_clean_up(Props_pu*);
extern Boolean props_pu_showing P((Props_pu*)); extern Boolean props_pu_showing(Props_pu*);
extern Boolean p_flush_changes P((Calendar*)); extern Boolean p_flush_changes (Calendar*);
extern void show_print_props_pu P((Calendar*)); extern void show_print_props_pu(Calendar*);
extern void p_defaults_proc_helper(XtPointer client_data); extern void p_defaults_proc_helper(XtPointer client_data);

17
cde/programs/dtcm/dtcm/reminders.h
View file

@ -54,7 +54,6 @@
#include <X11/Intrinsic.h> #include <X11/Intrinsic.h>
#include <csa.h> #include <csa.h>
#include "ansi_c.h"
#include "misc.h" #include "misc.h"
#define REMINDER_SCOPE_LEN 5 #define REMINDER_SCOPE_LEN 5
@ -114,14 +113,14 @@ typedef struct {
** Editor external function declarations ** Editor external function declarations
** **
*******************************************************************************/ *******************************************************************************/
extern void build_reminders P((Reminders*, Calendar*, Widget)); extern void build_reminders(Reminders*, Calendar*, Widget);
extern Reminder_val_op get_reminders_vals P((Reminders*, Boolean)); extern Reminder_val_op get_reminders_vals(Reminders*, Boolean);
extern Boolean reminders_attrs_to_form P((Reminders*, Dtcm_appointment*)); extern Boolean reminders_attrs_to_form(Reminders*, Dtcm_appointment*);
extern Boolean reminders_appt_to_form P((Reminders*, CSA_entry_handle)); extern Boolean reminders_appt_to_form(Reminders*, CSA_entry_handle);
extern Boolean reminders_form_to_appt P((Reminders*, Dtcm_appointment*, char *)); extern Boolean reminders_form_to_appt(Reminders*, Dtcm_appointment*, char *);
extern void set_reminders_defaults P((Reminders*)); extern void set_reminders_defaults(Reminders*);
extern void set_reminders_vals P((Reminders*, Boolean)); extern void set_reminders_vals(Reminders*, Boolean);
extern void reminders_init P((Reminders*, Calendar*, Widget)); extern void reminders_init(Reminders*, Calendar*, Widget);
#endif #endif

29
cde/programs/dtcm/dtcm/rfp.h
View file

@ -53,7 +53,6 @@
#define _RFP_H #define _RFP_H
#include <csa.h> #include <csa.h>
#include "ansi_c.h"
#include "calendar.h" #include "calendar.h"
#include "misc.h" #include "misc.h"
@ -98,20 +97,20 @@ typedef struct {
** RFP (repeat, for, privacy) external function declarations ** RFP (repeat, for, privacy) external function declarations
** **
*******************************************************************************/ *******************************************************************************/
extern void build_rfp P((RFP*, Calendar*, Widget)); extern void build_rfp(RFP*, Calendar*, Widget);
extern void get_rfp_privacy_val P((RFP*)); extern void get_rfp_privacy_val(RFP*);
extern void get_rfp_repeat_val P((RFP*, time_t)); extern void get_rfp_repeat_val(RFP*, time_t);
extern void get_rfp_vals P((RFP*, time_t)); extern void get_rfp_vals(RFP*, time_t);
extern Boolean rfp_attrs_to_form P((RFP*, Dtcm_appointment*)); extern Boolean rfp_attrs_to_form(RFP*, Dtcm_appointment*);
extern Boolean rfp_appt_to_form P((RFP*, CSA_entry_handle)); extern Boolean rfp_appt_to_form(RFP*, CSA_entry_handle);
extern Boolean rfp_form_to_appt P((RFP*, Dtcm_appointment*, char*)); extern Boolean rfp_form_to_appt(RFP*, Dtcm_appointment*, char*);
extern Boolean rfp_form_flags_to_appt P((RFP*, Dtcm_appointment*, char*, int *)); extern Boolean rfp_form_flags_to_appt(RFP*, Dtcm_appointment*, char*, int *);
extern void set_rfp_privacy_val P((RFP*)); extern void set_rfp_privacy_val(RFP*);
extern void set_rfp_repeat_val P((RFP*)); extern void set_rfp_repeat_val(RFP*);
extern void set_rfp_defaults P((RFP*)); extern void set_rfp_defaults(RFP*);
extern void set_rfp_vals P((RFP*)); extern void set_rfp_vals(RFP*);
extern void rfp_set_repeat_values P((RFP*)); extern void rfp_set_repeat_values(RFP*);
extern void rfp_init P((RFP*, Calendar *, Widget)); extern void rfp_init(RFP*, Calendar *, Widget);
#endif #endif

23
cde/programs/dtcm/dtcm/select.h
View file

@ -52,7 +52,6 @@
#ifndef _SELECT_H #ifndef _SELECT_H
#define _SELECT_H #define _SELECT_H
#include "ansi_c.h"
#include "browser.h" #include "browser.h"
#include "calendar.h" #include "calendar.h"
@ -79,16 +78,16 @@ typedef struct {
int y; int y;
} pr_pos; } pr_pos;
extern void activate_selection P((Selection*)); extern void activate_selection(Selection*);
extern void browser_deselect P((Calendar *, Browser*)); extern void browser_deselect(Calendar *, Browser*);
extern void browser_select P((Calendar *, Browser*, pr_pos*)); extern void browser_select(Calendar *, Browser*, pr_pos*);
extern void calendar_deselect P((Calendar*)); extern void calendar_deselect(Calendar*);
extern void calendar_select P((Calendar*, Selection_unit, caddr_t)); extern void calendar_select (Calendar*, Selection_unit, caddr_t);
extern void deactivate_selection P((Selection *)); extern void deactivate_selection(Selection *);
extern void monthbox_deselect P((Calendar*)); extern void monthbox_deselect(Calendar*);
extern void monthbox_select P((Calendar*)); extern void monthbox_select(Calendar*);
extern void paint_selection P((Calendar*)); extern void paint_selection(Calendar*);
extern int selection_active P((Selection*)); extern int selection_active(Selection*);
extern void weekchart_select P((Calendar*)); extern void weekchart_select(Calendar*);
#endif #endif

5
cde/programs/dtcm/dtcm/session.h
View file

@ -52,10 +52,9 @@
#ifndef _SESSION_H #ifndef _SESSION_H
#define _SESSION_H #define _SESSION_H
#include "ansi_c.h"
#include "calendar.h" #include "calendar.h"
extern void CMSaveSessionCB P((Widget, XtPointer, XtPointer)); extern void CMSaveSessionCB(Widget, XtPointer, XtPointer);
extern void GetSessionInfo P(()); extern void GetSessionInfo();
#endif #endif

3
cde/programs/dtcm/dtcm/tempbr.h
View file

@ -52,7 +52,6 @@
#ifndef _TEMPBR_H #ifndef _TEMPBR_H
#define _TEMPBR_H #define _TEMPBR_H
#include "ansi_c.h"
#include "calendar.h" #include "calendar.h"
#ifdef FNS #ifdef FNS
#include "cmfns.h" #include "cmfns.h"
@ -76,6 +75,6 @@ typedef struct {
#endif #endif
} Tempbr; } Tempbr;
extern caddr_t make_tempbr P(()); extern caddr_t make_tempbr(Calendar *c);
#endif /* _TEMPBR_H */ #endif /* _TEMPBR_H */

4
cde/programs/dtcm/dtcm/timezone.h
View file

@ -73,7 +73,7 @@ typedef struct {
char gmttimezone[BUFSIZ]; char gmttimezone[BUFSIZ];
}Timezone; }Timezone;
extern caddr_t make_timezone P((Calendar*)); extern caddr_t make_timezone(Calendar*);
extern void refresh_timezone P((Timezone*)); extern void refresh_timezone(Timezone*);
#endif #endif

39
cde/programs/dtcm/dtcm/todo.h
View file

@ -53,7 +53,6 @@
#define _TODO_H #define _TODO_H
#include <csa.h> #include <csa.h>
#include "ansi_c.h"
#include "calendar.h" #include "calendar.h"
#include "misc.h" #include "misc.h"
#include "dssw.h" #include "dssw.h"
@ -130,24 +129,24 @@ typedef struct {
** ToDo external function declarations ** ToDo external function declarations
** **
*******************************************************************************/ *******************************************************************************/
extern void add_to_todo_list P((CSA_entry_handle, ToDo*)); extern void add_to_todo_list(CSA_entry_handle, ToDo*);
extern void add_all_todo P((ToDo*)); extern void add_all_todo(ToDo*);
extern void build_todo_list P((ToDo*, Tick, Glance, CSA_entry_handle**, extern void build_todo_list(ToDo*, Tick, Glance, CSA_entry_handle**,
CSA_uint32*, todo_view_op)); CSA_uint32*, todo_view_op);
extern int build_todo_view P((ToDo*, Glance, Boolean)); extern int build_todo_view(ToDo*, Glance, Boolean);
extern void get_todo_vals P((ToDo*)); extern void get_todo_vals(ToDo*);
extern void todo_hide P((ToDo*)); extern void todo_hide(ToDo*);
extern void set_todo_defaults P((ToDo*)); extern void set_todo_defaults(ToDo*);
extern void set_todo_title P((ToDo*, char*)); extern void set_todo_title(ToDo*, char*);
extern void set_todo_vals P((ToDo*)); extern void set_todo_vals(ToDo*);
extern void show_todo P((Calendar*)); extern void show_todo(Calendar*);
extern void t_make_todo P((Calendar*)); extern void t_make_todo(Calendar*);
extern void show_todo_view P((Calendar*, todo_view_op)); extern void show_todo_view(Calendar*, todo_view_op);
extern void todo_clean_up P((ToDo*)); extern void todo_clean_up(ToDo*);
extern Boolean todo_showing P((ToDo*)); extern Boolean todo_showing(ToDo*);
extern Boolean todo_view_showing P((ToDo*)); extern Boolean todo_view_showing(ToDo*);
extern CSA_entry_handle t_nth_appt P((ToDo*, int)); extern CSA_entry_handle t_nth_appt(ToDo*, int);
extern Boolean todo_insert P((Dtcm_appointment*, CSA_entry_handle*, extern Boolean todo_insert(Dtcm_appointment*, CSA_entry_handle*,
Calendar*)); Calendar*);
#endif #endif

15
cde/programs/dtcm/dtcm/weekglance.h
View file

@ -53,7 +53,6 @@
#define _WEEKGLANCE_H #define _WEEKGLANCE_H
#include <csa.h> #include <csa.h>
#include "ansi_c.h"
typedef struct week { typedef struct week {
int start_date; int start_date;
@ -86,12 +85,12 @@ typedef struct week {
typedef enum {okay, lower, upper} Boundary; typedef enum {okay, lower, upper} Boundary;
extern void paint_weekview P((Calendar*, XRectangle*)); extern void paint_weekview(Calendar*, XRectangle*);
extern void print_week_range P((Calendar*, Tick, Tick)); extern void print_week_range(Calendar*, Tick, Tick);
extern int count_multi_appts P((CSA_entry_handle*, int, Calendar*)); extern int count_multi_appts(CSA_entry_handle*, int, Calendar*);
extern void week_button P((Widget, XtPointer, XtPointer)); extern void week_button(Widget, XtPointer, XtPointer);
extern void week_event P((XEvent*)); extern void week_event(XEvent*);
extern void cleanup_after_weekview P((Calendar*)); extern void cleanup_after_weekview(Calendar*);
extern void resize_weekview P((Calendar *, Boundary *)); extern void resize_weekview(Calendar *, Boundary *);
#endif #endif

74
cde/programs/dtcm/dtcm/x_graphics.h
View file

@ -43,43 +43,43 @@
#define PAGE_HEIGHT 11000 /* 11.0" paper height */ #define PAGE_HEIGHT 11000 /* 11.0" paper height */
#define XINCH 1000 /* 1 inch */ #define XINCH 1000 /* 1 inch */
extern void x_day_header P((void *)); extern void x_day_header(void *);
extern void x_day_timeslots P((void *, int, Boolean)); extern void x_day_timeslots(void *, int, Boolean);
extern void x_finish_printer P((void *)); extern void x_finish_printer(void *);
extern void x_finish_std_month P(()); extern void x_finish_std_month();
extern int x_get_day_lines_per_page P((void *)); extern int x_get_day_lines_per_page(void *);
extern int x_get_month_lines_per_page P((void *)); extern int x_get_month_lines_per_page(void *);
extern int x_get_week_lines_per_page P((void *)); extern int x_get_week_lines_per_page(void *);
extern void x_init_day P((void *, int)); extern void x_init_day(void *, int);
extern void x_init_list P((void *)); extern void x_init_list(void *);
extern void x_init_month P((void *, int)); extern void x_init_month(void *, int);
extern void x_init_printer P((void *, short)); extern void x_init_printer(void *, short);
extern void x_init_std_year P((void *)); extern void x_init_std_year(void *);
extern void x_init_week P((void *)); extern void x_init_week(void *);
extern void x_month_daynames P((void *, int)); extern void x_month_daynames(void *, int);
extern void x_month_timeslots P((void *, Tick, Boolean)); extern void x_month_timeslots(void *, Tick, Boolean);
extern void * x_open_file P((Calendar *)); extern void * x_open_file (Calendar *);
extern void x_print_file P((void *, Calendar *)); extern void x_print_file(void *, Calendar *);
extern void x_print_header P((void *, char*, int, int)); extern void x_print_header(void *, char*, int, int);
extern void x_print_list_range P((Calendar*, CSA_sint32, int, extern void x_print_list_range(Calendar*, CSA_sint32, int,
Tick, Tick)); Tick, Tick);
extern void x_print_little_months P((void *, Tick)); extern void x_print_little_months(void *, Tick);
extern void x_print_month P((void *, int, int, int, extern void x_print_month(void *, int, int, int,
int, int, int, int)); int, int, int, int);
extern Boolean x_print_month_appts P((void *, CSA_entry_handle*, int, extern Boolean x_print_month_appts(void *, CSA_entry_handle*, int,
int, time_t, int)); int, time_t, int);
extern Boolean x_print_multi_appts P((void *, CSA_entry_handle*, int, extern Boolean x_print_multi_appts(void *, CSA_entry_handle*, int,
int, Glance)); int, Glance);
extern void x_print_todo P((void *, CSA_entry_handle*, int, extern void x_print_todo(void *, CSA_entry_handle*, int,
CSA_sint32, Boolean, int, time_t, CSA_sint32, Boolean, int, time_t,
char *)); char *);
extern void x_print_year P((void *, int)); extern void x_print_year(void *, int);
extern void x_std_month_name P((void *, char*)); extern void x_std_month_name(void *, char*);
extern void x_std_year_name P((void *, int)); extern void x_std_year_name(void *, int);
extern void x_week_appt_boxes P((void *)); extern void x_week_appt_boxes(void *);
extern void x_week_daynames P((void *, char*, int, Boolean)); extern void x_week_daynames(void *, char*, int, Boolean);
extern void x_week_sched_boxes P((void *)); extern void x_week_sched_boxes(void *);
extern void x_week_sched_draw P((void *, int)); extern void x_week_sched_draw(void *, int);
extern void x_week_sched_init P((void *)); extern void x_week_sched_init(void *);
#endif #endif

8
cde/programs/dtcm/dtcm/yearglance.h
View file

@ -65,9 +65,9 @@ typedef struct year {
int year_shown; int year_shown;
} Year; } Year;
extern void cleanup_after_yearview P((Calendar *)); extern void cleanup_after_yearview(Calendar *);
extern void year_button P((Widget, XtPointer, XtPointer)); extern void year_button(Widget, XtPointer, XtPointer);
extern CSA_return_code paint_year P((Calendar*)); extern CSA_return_code paint_year(Calendar*);
extern void print_std_year_range P((int, int)); extern void print_std_year_range(int, int);
#endif #endif

99
cde/programs/dtcm/libDtCmP/cm_tty.h
View file

@ -54,7 +54,6 @@
#include <csa.h> #include <csa.h>
#include <nl_types.h> #include <nl_types.h>
#include "ansi_c.h"
#include "timeops.h" #include "timeops.h"
#include "util.h" #include "util.h"
#include "props.h" #include "props.h"
@ -175,60 +174,60 @@ static const int ALL_DAY = -2;
/* /*
* External function definitions * External function definitions
*/ */
extern char *boolean_str P((boolean_t)); extern char *boolean_str(boolean_t);
extern int cm_tty_delete P((nl_catd, CSA_session_handle, int, int, CSA_entry_handle*)); extern int cm_tty_delete(nl_catd, CSA_session_handle, int, int, CSA_entry_handle*);
extern void cm_tty_format_header P((Props*, Tick, char*)); extern void cm_tty_format_header(Props*, Tick, char*);
extern int cm_tty_insert P((nl_catd, CSA_session_handle, int, char*, char*, extern int cm_tty_insert(nl_catd, CSA_session_handle, int, char*, char*,
char*, char*, char*, char*, char*, char*, char*, char*,
char*, Props*)); char*, Props*);
extern void cm_tty_load_props P((Props**)); extern void cm_tty_load_props(Props**);
extern int cm_tty_lookup P((nl_catd, CSA_session_handle, int, char*, char*, extern int cm_tty_lookup(nl_catd, CSA_session_handle, int, char*, char*,
CSA_entry_handle**, Props*)); CSA_entry_handle**, Props*);
extern boolean_t convert_boolean_str P((char*)); extern boolean_t convert_boolean_str(char*);
extern CSA_sint32 convert_privacy_str P((char*)); extern CSA_sint32 convert_privacy_str(char*);
extern int convert_privacy_str_to_op P((char*)); extern int convert_privacy_str_to_op (char*);
extern SeparatorType convert_separator_str P((char*)); extern SeparatorType convert_separator_str(char*);
extern Time_scope_menu_op convert_time_scope_str P((char*)); extern Time_scope_menu_op convert_time_scope_str(char*);
extern char *day_str P((Days_op)); extern char *day_str(Days_op);
extern char *default_repeat_cnt_str P((Repeat_menu_op)); extern char *default_repeat_cnt_str(Repeat_menu_op);
extern char *default_repeat_scope_str P((nl_catd, Repeat_menu_op)); extern char *default_repeat_scope_str(nl_catd, Repeat_menu_op);
extern char *for_str P((For_menu_op)); extern char *for_str(For_menu_op);
extern char *get_datemsg P((OrderingType, extern char *get_datemsg(OrderingType,
SeparatorType)); SeparatorType);
extern Parse_key_op identify_parse_key P((char*)); extern Parse_key_op identify_parse_key(char*);
extern void load_appt_defaults P((Dtcm_appointment*, Props*)); extern void load_appt_defaults(Dtcm_appointment*, Props*);
extern void load_reminder_props P((Dtcm_appointment*, Props*)); extern void load_reminder_props(Dtcm_appointment*, Props*);
extern char *month_str P((Months_op)); extern char *month_str(Months_op);
extern Validate_op parse_appt_from_file P((nl_catd, char*, CmDataList*, extern Validate_op parse_appt_from_file(nl_catd, char*, CmDataList*,
Props*, boolean_t(*)(void*), Props*, boolean_t(*)(void*),
void*, int)); void*, int);
extern char *parse_attrs_to_string P((Dtcm_appointment*, Props*, extern char *parse_attrs_to_string(Dtcm_appointment*, Props*,
char*)); char*);
extern char *attrs_to_string P((CSA_attribute *, int)); extern char *attrs_to_string(CSA_attribute *, int);
extern char *create_rfc_message P((char *, char *, char**, int)); extern char *create_rfc_message(char *, char *, char**, int);
extern char *parse_appt_to_string P((CSA_session_handle, CSA_entry_handle, Props*, int)); extern char *parse_appt_to_string(CSA_session_handle, CSA_entry_handle, Props*, int);
extern char *periodstr_from_period P((CSA_sint32, int)); extern char *periodstr_from_period(CSA_sint32, int);
extern char *privacy_str P((int)); extern char *privacy_str(int);
extern char *privacy_str_old P((int)); extern char *privacy_str_old(int);
extern char *repeat_str P((nl_catd, Repeat_menu_op)); extern char *repeat_str (nl_catd, Repeat_menu_op);
extern char *repeat_scope_str P((nl_catd, Repeat_scope_menu_op)); extern char *repeat_scope_str(nl_catd, Repeat_scope_menu_op);
extern char *privacy_str_411 P((int)); extern char *privacy_str_411(int);
extern char *separator_str P((SeparatorType)); extern char *separator_str(SeparatorType);
extern void str_to_period P((char*, CSA_sint32*, int*)); extern void str_to_period(char*, CSA_sint32*, int*);
extern int timescopestring_to_tick P((char*)); extern int timescopestring_to_tick(char*);
extern char *time_scope_str P((Time_scope_menu_op)); extern char *time_scope_str(Time_scope_menu_op);
extern char *time_scope_str_i18n P((nl_catd, Time_scope_menu_op)); extern char *time_scope_str_i18n(nl_catd, Time_scope_menu_op);
extern boolean_t valid_time P((Props*, char*)); extern boolean_t valid_time(Props*, char*);
extern Validate_op validate_appt P((nl_catd, Dtcm_appointment*, extern Validate_op validate_appt(nl_catd, Dtcm_appointment*,
char*, char*, char*, int, char*, char*, char*, int,
char*, char*, char*, char*, char*, char*,
boolean_t(*)(void*), void*, boolean_t(*)(void*), void*,
int)); int);
extern Validate_op validate_dssw P((Dtcm_appointment*, char*, extern Validate_op validate_dssw(Dtcm_appointment*, char*,
char*, char*, int, char*, char*, char*, int, char*,
boolean_t(*)(void*), void*)); boolean_t(*)(void*), void*);
extern Validate_op validate_rfp P((nl_catd, Dtcm_appointment*, extern Validate_op validate_rfp(nl_catd, Dtcm_appointment*,
char*, char*, int)); char*, char*, int);
extern Validate_op validate_reminders P((Dtcm_appointment*)); extern Validate_op validate_reminders(Dtcm_appointment*);
#endif #endif

13
cde/programs/dtcm/libDtCmP/getdate.h
View file

@ -64,7 +64,6 @@ struct timeb
#include <sys/timeb.h> #include <sys/timeb.h>
#endif #endif
#include <time.h> #include <time.h>
#include "ansi_c.h"
#define BOT_YEAR 1970 #define BOT_YEAR 1970
#define EOT_YEAR 2037 #define EOT_YEAR 2037
@ -77,12 +76,12 @@ struct timeb
#define DATE_BHOUR -7 /* date had a bad hour number */ #define DATE_BHOUR -7 /* date had a bad hour number */
#define DATE_CONV -8 /* date converted poorly for am/pm/24hr */ #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 dateconv (int, int, int, int, int, int, int, int, int);
extern time_t dayconv P((int, int, time_t)); extern time_t dayconv (int, int, time_t);
extern time_t timeconv P((int, int, int, int)); extern time_t timeconv (int, int, int, int);
extern time_t monthadd P((time_t, time_t)); extern time_t monthadd (time_t, time_t);
extern time_t daylcorr P((time_t, time_t)); extern time_t daylcorr (time_t, time_t);
extern time_t cm_getdate P((char*, struct timeb *)); extern time_t cm_getdate (char*, struct timeb *);
int yylex(); int yylex();
extern void yyerror(char *s); extern void yyerror(char *s);

19
cde/programs/dtcm/libDtCmP/props.h
View file

@ -53,7 +53,6 @@
#define _PROPS_H #define _PROPS_H
#include <sys/types.h> #include <sys/types.h>
#include "ansi_c.h"
#include "resource.h" #include "resource.h"
/******************************************************************************* /*******************************************************************************
@ -150,14 +149,14 @@ typedef struct {
** External function declarations ** External function declarations
** **
*******************************************************************************/ *******************************************************************************/
extern boolean_t cal_convert_cmrc P((Props*)); extern boolean_t cal_convert_cmrc(Props*);
extern char *get_char_prop P((Props*, Props_op)); extern char *get_char_prop(Props*, Props_op);
extern char *get_char_prop_default P((Props_op)); extern char *get_char_prop_default(Props_op);
extern int get_int_prop P((Props*, Props_op)); extern int get_int_prop(Props*, Props_op);
extern void props_clean_up P((Props*)); extern void props_clean_up(Props*);
extern boolean_t read_props P((Props*)); extern boolean_t read_props(Props*);
extern boolean_t save_props P((Props*)); extern boolean_t save_props(Props*);
extern boolean_t set_char_prop P((Props*, Props_op, char*)); extern boolean_t set_char_prop(Props*, Props_op, char*);
extern boolean_t set_int_prop P((Props*, Props_op, int)); extern boolean_t set_int_prop(Props*, Props_op, int);
#endif #endif

19
cde/programs/dtcm/libDtCmP/resource.h
View file

@ -52,7 +52,6 @@
#ifndef _RESOURCE_H #ifndef _RESOURCE_H
#define _RESOURCE_H #define _RESOURCE_H
#include "ansi_c.h"
#include <sys/types.h> #include <sys/types.h>
/* /*
@ -68,14 +67,14 @@ typedef struct Resource Resource;
/* /*
** Function declarations ** Function declarations
*/ */
extern void free_resources P((Resource*)); extern void free_resourcee(Resource*);
extern char *get_resource P((Resource*, char *, char*, extern char *get_resource(Resource*, char *, char*,
char*, char*)); char*, char*);
extern char *get_resource_by_val P((Resource*, char*, char*)); extern char *get_resource_by_val(Resource*, char*, char*);
extern boolean_t load_resources P((Resource**, char*)); extern boolean_t load_resources(Resource**, char*);
extern boolean_t save_resources P((Resource*, char*)); extern boolean_t save_resources(Resource*, char*);
extern boolean_t set_resource P((Resource**, char*, char*, extern boolean_t set_resource(Resource**, char*, char*,
char*, char*)); char*, char*);
extern boolean_t set_resource_by_val P((Resource**, char*, char*)); extern boolean_t set_resource_by_val(Resource**, char*, char*);
#endif #endif

133
cde/programs/dtcm/libDtCmP/timeops.h
View file

@ -53,7 +53,6 @@
#define _TIMEOPS_H #define _TIMEOPS_H
#include <EUSCompat.h> #include <EUSCompat.h>
#include "ansi_c.h"
typedef enum { typedef enum {
minsec = 60, minsec = 60,
@ -81,71 +80,71 @@ extern char *months2[];
extern int monthsecs[]; extern int monthsecs[];
extern char *numbers[]; extern char *numbers[];
extern int days_to_seconds P((int)); extern int days_to_seconds (int);
extern int dom P((Tick)); extern int dom (Tick);
extern int dow P((Tick)); extern int dow (Tick);
extern int fdom P((Tick)); extern int fdom (Tick);
extern Tick first_dom P((Tick)); extern Tick first_dom (Tick);
extern Tick first_dow P((Tick)); extern Tick first_dow (Tick);
extern Tick get_eot P(()); extern Tick get_eot (void);
extern Tick get_bot P(()); extern Tick get_bot (void);
extern long gmt_off P(()); extern long gmt_off (void);
extern int hour P((Tick)); extern int hour (Tick);
extern int hours_to_seconds P((int)); extern int hours_to_seconds(int);
extern void init_time P(()); extern void init_time (void);
extern Tick jan1 P((Tick)); extern Tick jan1 (Tick);
extern Tick last_dom P((Tick)); extern Tick last_dom (Tick);
extern Tick last_dow P((Tick)); extern Tick last_dow (Tick);
extern Tick last_ndays P((Tick t, int)); extern Tick last_ndays (Tick t, int);
extern int lastapptofweek P((u_int)); extern int lastapptofweek (u_int);
extern Tick lastjan1 P((Tick)); extern Tick lastjan1 (Tick);
extern int ldom P((Tick)); extern int ldom (Tick);
extern Tick lower_bound P((int, Tick)); extern Tick lower_bound (int, Tick);
extern Tick lowerbound P((Tick)); extern Tick lowerbound (Tick);
extern boolean_t magic_time P((Tick t)); extern boolean_t magic_time (Tick t);
extern Tick midnight P(()); extern Tick midnight ();
extern int minutes_to_seconds P((int)); extern int minutes_to_seconds(int);
extern int minute P((Tick)); extern int minute (Tick);
extern int month P((Tick)); extern int month (Tick);
extern Tick monthdayyear P((int, int, int)); extern Tick monthdayyear (int, int, int);
extern int monthlength P((Tick)); extern int monthlength (Tick);
extern Tick next_ndays P((Tick, int)); extern Tick next_ndays (Tick, int);
extern Tick next_nhours P((Tick, int)); extern Tick next_nhours (Tick, int);
extern Tick next2weeks P((Tick)); extern Tick next2weeks (Tick);
extern Tick nextday P((Tick)); extern Tick nextday (Tick);
extern Tick nextjan1 P((Tick)); extern Tick nextjan1 (Tick);
extern Tick nextmonth P((Tick t)); extern Tick nextmonth (Tick t);
extern Tick next_nmonth P((Tick t, int n)); extern Tick next_nmonth (Tick t, int n);
extern Tick nextmonth_exactday P((Tick t)); extern Tick nextmonth_exactday(Tick t);
extern Tick nextweek P((Tick t)); extern Tick nextweek (Tick t);
extern Tick nextyear P((Tick)); extern Tick nextyear (Tick);
extern Tick nextnyear P((Tick t, int n)); extern Tick nextnyear (Tick t, int n);
extern Tick now P(()); extern Tick now (void);
extern int ntimes_this_week P((u_int, int)); extern int ntimes_this_week(u_int, int);
extern int numwks P((Tick)); extern int numwks (Tick);
extern Tick prev_nmonth P((Tick t, int n)); extern Tick prev_nmonth (Tick t, int n);
extern Tick prevmonth_exactday P((Tick)); extern Tick prevmonth_exactday(Tick);
extern Tick previousmonth P((Tick t)); extern Tick previousmonth (Tick t);
extern Tick prevweek P((Tick t)); extern Tick prevweek (Tick t);
extern Tick prev2weeks P((Tick t)); extern Tick prev2weeks (Tick t);
extern Tick prevnyear P((Tick t, int n)); extern Tick prevnyear (Tick t, int n);
extern int seconds P((int n, Unit unit)); extern int seconds (int n, Unit unit);
extern double seconds_dble P((double n, Unit unit)); extern double seconds_dble (double n, Unit unit);
extern int seconds_to_days P((int)); extern int seconds_to_days (int);
extern int seconds_to_hours P((int)); extern int seconds_to_hours(int);
extern int seconds_to_minutes P((int)); extern int seconds_to_minutes(int);
extern int seconds_to_weeks P((int)); extern int seconds_to_weeks(int);
extern void set_timezone P((char*)); extern void set_timezone (char*);
extern int timeok P((Tick t)); extern int timeok (Tick t);
extern Tick upperbound P((Tick)); extern Tick upperbound (Tick);
extern int weeks_to_seconds P((int)); extern int weeks_to_seconds(int);
extern int wom P((Tick)); extern int wom (Tick);
extern boolean_t weekofmonth P((Tick, int*)); extern boolean_t weekofmonth (Tick, int*);
extern Tick xytoclock P((int, int, Tick)); extern Tick xytoclock (int, int, Tick);
extern int year P((Tick)); extern int year (Tick);
extern int adjust_dst P((Tick, Tick)); extern int adjust_dst (Tick, Tick);
extern boolean_t adjust_hour P((int*)); extern boolean_t adjust_hour (int*);
extern int leapyr P((int)); extern int leapyr (int);
extern Tick prevday P((Tick)); extern Tick prevday (Tick);
#endif #endif

Some files were not shown because too many files have changed in this diff Show more