From d98b2c4c34092a70fe42dbae29b91f94e2b4dc73 Mon Sep 17 00:00:00 2001 From: Peter Howkins Date: Sun, 29 Nov 2020 01:55:09 +0000 Subject: [PATCH] dtcm: Always use ANSI function prototypes --- cde/programs/dtcm/dtcm/alarm.h | 17 ++- cde/programs/dtcm/dtcm/blist.h | 13 ++- cde/programs/dtcm/dtcm/browser.h | 37 ++++--- cde/programs/dtcm/dtcm/calendar.h | 115 ++++++++++---------- cde/programs/dtcm/dtcm/cm_i18n.h | 14 +-- cde/programs/dtcm/dtcm/common.h | 18 ++-- cde/programs/dtcm/dtcm/datefield.h | 9 +- cde/programs/dtcm/dtcm/dayglance.h | 27 +++-- cde/programs/dtcm/dtcm/deskset.h | 11 +- cde/programs/dtcm/dtcm/dnd.h | 16 ++- cde/programs/dtcm/dtcm/dssw.h | 33 +++--- cde/programs/dtcm/dtcm/editor.h | 45 ++++---- cde/programs/dtcm/dtcm/find.h | 6 +- cde/programs/dtcm/dtcm/format.h | 25 +++-- cde/programs/dtcm/dtcm/goto.h | 4 +- cde/programs/dtcm/dtcm/group_editor.h | 31 +++--- cde/programs/dtcm/dtcm/help.h | 6 +- cde/programs/dtcm/dtcm/misc.h | 47 ++++----- cde/programs/dtcm/dtcm/monthglance.h | 15 ++- cde/programs/dtcm/dtcm/props_pu.h | 39 ++++--- cde/programs/dtcm/dtcm/reminders.h | 17 ++- cde/programs/dtcm/dtcm/rfp.h | 29 +++-- cde/programs/dtcm/dtcm/select.h | 23 ++-- cde/programs/dtcm/dtcm/session.h | 5 +- cde/programs/dtcm/dtcm/tempbr.h | 3 +- cde/programs/dtcm/dtcm/timezone.h | 4 +- cde/programs/dtcm/dtcm/todo.h | 39 ++++--- cde/programs/dtcm/dtcm/weekglance.h | 15 ++- cde/programs/dtcm/dtcm/x_graphics.h | 74 ++++++------- cde/programs/dtcm/dtcm/yearglance.h | 8 +- cde/programs/dtcm/libDtCmP/cm_tty.h | 99 +++++++++-------- cde/programs/dtcm/libDtCmP/getdate.h | 13 ++- cde/programs/dtcm/libDtCmP/props.h | 19 ++-- cde/programs/dtcm/libDtCmP/resource.h | 21 ++-- cde/programs/dtcm/libDtCmP/timeops.h | 133 ++++++++++++----------- cde/programs/dtcm/libDtCmP/util.h | 141 ++++++++++++------------- cde/programs/dtcm/server/access.h | 35 +++--- cde/programs/dtcm/server/callback.h | 55 +++++----- cde/programs/dtcm/server/cmsattr.h | 29 +++-- cde/programs/dtcm/server/cmscalendar.h | 69 ++++++------ cde/programs/dtcm/server/cmsconvert.h | 45 ++++---- cde/programs/dtcm/server/cmsentry.h | 11 +- cde/programs/dtcm/server/cmsmatch.h | 5 +- cde/programs/dtcm/server/data.h | 2 - cde/programs/dtcm/server/delete.h | 13 ++- cde/programs/dtcm/server/garbage.h | 8 +- cde/programs/dtcm/server/insert.h | 9 +- cde/programs/dtcm/server/lexer.h | 5 +- cde/programs/dtcm/server/lexit.c | 5 +- cde/programs/dtcm/server/list.h | 39 ++++--- cde/programs/dtcm/server/log.h | 63 ++++++----- cde/programs/dtcm/server/lookup.h | 31 +++--- cde/programs/dtcm/server/reminder.h | 33 +++--- cde/programs/dtcm/server/repeat.h | 45 ++++---- cde/programs/dtcm/server/rpcextras.h | 6 +- cde/programs/dtcm/server/tree.h | 29 +++-- cde/programs/dtcm/server/update.h | 13 ++- cde/programs/dtcm/server/utility.h | 10 +- cde/programs/dtcm/server/v4ops.h | 79 +++++++------- cde/programs/dtcm/server/v5ops.h | 33 +++--- 60 files changed, 890 insertions(+), 953 deletions(-) diff --git a/cde/programs/dtcm/dtcm/alarm.h b/cde/programs/dtcm/dtcm/alarm.h index 11fa1e667..751db3d7b 100644 --- a/cde/programs/dtcm/dtcm/alarm.h +++ b/cde/programs/dtcm/dtcm/alarm.h @@ -53,15 +53,14 @@ #include #include -#include "ansi_c.h" -extern void compose P((Calendar*, CSA_reminder_reference *, char**)); -extern void flash_it P((XtPointer, XtIntervalId*)); -extern void mail_it P((XtPointer, XtIntervalId*, CSA_reminder_reference *)); -extern void open_it P((XtPointer, XtIntervalId*, CSA_reminder_reference *)); -extern void postup_show_proc P((Calendar*, CSA_reminder_reference *)); -extern void reminder_driver P((XtPointer, XtIntervalId*)); -extern void ring_it P((XtPointer, XtIntervalId*)); -extern void slp P((int x)); +extern void compose(Calendar*, CSA_reminder_reference *, char**); +extern void flash_it(XtPointer, XtIntervalId*); +extern void mail_it(XtPointer, XtIntervalId*, CSA_reminder_reference *); +extern void open_it(XtPointer, XtIntervalId*, CSA_reminder_reference *); +extern void postup_show_proc(Calendar*, CSA_reminder_reference *); +extern void reminder_driver(XtPointer, XtIntervalId*); +extern void ring_it(XtPointer, XtIntervalId*); +extern void slp(int x); #endif diff --git a/cde/programs/dtcm/dtcm/blist.h b/cde/programs/dtcm/dtcm/blist.h index 2a16e5486..dedb60287 100644 --- a/cde/programs/dtcm/dtcm/blist.h +++ b/cde/programs/dtcm/dtcm/blist.h @@ -52,7 +52,6 @@ #ifndef _BLIST_H #define _BLIST_H -#include "ansi_c.h" #include "util.h" /* @@ -107,11 +106,11 @@ typedef struct browser_state { struct browser_state *next; } BrowserState; -extern void blist_clean P((Browselist*, Boolean)); -extern void blist_init_names P((Calendar*)); -extern void blist_init_ui P((Calendar*)); -extern void blist_reset P((Calendar*)); -extern void make_browselist P((Calendar*)); -extern void show_browselist P((Calendar*)); +extern void blist_clean(Browselist*, Boolean); +extern void blist_init_names(Calendar*); +extern void blist_init_ui(Calendar*); +extern void blist_reset(Calendar*); +extern void make_browselist(Calendar*); +extern void show_browselist(Calendar*); #endif diff --git a/cde/programs/dtcm/dtcm/browser.h b/cde/programs/dtcm/dtcm/browser.h index 5f8c578e9..41494a156 100644 --- a/cde/programs/dtcm/dtcm/browser.h +++ b/cde/programs/dtcm/dtcm/browser.h @@ -52,7 +52,6 @@ #ifndef _BROWSER_H #define _BROWSER_H -#include "ansi_c.h" #include "timeops.h" #include "calendar.h" @@ -112,23 +111,23 @@ typedef struct { #define MB_PREVMONTH 4 #define MB_NEXTMONTH 5 -extern void br_display P((Calendar*)); -extern Boolean browser_exists P(()); -extern void browser_reset_list P((Calendar*)); -extern Boolean browser_showing P(()); -extern void make_browser P(()); -extern void mb_draw_chartgrid P(()); -extern void mb_draw_appts P(()); -extern void mb_update_segs P(()); -extern void mb_update_busyicon P(()); -extern void mb_init_blist P(()); -extern void mb_init_canvas P(()); -extern void mb_deregister_names P(()); -extern void mb_refresh_canvas P(()); -extern void sched_proc P(()); -extern void set_default_reminders P(()); -extern void set_default_scope_plus P(()); -extern void set_default_what P(()); -extern void mb_refigure_chart P((Calendar *)); +extern void br_display(Calendar *); +extern Boolean browser_exists(void); +extern void browser_reset_list(Calendar*); +extern Boolean browser_showing(void); +extern void make_browser(Calendar *c); +extern void mb_draw_chartgrid(Browser *b, Calendar *c); +extern void mb_draw_appts(Browser *b, int start, int end, Calendar *c); +extern void mb_update_segs(Browser *, Tick, Tick, int *, int *); +extern void mb_update_busyicon(void); +extern void mb_init_blist(void); +extern void mb_init_canvas(Calendar *c); +extern void mb_deregister_names(char *, Calendar *); +extern void mb_refresh_canvas(Browser *b, Calendar *c); +extern void sched_proc(void); +extern void set_default_reminders(void); +extern void set_default_scope_plus(void); +extern void set_default_what(void); +extern void mb_refigure_chart(Calendar *); #endif diff --git a/cde/programs/dtcm/dtcm/calendar.h b/cde/programs/dtcm/dtcm/calendar.h index 10b68bfff..046c03731 100644 --- a/cde/programs/dtcm/dtcm/calendar.h +++ b/cde/programs/dtcm/dtcm/calendar.h @@ -56,7 +56,6 @@ #include #include #include -#include "ansi_c.h" #include "util.h" #include "timeops.h" #include "props.h" @@ -324,68 +323,68 @@ extern int _csa_tick_to_iso8601(time_t, char *); (int)(r2)->y<=(int)(r1)->y+(int)(r1)->height) -extern void cache_dims P((Calendar*, Dimension, - Dimension)); -extern char* cm_get_relname P(()); -extern Boolean in_range P((time_t, time_t, time_t)); -extern int report_err P((char*)); -extern void reset_alarm P((Calendar*)); -extern CSA_return_code reset_timer P((Calendar*)); -extern CSA_return_code paint_canvas P((Calendar*, XRectangle*, - Render_Type)); -extern void switch_it P((Calendar*, char*, - WindowType)); -extern int yyyerror P((char*)); -extern void gr_clear_area P((new_XContext*, int, int, - Dimension, Dimension)); -extern void gr_clear_box P((new_XContext*, int, int, int, - int)); -extern void gr_make_grayshade P((new_XContext*, int, int, int, - int, int)); -extern void gr_make_gray P((new_XContext*, int, int, int, - int, int)); -extern void gr_make_rgbcolor P((new_XContext*, Colormap, int, +extern void cache_dims(Calendar*, Dimension, + Dimension); +extern char* cm_get_relname(void); +extern Boolean in_range(time_t, time_t, time_t); +extern int report_err(char*); +extern void reset_alarm(Calendar*); +extern CSA_return_code reset_timer(Calendar*); +extern CSA_return_code paint_canvas(Calendar*, XRectangle*, + Render_Type); +extern void switch_it(Calendar*, char*, + WindowType); +extern int yyyerror(char*); +extern void gr_clear_area(new_XContext*, int, int, + Dimension, Dimension); +extern void gr_clear_box(new_XContext*, int, int, int, + int); +extern void gr_make_grayshade(new_XContext*, int, int, int, + int, int); +extern void gr_make_gray(new_XContext*, int, int, int, + int, int); +extern void gr_make_rgbcolor(new_XContext*, Colormap, int, int, int, int, int, int, - int)); -extern int gr_nchars P((int, char*, Cal_Font *)); -extern void gr_draw_rgb_box P((new_XContext*, int, int, int, - int, int, int, Colormap)); -extern void gr_dissolve_box P((new_XContext*, int, int, int, - int, int)); -extern int gr_center P((int, char*, Cal_Font *)); -extern void gr_text P((new_XContext*, int, int, + int); +extern int gr_nchars(int, char*, Cal_Font *); +extern void gr_draw_rgb_box (new_XContext*, int, int, int, + int, int, int, Colormap); +extern void gr_dissolve_box (new_XContext*, int, int, int, + int, int); +extern int gr_center(int, char*, Cal_Font *); +extern void gr_text(new_XContext*, int, int, Cal_Font *, char*, - XRectangle*)); -extern void gr_text_rgb P((new_XContext*, int, int, + XRectangle*); +extern void gr_text_rgb(new_XContext*, int, int, Cal_Font *, char*, Pixel, - Colormap, XRectangle*)); -extern void gr_draw_line P((new_XContext*, int, int, int, + Colormap, XRectangle*); +extern void gr_draw_line(new_XContext*, int, int, int, int, GR_Line_Style, - XRectangle*)); -extern void gr_draw_box P((new_XContext*, int, int, int, - int, XRectangle*)); -extern void gr_draw_glyph P((new_XContext*, new_XContext*, - Pixmap, int, int, int, int)); -extern void gr_set_clip_rectangles P((new_XContext*, int, int, - XRectangle*, int, int)); -extern void gr_clear_clip_rectangles P((new_XContext*)); -extern Boolean gr_init P((new_XContext*, Widget)); -extern new_XContext *gr_create_xcontext P((Calendar*, Widget, GR_depth, - XtAppContext)); -extern Boolean today_inrange P((Calendar*, time_t)); -extern void update_browse_menu_names P((Calendar*)); -extern char* get_user_calendar P(()); -extern void destroy_paint_cache P((Paint_cache *, int)); -extern void invalidate_cache P((Calendar *)); + XRectangle*); +extern void gr_draw_box(new_XContext*, int, int, int, + int, XRectangle*); +extern void gr_draw_glyph(new_XContext*, new_XContext*, + Pixmap, int, int, int, int); +extern void gr_set_clip_rectangles(new_XContext*, int, int, + XRectangle*, int, int); +extern void gr_clear_clip_rectangles(new_XContext*); +extern Boolean gr_init(new_XContext*, Widget); +extern new_XContext *gr_create_xcontext(Calendar*, Widget, GR_depth, + XtAppContext); +extern Boolean today_inrange(Calendar*, time_t); +extern void update_browse_menu_names(Calendar*); +extern char* get_user_calendar(void); +extern void destroy_paint_cache(Paint_cache *, int); +extern void invalidate_cache(Calendar *); -extern CSA_return_code allocate_paint_cache P((CSA_entry_handle *, int, Paint_cache **)); +extern CSA_return_code allocate_paint_cache(CSA_entry_handle *, int, Paint_cache **); -extern Boolean fontlist_to_font P((XmFontList, Cal_Font *)); -extern void CalTextExtents P((Cal_Font *, char *, int, - int *, int *, int *, int *)); -extern void CalDrawString P((Display *, Drawable, +extern Boolean fontlist_to_font(XmFontList, Cal_Font *); +extern void CalTextExtents (Cal_Font *, char *, int, + int *, int *, int *, int *); +extern void CalDrawString (Display *, Drawable, Cal_Font *, GC, int, int, - char *, int)); -extern void CalFontExtents P((Cal_Font *, - XFontSetExtents *)); + char *, int); +extern void CalFontExtents (Cal_Font *, + XFontSetExtents *); #endif diff --git a/cde/programs/dtcm/dtcm/cm_i18n.h b/cde/programs/dtcm/dtcm/cm_i18n.h index d685d4880..dc5f03e28 100644 --- a/cde/programs/dtcm/dtcm/cm_i18n.h +++ b/cde/programs/dtcm/dtcm/cm_i18n.h @@ -92,10 +92,10 @@ extern char *cm_printf(); int is_comment(); int match_locale(); -extern int cm_get_fonts P((char *)); -extern int is_comment P((char[MAX_LINE_LEN])); -extern int match_locale P((char *, char[MAX_LINE_LEN])); -extern void ps_i18n_header P((FILE *, Widget)); -extern char* euc_to_octal P((char *)); -extern char* cm_get_i18n_date P((Widget, char *)); -extern char* cm_printf P((double, int)); +extern int cm_get_fonts(char *); +extern int is_comment(char[MAX_LINE_LEN]); +extern int match_locale(char *, char[MAX_LINE_LEN]); +extern void ps_i18n_header(FILE *, Widget); +extern char* euc_to_octal(char *); +extern char* cm_get_i18n_date(Widget, char *); +extern char* cm_printf(double, int); diff --git a/cde/programs/dtcm/dtcm/common.h b/cde/programs/dtcm/dtcm/common.h index 292fe80ae..fbc2ddc0e 100644 --- a/cde/programs/dtcm/dtcm/common.h +++ b/cde/programs/dtcm/dtcm/common.h @@ -52,22 +52,20 @@ #ifndef _COMMON_H #define _COMMON_H -#include "ansi_c.h" - #if LATER typedef struct { int data_version; char* target; } Cdata; -extern Cdata *get_cdata P(()); -extern void free_cd_from_blist P(()); +extern Cdata *get_cdata(); +extern void free_cd_from_blist(); #endif -extern void reset_values P(()); -extern void backup_values P(()); -extern void blist_write_names P(()); -extern Boolean duplicate_cd P(()); -extern char *get_appt_str P(()); -extern void common_update_lists P(()); +extern void reset_values(void); +extern void backup_values(void); +extern void blist_write_names(void); +extern Boolean duplicate_cd(void); +extern char *get_appt_str(void); +extern void common_update_lists(void); #endif diff --git a/cde/programs/dtcm/dtcm/datefield.h b/cde/programs/dtcm/dtcm/datefield.h index 13bff71ae..23a92810a 100644 --- a/cde/programs/dtcm/dtcm/datefield.h +++ b/cde/programs/dtcm/dtcm/datefield.h @@ -53,16 +53,15 @@ #define _DATEFIELD_H #include -#include "ansi_c.h" #include "props.h" #include "timeops.h" /* ** External function declaration */ -extern char *get_date_from_widget P((Tick, Widget, OrderingType, - SeparatorType)); -extern void set_date_in_widget P((Tick, Widget, OrderingType, - SeparatorType)); +extern char *get_date_from_widget(Tick, Widget, OrderingType, + SeparatorType); +extern void set_date_in_widget(Tick, Widget, OrderingType, + SeparatorType); #endif diff --git a/cde/programs/dtcm/dtcm/dayglance.h b/cde/programs/dtcm/dtcm/dayglance.h index b4617250f..728494c07 100644 --- a/cde/programs/dtcm/dtcm/dayglance.h +++ b/cde/programs/dtcm/dtcm/dayglance.h @@ -53,7 +53,6 @@ #define _DAYGLANCE_H #include -#include "ansi_c.h" #include "props.h" #define MOBOX_AREA_WIDTH (int)(c->view->winw*.4) @@ -82,17 +81,17 @@ typedef struct dayglance { Widget *month_panels; } Day; -extern void init_dayview P((Calendar*)); -extern void day_button P((Widget, XtPointer, XtPointer)); -extern void init_mo P((Calendar*)); -extern void monthbox_datetoxy P((Calendar*)); -extern void monthbox_xytodate P((Calendar*, int x, int y)); -extern void paint_dayview P((Calendar*, Boolean, - XRectangle*, Boolean)); -extern void paint_day P((Calendar*)); -extern void print_day_range P((Calendar*, Tick, Tick)); -extern void day_event P((XEvent*)); -extern int morning P((int)); -extern void paint_day_header P((Calendar *, Tick, void *)); -extern void cleanup_after_dayview P((Calendar *)); +extern void init_dayview(Calendar*); +extern void day_button(Widget, XtPointer, XtPointer); +extern void init_mo(Calendar*); +extern void monthbox_datetoxy(Calendar*); +extern void monthbox_xytodate(Calendar*, int x, int y); +extern void paint_dayview(Calendar*, Boolean, + XRectangle*, Boolean); +extern void paint_day(Calendar*); +extern void print_day_range (Calendar*, Tick, Tick); +extern void day_event(XEvent*); +extern int morning(int); +extern void paint_day_header(Calendar *, Tick, void *); +extern void cleanup_after_dayview(Calendar *); #endif diff --git a/cde/programs/dtcm/dtcm/deskset.h b/cde/programs/dtcm/dtcm/deskset.h index d9c528a9c..0e7af2461 100644 --- a/cde/programs/dtcm/dtcm/deskset.h +++ b/cde/programs/dtcm/dtcm/deskset.h @@ -54,7 +54,6 @@ #include #include -#include "ansi_c.h" /* ** Location ops for ds_position_popup(). @@ -72,10 +71,10 @@ typedef enum { /* ** Function declarations. */ -extern int ds_force_popup_on_screen P((Widget, int*, int*)) ; -extern void ds_get_screen_size P((Widget, int*, int*)) ; -extern int ds_position_popup P((Widget, Widget, - ds_location_op)) ; -extern char *ds_relname P(()); +extern int ds_force_popup_on_screen(Widget, int*, int*); +extern void ds_get_screen_size(Widget, int*, int*); +extern int ds_position_popup(Widget, Widget, + ds_location_op); +extern char *ds_relname(); #endif diff --git a/cde/programs/dtcm/dtcm/dnd.h b/cde/programs/dtcm/dtcm/dnd.h index a19b8766e..ed5144dc2 100644 --- a/cde/programs/dtcm/dtcm/dnd.h +++ b/cde/programs/dtcm/dtcm/dnd.h @@ -52,8 +52,6 @@ #ifndef _DND_H #define _DND_H -#include "ansi_c.h" - typedef enum {SingleEditorList, SingleEditorIcon, GroupEditorList, @@ -72,12 +70,12 @@ typedef struct { #define DRAG_THRESHOLD 4 -extern void cm_register_drop_site P((Calendar *c, Widget w)); -extern void ApptDragStart P((Widget, XEvent *, Calendar *, - EditorType)); -extern void TranslationDragStart P((Widget, XEvent *, String *, - Cardinal *)); -extern void DtcmProcessPress P((Widget, XEvent *, String *, - Cardinal *)); +extern void cm_register_drop_site(Calendar *c, Widget w); +extern void ApptDragStart(Widget, XEvent *, Calendar *, + EditorType); +extern void TranslationDragStart(Widget, XEvent *, String *, + Cardinal *); +extern void DtcmProcessPress(Widget, XEvent *, String *, + Cardinal *); #endif diff --git a/cde/programs/dtcm/dtcm/dssw.h b/cde/programs/dtcm/dtcm/dssw.h index d0b4fcc9a..cbfe7b602 100644 --- a/cde/programs/dtcm/dtcm/dssw.h +++ b/cde/programs/dtcm/dtcm/dssw.h @@ -53,7 +53,6 @@ #define _DSSW_H #include -#include "ansi_c.h" #include "calendar.h" #define DATE_LEN 100 @@ -121,21 +120,21 @@ typedef struct { ** DSSW external function declarations ** *******************************************************************************/ -extern void build_dssw P((DSSW*, Calendar*, Widget, Boolean, Boolean)); -extern Boolean dssw_appt_to_form P((DSSW*, CSA_entry_handle)); -extern Boolean dssw_attrs_to_form P((DSSW*, Dtcm_appointment*)); -extern Boolean dssw_form_to_appt P((DSSW*, Dtcm_appointment*, char*, - Tick)); -extern Boolean dssw_form_flags_to_appt P((DSSW*, Dtcm_appointment*, char*, - Tick, int *)); -extern Boolean dssw_form_to_todo P((DSSW*, Dtcm_appointment*, char*, - Tick)); -extern void load_dssw_times P((DSSW*, Tick, Tick, Boolean)); -extern void get_dssw_times P((DSSW*)); -extern void get_dssw_vals P((DSSW*, Tick)); -extern void set_dssw_defaults P((DSSW*, Tick, Boolean)); -extern void set_dssw_times P((DSSW*)); -extern void set_dssw_vals P((DSSW*, Tick)); -extern void set_dssw_menus P((DSSW*, Props *)); +extern void build_dssw(DSSW*, Calendar*, Widget, Boolean, Boolean); +extern Boolean dssw_appt_to_form(DSSW*, CSA_entry_handle); +extern Boolean dssw_attrs_to_form(DSSW*, Dtcm_appointment*); +extern Boolean dssw_form_to_appt(DSSW*, Dtcm_appointment*, char*, + Tick); +extern Boolean dssw_form_flags_to_appt(DSSW*, Dtcm_appointment*, char*, + Tick, int *); +extern Boolean dssw_form_to_todo(DSSW*, Dtcm_appointment*, char*, + Tick); +extern void load_dssw_times(DSSW*, Tick, Tick, Boolean); +extern void get_dssw_times(DSSW*); +extern void get_dssw_vals(DSSW*, Tick); +extern void set_dssw_defaults(DSSW*, Tick, Boolean); +extern void set_dssw_times(DSSW*); +extern void set_dssw_vals(DSSW*, Tick); +extern void set_dssw_menus(DSSW*, Props *); #endif diff --git a/cde/programs/dtcm/dtcm/editor.h b/cde/programs/dtcm/dtcm/editor.h index aa5c99490..4a71f5b5a 100644 --- a/cde/programs/dtcm/dtcm/editor.h +++ b/cde/programs/dtcm/dtcm/editor.h @@ -53,7 +53,6 @@ #define _EDITOR_H #include -#include "ansi_c.h" #include "calendar.h" #include "misc.h" #include "dssw.h" @@ -115,27 +114,27 @@ typedef struct { ** Editor external function declarations ** *******************************************************************************/ -extern void add_to_appt_list P((CSA_entry_handle, Editor*)); -extern void add_all_appt P((Editor*)); -extern void build_editor_list P((Editor*, Tick, Glance, CSA_entry_handle**, - CSA_uint32*)); -extern int build_editor_view P((Editor*, Glance, Boolean)); -extern Boolean editor_change P((Dtcm_appointment*, CSA_entry_handle, - CSA_entry_handle*, Calendar*)); -extern void editor_clean_up P((Editor*)); -extern Boolean editor_created P((Editor*)); -extern Boolean editor_delete P((CSA_entry_handle, Calendar*)); -extern Boolean editor_insert P((Dtcm_appointment*, CSA_entry_handle*, - Calendar*)); -extern CSA_entry_handle editor_nth_appt P((Editor*, int)); -extern Boolean editor_showing P((Editor*)); -extern Boolean editor_view_showing P((Editor*)); -extern void get_editor_vals P((Editor*)); -extern void set_editor_defaults P((Editor*, Tick, Tick, Boolean)); -extern void set_editor_title P((Editor*, char *)); -extern void set_editor_vals P((Editor*, Tick, Tick)); -extern void show_editor P((Calendar*, Tick, Tick, Boolean)); -extern void show_editor_view P((Calendar*, Glance)); -extern void e_make_editor P((Calendar*)); +extern void add_to_appt_list(CSA_entry_handle, Editor*); +extern void add_all_appt(Editor*); +extern void build_editor_list(Editor*, Tick, Glance, CSA_entry_handle**, + CSA_uint32*); +extern int build_editor_view(Editor*, Glance, Boolean); +extern Boolean editor_change(Dtcm_appointment*, CSA_entry_handle, + CSA_entry_handle*, Calendar*); +extern void editor_clean_up (Editor*); +extern Boolean editor_created(Editor*); +extern Boolean editor_delete(CSA_entry_handle, Calendar*); +extern Boolean editor_insert(Dtcm_appointment*, CSA_entry_handle*, + Calendar*); +extern CSA_entry_handle editor_nth_appt(Editor*, int); +extern Boolean editor_showing(Editor*); +extern Boolean editor_view_showing(Editor*); +extern void get_editor_vals (Editor*); +extern void set_editor_defaults(Editor*, Tick, Tick, Boolean); +extern void set_editor_title(Editor*, char *); +extern void set_editor_vals (Editor*, Tick, Tick); +extern void show_editor (Calendar*, Tick, Tick, Boolean); +extern void show_editor_view(Calendar*, Glance); +extern void e_make_editor(Calendar*); #endif diff --git a/cde/programs/dtcm/dtcm/find.h b/cde/programs/dtcm/dtcm/find.h index f212369fc..0d5b10b76 100644 --- a/cde/programs/dtcm/dtcm/find.h +++ b/cde/programs/dtcm/dtcm/find.h @@ -52,8 +52,6 @@ #ifndef _FIND_H #define _FIND_H -#include "ansi_c.h" - typedef struct tick_list { Tick tick; struct tick_list *next; @@ -88,7 +86,7 @@ typedef struct { Tick search_to_date; }Find; -extern caddr_t make_find P((Calendar*)); -static Tick f_get_searchdate P((Widget, Props*)); +extern caddr_t make_find(Calendar*); +static Tick f_get_searchdate(Widget, Props*); #endif diff --git a/cde/programs/dtcm/dtcm/format.h b/cde/programs/dtcm/dtcm/format.h index 7b79cbf1b..06e134c6a 100644 --- a/cde/programs/dtcm/dtcm/format.h +++ b/cde/programs/dtcm/dtcm/format.h @@ -53,24 +53,23 @@ #define _FORMAT_H #include -#include "ansi_c.h" #include "props.h" #define DEFAULT_APPT_LEN 50 #define DEFAULT_GAPPT_LEN 80 -extern void format_date P((Tick, OrderingType, char*, int, int, int)); -extern void format_date3 P((Tick, OrderingType, SeparatorType, char*)); -extern Boolean format_line P((Tick, char*, char*, int, Boolean, - DisplayType)); -extern void format_line2 P((Dtcm_appointment*, char*, char*, - DisplayType)); -extern void format_appt P((Dtcm_appointment*, char*, DisplayType, int)); -extern void format_abbrev_appt P((Dtcm_appointment*, char*, Boolean, - DisplayType)); -extern void format_maxchars P((Dtcm_appointment*, char*, int, DisplayType)); -extern void format_gappt P((Dtcm_appointment*, char*, char*, - DisplayType, int)); +extern void format_date(Tick, OrderingType, char*, int, int, int); +extern void format_date3(Tick, OrderingType, SeparatorType, char*); +extern Boolean format_line(Tick, char*, char*, int, Boolean, + DisplayType); +extern void format_line2(Dtcm_appointment*, char*, char*, + DisplayType); +extern void format_appt (Dtcm_appointment*, char*, DisplayType, int); +extern void format_abbrev_appt(Dtcm_appointment*, char*, Boolean, + DisplayType); +extern void format_maxchars(Dtcm_appointment*, char*, int, DisplayType); +extern void format_gappt(Dtcm_appointment*, char*, char*, + DisplayType, int); #endif diff --git a/cde/programs/dtcm/dtcm/goto.h b/cde/programs/dtcm/dtcm/goto.h index 38db3d0b6..6ace726be 100644 --- a/cde/programs/dtcm/dtcm/goto.h +++ b/cde/programs/dtcm/dtcm/goto.h @@ -52,8 +52,6 @@ #ifndef _GOTO_H #define _GOTO_H -#include "ansi_c.h" - typedef struct { Widget frame; Widget form; @@ -65,7 +63,7 @@ typedef struct { Widget goto_message; }Goto; -extern caddr_t make_goto P((Calendar*)); +extern caddr_t make_goto(Calendar*); #define DATESIZ 40 diff --git a/cde/programs/dtcm/dtcm/group_editor.h b/cde/programs/dtcm/dtcm/group_editor.h index fd9c2b408..ae1e757a9 100644 --- a/cde/programs/dtcm/dtcm/group_editor.h +++ b/cde/programs/dtcm/dtcm/group_editor.h @@ -53,7 +53,6 @@ #define _GEDITOR_H #include -#include "ansi_c.h" #include "util.h" #include "calendar.h" #include "misc.h" @@ -127,21 +126,21 @@ typedef struct { ** Group Editor external function declarations ** *******************************************************************************/ -extern void add_to_gaccess_list P((char*, CSA_session_handle, +extern void add_to_gaccess_list(char*, CSA_session_handle, unsigned int, int, GEditor*, - Boolean)); -extern void add_all_gappt P((GEditor*)); -extern void geditor_clean_up P((GEditor*)); -extern CSA_entry_handle geditor_nth_appt P((GEditor*, int, - Access_data**)); -extern Boolean geditor_showing P((GEditor*)); -extern void get_geditor_vals P((GEditor*)); -extern void remove_all_gaccess_data P((GEditor*)); -extern void remove_all_gaccess P((GEditor*)); -extern void remove_from_gaccess_list P((char*, GEditor*)); -extern void set_geditor_defaults P((GEditor*, Tick, Tick)); -extern void set_geditor_title P((GEditor*, char*)); -extern void set_geditor_vals P((GEditor*, Tick, Tick)); -extern void show_geditor P((Calendar*, Tick, Tick)); + Boolean); +extern void add_all_gappt(GEditor*); +extern void geditor_clean_up(GEditor*); +extern CSA_entry_handle geditor_nth_appt(GEditor*, int, + Access_data**); +extern Boolean geditor_showing(GEditor*); +extern void get_geditor_vals(GEditor*); +extern void remove_all_gaccess_data(GEditor*); +extern void remove_all_gaccess(GEditor*); +extern void remove_from_gaccess_list(char*, GEditor*); +extern void set_geditor_defaults(GEditor*, Tick, Tick); +extern void set_geditor_title(GEditor*, char*); +extern void set_geditor_vals(GEditor*, Tick, Tick); +extern void show_geditor(Calendar*, Tick, Tick); #endif diff --git a/cde/programs/dtcm/dtcm/help.h b/cde/programs/dtcm/dtcm/help.h index 54e003052..db2bee79c 100644 --- a/cde/programs/dtcm/dtcm/help.h +++ b/cde/programs/dtcm/dtcm/help.h @@ -114,9 +114,9 @@ #define DURATION_ERROR_HELP "CalendarDurationError" #define ADVANCE_ERROR_HELP "CalendarAdvanceError" -extern void show_main_help P((Widget, XtPointer, XtPointer)); -extern void help_cb P((Widget, XtPointer, XtPointer)); -extern void help_view_cb P((Widget, XtPointer, XtPointer)); +extern void show_main_help(Widget, XtPointer, XtPointer); +extern void help_cb(Widget, XtPointer, XtPointer); +extern void help_view_cb(Widget, XtPointer, XtPointer); #endif diff --git a/cde/programs/dtcm/dtcm/misc.h b/cde/programs/dtcm/dtcm/misc.h index adbdf11e7..03da5578d 100644 --- a/cde/programs/dtcm/dtcm/misc.h +++ b/cde/programs/dtcm/dtcm/misc.h @@ -55,7 +55,6 @@ #include #include #include -#include "ansi_c.h" #include "calendar.h" #include "cm_tty.h" #include "datefield.h" @@ -81,31 +80,31 @@ typedef enum { /* ** External function declarations */ -extern char *cm_mbchar P((char*)); -extern int cm_mbstrlen P((char*)); -extern Widget create_for_menu P((Widget)); -extern Widget create_privacy_menu P((Widget)); -extern Widget create_repeat_menu P((Widget, XtCallbackProc, XtPointer)); -extern Widget create_repeat_scope_menu P((Widget, XmString, XtCallbackProc, - XtPointer)); -extern Widget create_start_stop_time_menu P((Widget, XmString, XtCallbackProc, +extern char *cm_mbchar(char*); +extern int cm_mbstrlen(char*); +extern Widget create_for_menu (Widget); +extern Widget create_privacy_menu(Widget); +extern Widget create_repeat_menu(Widget, XtCallbackProc, XtPointer); +extern Widget create_repeat_scope_menu(Widget, XmString, XtCallbackProc, + XtPointer); +extern Widget create_start_stop_time_menu(Widget, XmString, XtCallbackProc, XtPointer, Props*, Boolean, - Boolean, Widget**, int*)); -extern Widget create_time_scope_menu P((Widget, XmString, XtCallbackProc, - XtPointer)); + Boolean, Widget**, int*); +extern Widget create_time_scope_menu(Widget, XmString, XtCallbackProc, + XtPointer); #ifndef _AIX -extern int dialog_popup P((Widget, ...)); +extern int dialog_popup(Widget, ...); #endif /* _AIX */ -extern void editor_err_msg P((Widget, char*, Validate_op, Pixmap)); -extern void backend_err_msg P((Widget, char*, CSA_return_code, Pixmap)); -extern void get_range P((Glance, time_t, time_t*, time_t*)); -extern boolean_t query_user P((void*)); -extern void set_message P((Widget, char*)); -extern void setup_quit_handler P((Widget, XtCallbackProc, caddr_t)); -extern int ds_is_double_click P((XEvent*, XEvent*)); -extern int cm_select_text P((Widget, Time)); -extern void set_time_submenu P((Widget, Widget, Props*, +extern void editor_err_msg(Widget, char*, Validate_op, Pixmap); +extern void backend_err_msg(Widget, char*, CSA_return_code, Pixmap); +extern void get_range(Glance, time_t, time_t*, time_t*); +extern boolean_t query_user(void*); +extern void set_message (Widget, char*); +extern void setup_quit_handler(Widget, XtCallbackProc, caddr_t); +extern int ds_is_double_click(XEvent*, XEvent*); +extern int cm_select_text(Widget, Time); +extern void set_time_submenu(Widget, Widget, Props*, XtCallbackProc, XtPointer, - Boolean, Boolean, Widget**, int*)); -extern void ManageChildren P((Widget)); + Boolean, Boolean, Widget**, int*); +extern void ManageChildren(Widget); #endif diff --git a/cde/programs/dtcm/dtcm/monthglance.h b/cde/programs/dtcm/dtcm/monthglance.h index 496b556f9..838f45c42 100644 --- a/cde/programs/dtcm/dtcm/monthglance.h +++ b/cde/programs/dtcm/dtcm/monthglance.h @@ -53,7 +53,6 @@ #define _MONTHGLANCE_H #include -#include "ansi_c.h" typedef struct month { Widget *hot_button; @@ -63,13 +62,13 @@ typedef struct month { int dayname_height; } Month; -extern void prepare_to_paint_monthview P((Calendar*, XRectangle*)); -extern void get_time_str P((Dtcm_appointment*, char*)); -extern void month_button P((Widget, XtPointer, XtPointer)); -extern void month_event P((XEvent*)); -extern void paint_grid P((Calendar*, XRectangle*)); -extern void print_month_range P((Calendar*, Tick, Tick)); -extern void cleanup_after_monthview P((Calendar*)); +extern void prepare_to_paint_monthview(Calendar*, XRectangle*); +extern void get_time_str(Dtcm_appointment*, char*); +extern void month_button(Widget, XtPointer, XtPointer); +extern void month_event(XEvent*); +extern void paint_grid(Calendar*, XRectangle*); +extern void print_month_range(Calendar*, Tick, Tick); +extern void cleanup_after_monthview(Calendar*); #endif diff --git a/cde/programs/dtcm/dtcm/props_pu.h b/cde/programs/dtcm/dtcm/props_pu.h index 616229281..ba97dd5b2 100644 --- a/cde/programs/dtcm/dtcm/props_pu.h +++ b/cde/programs/dtcm/dtcm/props_pu.h @@ -31,7 +31,6 @@ #ifndef _PROPS_PU_H #define _PROPS_PU_H -#include "ansi_c.h" #include "dssw.h" #include "props.h" #include "reminders.h" @@ -244,25 +243,25 @@ enum ** External function declarations ** *******************************************************************************/ -extern void create_all_pixmaps P((Props_pu*, Widget)); -extern Boolean get_date_vals_from_ui P((Props_pu*, Props*)); -extern Boolean get_display_vals_from_ui P((Props_pu*, Props*)); -extern Boolean get_editor_vals_from_ui P((Props_pu*, Props*)); -extern Boolean get_gap_vals_from_ui P((Props_pu*, Props*)); -extern Boolean get_printer_vals_from_ui P((Props_pu*, Props*)); -extern Boolean get_props_from_ui P((Props_pu*, Props*, int*)); -extern void set_date_vals_on_ui P((Props_pu*, Props*)); -extern void set_display_vals_on_ui P((Props_pu*, Props*)); -extern void set_editor_vals_on_ui P((Props_pu*, Props*)); -extern void set_gap_vals_on_ui P((Props_pu*, Props*)); -extern void set_printer_vals_on_ui P((Props_pu*, Props*)); -extern void set_props_on_ui P((Props_pu*, Props*)); -extern void set_props_pu_defaults P((Props_pu*, Props*)); -extern void show_props_pu P((Calendar*)); -extern void props_pu_clean_up P((Props_pu*)); -extern Boolean props_pu_showing P((Props_pu*)); -extern Boolean p_flush_changes P((Calendar*)); -extern void show_print_props_pu P((Calendar*)); +extern void create_all_pixmaps(Props_pu*, Widget); +extern Boolean get_date_vals_from_ui(Props_pu*, Props*); +extern Boolean get_display_vals_from_ui(Props_pu*, Props*); +extern Boolean get_editor_vals_from_ui(Props_pu*, Props*); +extern Boolean get_gap_vals_from_ui(Props_pu*, Props*); +extern Boolean get_printer_vals_from_ui(Props_pu*, Props*); +extern Boolean get_props_from_ui(Props_pu*, Props*, int*); +extern void set_date_vals_on_ui(Props_pu*, Props*); +extern void set_display_vals_on_ui(Props_pu*, Props*); +extern void set_editor_vals_on_ui(Props_pu*, Props*); +extern void set_gap_vals_on_ui(Props_pu*, Props*); +extern void set_printer_vals_on_ui(Props_pu*, Props*); +extern void set_props_on_ui (Props_pu*, Props*); +extern void set_props_pu_defaults(Props_pu*, Props*); +extern void show_props_pu(Calendar*); +extern void props_pu_clean_up(Props_pu*); +extern Boolean props_pu_showing(Props_pu*); +extern Boolean p_flush_changes (Calendar*); +extern void show_print_props_pu(Calendar*); extern void p_defaults_proc_helper(XtPointer client_data); diff --git a/cde/programs/dtcm/dtcm/reminders.h b/cde/programs/dtcm/dtcm/reminders.h index 9b742ea72..0adcd7dd6 100644 --- a/cde/programs/dtcm/dtcm/reminders.h +++ b/cde/programs/dtcm/dtcm/reminders.h @@ -54,7 +54,6 @@ #include #include -#include "ansi_c.h" #include "misc.h" #define REMINDER_SCOPE_LEN 5 @@ -114,14 +113,14 @@ typedef struct { ** Editor external function declarations ** *******************************************************************************/ -extern void build_reminders P((Reminders*, Calendar*, Widget)); -extern Reminder_val_op get_reminders_vals P((Reminders*, Boolean)); -extern Boolean reminders_attrs_to_form P((Reminders*, Dtcm_appointment*)); -extern Boolean reminders_appt_to_form P((Reminders*, CSA_entry_handle)); -extern Boolean reminders_form_to_appt P((Reminders*, Dtcm_appointment*, char *)); -extern void set_reminders_defaults P((Reminders*)); -extern void set_reminders_vals P((Reminders*, Boolean)); -extern void reminders_init P((Reminders*, Calendar*, Widget)); +extern void build_reminders(Reminders*, Calendar*, Widget); +extern Reminder_val_op get_reminders_vals(Reminders*, Boolean); +extern Boolean reminders_attrs_to_form(Reminders*, Dtcm_appointment*); +extern Boolean reminders_appt_to_form(Reminders*, CSA_entry_handle); +extern Boolean reminders_form_to_appt(Reminders*, Dtcm_appointment*, char *); +extern void set_reminders_defaults(Reminders*); +extern void set_reminders_vals(Reminders*, Boolean); +extern void reminders_init(Reminders*, Calendar*, Widget); #endif diff --git a/cde/programs/dtcm/dtcm/rfp.h b/cde/programs/dtcm/dtcm/rfp.h index a0a3facda..d4fa85dcb 100644 --- a/cde/programs/dtcm/dtcm/rfp.h +++ b/cde/programs/dtcm/dtcm/rfp.h @@ -53,7 +53,6 @@ #define _RFP_H #include -#include "ansi_c.h" #include "calendar.h" #include "misc.h" @@ -98,20 +97,20 @@ typedef struct { ** RFP (repeat, for, privacy) external function declarations ** *******************************************************************************/ -extern void build_rfp P((RFP*, Calendar*, Widget)); -extern void get_rfp_privacy_val P((RFP*)); -extern void get_rfp_repeat_val P((RFP*, time_t)); -extern void get_rfp_vals P((RFP*, time_t)); -extern Boolean rfp_attrs_to_form P((RFP*, Dtcm_appointment*)); -extern Boolean rfp_appt_to_form P((RFP*, CSA_entry_handle)); -extern Boolean rfp_form_to_appt P((RFP*, Dtcm_appointment*, char*)); -extern Boolean rfp_form_flags_to_appt P((RFP*, Dtcm_appointment*, char*, int *)); -extern void set_rfp_privacy_val P((RFP*)); -extern void set_rfp_repeat_val P((RFP*)); -extern void set_rfp_defaults P((RFP*)); -extern void set_rfp_vals P((RFP*)); -extern void rfp_set_repeat_values P((RFP*)); -extern void rfp_init P((RFP*, Calendar *, Widget)); +extern void build_rfp(RFP*, Calendar*, Widget); +extern void get_rfp_privacy_val(RFP*); +extern void get_rfp_repeat_val(RFP*, time_t); +extern void get_rfp_vals(RFP*, time_t); +extern Boolean rfp_attrs_to_form(RFP*, Dtcm_appointment*); +extern Boolean rfp_appt_to_form(RFP*, CSA_entry_handle); +extern Boolean rfp_form_to_appt(RFP*, Dtcm_appointment*, char*); +extern Boolean rfp_form_flags_to_appt(RFP*, Dtcm_appointment*, char*, int *); +extern void set_rfp_privacy_val(RFP*); +extern void set_rfp_repeat_val(RFP*); +extern void set_rfp_defaults(RFP*); +extern void set_rfp_vals(RFP*); +extern void rfp_set_repeat_values(RFP*); +extern void rfp_init(RFP*, Calendar *, Widget); #endif diff --git a/cde/programs/dtcm/dtcm/select.h b/cde/programs/dtcm/dtcm/select.h index 5d528b6df..cd9ad434a 100644 --- a/cde/programs/dtcm/dtcm/select.h +++ b/cde/programs/dtcm/dtcm/select.h @@ -52,7 +52,6 @@ #ifndef _SELECT_H #define _SELECT_H -#include "ansi_c.h" #include "browser.h" #include "calendar.h" @@ -79,16 +78,16 @@ typedef struct { int y; } pr_pos; -extern void activate_selection P((Selection*)); -extern void browser_deselect P((Calendar *, Browser*)); -extern void browser_select P((Calendar *, Browser*, pr_pos*)); -extern void calendar_deselect P((Calendar*)); -extern void calendar_select P((Calendar*, Selection_unit, caddr_t)); -extern void deactivate_selection P((Selection *)); -extern void monthbox_deselect P((Calendar*)); -extern void monthbox_select P((Calendar*)); -extern void paint_selection P((Calendar*)); -extern int selection_active P((Selection*)); -extern void weekchart_select P((Calendar*)); +extern void activate_selection(Selection*); +extern void browser_deselect(Calendar *, Browser*); +extern void browser_select(Calendar *, Browser*, pr_pos*); +extern void calendar_deselect(Calendar*); +extern void calendar_select (Calendar*, Selection_unit, caddr_t); +extern void deactivate_selection(Selection *); +extern void monthbox_deselect(Calendar*); +extern void monthbox_select(Calendar*); +extern void paint_selection(Calendar*); +extern int selection_active(Selection*); +extern void weekchart_select(Calendar*); #endif diff --git a/cde/programs/dtcm/dtcm/session.h b/cde/programs/dtcm/dtcm/session.h index a4725d49b..cdeaadad5 100644 --- a/cde/programs/dtcm/dtcm/session.h +++ b/cde/programs/dtcm/dtcm/session.h @@ -52,10 +52,9 @@ #ifndef _SESSION_H #define _SESSION_H -#include "ansi_c.h" #include "calendar.h" -extern void CMSaveSessionCB P((Widget, XtPointer, XtPointer)); -extern void GetSessionInfo P(()); +extern void CMSaveSessionCB(Widget, XtPointer, XtPointer); +extern void GetSessionInfo(); #endif diff --git a/cde/programs/dtcm/dtcm/tempbr.h b/cde/programs/dtcm/dtcm/tempbr.h index 77907a3a3..b823f9473 100644 --- a/cde/programs/dtcm/dtcm/tempbr.h +++ b/cde/programs/dtcm/dtcm/tempbr.h @@ -52,7 +52,6 @@ #ifndef _TEMPBR_H #define _TEMPBR_H -#include "ansi_c.h" #include "calendar.h" #ifdef FNS #include "cmfns.h" @@ -76,6 +75,6 @@ typedef struct { #endif } Tempbr; -extern caddr_t make_tempbr P(()); +extern caddr_t make_tempbr(Calendar *c); #endif /* _TEMPBR_H */ diff --git a/cde/programs/dtcm/dtcm/timezone.h b/cde/programs/dtcm/dtcm/timezone.h index 8fe6d8442..62c42075f 100644 --- a/cde/programs/dtcm/dtcm/timezone.h +++ b/cde/programs/dtcm/dtcm/timezone.h @@ -73,7 +73,7 @@ typedef struct { char gmttimezone[BUFSIZ]; }Timezone; -extern caddr_t make_timezone P((Calendar*)); -extern void refresh_timezone P((Timezone*)); +extern caddr_t make_timezone(Calendar*); +extern void refresh_timezone(Timezone*); #endif diff --git a/cde/programs/dtcm/dtcm/todo.h b/cde/programs/dtcm/dtcm/todo.h index 5ce14bea0..934c072a4 100644 --- a/cde/programs/dtcm/dtcm/todo.h +++ b/cde/programs/dtcm/dtcm/todo.h @@ -53,7 +53,6 @@ #define _TODO_H #include -#include "ansi_c.h" #include "calendar.h" #include "misc.h" #include "dssw.h" @@ -130,24 +129,24 @@ typedef struct { ** ToDo external function declarations ** *******************************************************************************/ -extern void add_to_todo_list P((CSA_entry_handle, ToDo*)); -extern void add_all_todo P((ToDo*)); -extern void build_todo_list P((ToDo*, Tick, Glance, CSA_entry_handle**, - CSA_uint32*, todo_view_op)); -extern int build_todo_view P((ToDo*, Glance, Boolean)); -extern void get_todo_vals P((ToDo*)); -extern void todo_hide P((ToDo*)); -extern void set_todo_defaults P((ToDo*)); -extern void set_todo_title P((ToDo*, char*)); -extern void set_todo_vals P((ToDo*)); -extern void show_todo P((Calendar*)); -extern void t_make_todo P((Calendar*)); -extern void show_todo_view P((Calendar*, todo_view_op)); -extern void todo_clean_up P((ToDo*)); -extern Boolean todo_showing P((ToDo*)); -extern Boolean todo_view_showing P((ToDo*)); -extern CSA_entry_handle t_nth_appt P((ToDo*, int)); -extern Boolean todo_insert P((Dtcm_appointment*, CSA_entry_handle*, - Calendar*)); +extern void add_to_todo_list(CSA_entry_handle, ToDo*); +extern void add_all_todo(ToDo*); +extern void build_todo_list(ToDo*, Tick, Glance, CSA_entry_handle**, + CSA_uint32*, todo_view_op); +extern int build_todo_view(ToDo*, Glance, Boolean); +extern void get_todo_vals(ToDo*); +extern void todo_hide(ToDo*); +extern void set_todo_defaults(ToDo*); +extern void set_todo_title(ToDo*, char*); +extern void set_todo_vals(ToDo*); +extern void show_todo(Calendar*); +extern void t_make_todo(Calendar*); +extern void show_todo_view(Calendar*, todo_view_op); +extern void todo_clean_up(ToDo*); +extern Boolean todo_showing(ToDo*); +extern Boolean todo_view_showing(ToDo*); +extern CSA_entry_handle t_nth_appt(ToDo*, int); +extern Boolean todo_insert(Dtcm_appointment*, CSA_entry_handle*, + Calendar*); #endif diff --git a/cde/programs/dtcm/dtcm/weekglance.h b/cde/programs/dtcm/dtcm/weekglance.h index 5f742a882..dd196338a 100644 --- a/cde/programs/dtcm/dtcm/weekglance.h +++ b/cde/programs/dtcm/dtcm/weekglance.h @@ -53,7 +53,6 @@ #define _WEEKGLANCE_H #include -#include "ansi_c.h" typedef struct week { int start_date; @@ -86,12 +85,12 @@ typedef struct week { typedef enum {okay, lower, upper} Boundary; -extern void paint_weekview P((Calendar*, XRectangle*)); -extern void print_week_range P((Calendar*, Tick, Tick)); -extern int count_multi_appts P((CSA_entry_handle*, int, Calendar*)); -extern void week_button P((Widget, XtPointer, XtPointer)); -extern void week_event P((XEvent*)); -extern void cleanup_after_weekview P((Calendar*)); -extern void resize_weekview P((Calendar *, Boundary *)); +extern void paint_weekview(Calendar*, XRectangle*); +extern void print_week_range(Calendar*, Tick, Tick); +extern int count_multi_appts(CSA_entry_handle*, int, Calendar*); +extern void week_button(Widget, XtPointer, XtPointer); +extern void week_event(XEvent*); +extern void cleanup_after_weekview(Calendar*); +extern void resize_weekview(Calendar *, Boundary *); #endif diff --git a/cde/programs/dtcm/dtcm/x_graphics.h b/cde/programs/dtcm/dtcm/x_graphics.h index 44b3a508b..a77f89f73 100644 --- a/cde/programs/dtcm/dtcm/x_graphics.h +++ b/cde/programs/dtcm/dtcm/x_graphics.h @@ -43,43 +43,43 @@ #define PAGE_HEIGHT 11000 /* 11.0" paper height */ #define XINCH 1000 /* 1 inch */ -extern void x_day_header P((void *)); -extern void x_day_timeslots P((void *, int, Boolean)); -extern void x_finish_printer P((void *)); -extern void x_finish_std_month P(()); -extern int x_get_day_lines_per_page P((void *)); -extern int x_get_month_lines_per_page P((void *)); -extern int x_get_week_lines_per_page P((void *)); -extern void x_init_day P((void *, int)); -extern void x_init_list P((void *)); -extern void x_init_month P((void *, int)); -extern void x_init_printer P((void *, short)); -extern void x_init_std_year P((void *)); -extern void x_init_week P((void *)); -extern void x_month_daynames P((void *, int)); -extern void x_month_timeslots P((void *, Tick, Boolean)); -extern void * x_open_file P((Calendar *)); -extern void x_print_file P((void *, Calendar *)); -extern void x_print_header P((void *, char*, int, int)); -extern void x_print_list_range P((Calendar*, CSA_sint32, int, - Tick, Tick)); -extern void x_print_little_months P((void *, Tick)); -extern void x_print_month P((void *, int, int, int, - int, int, int, int)); -extern Boolean x_print_month_appts P((void *, CSA_entry_handle*, int, - int, time_t, int)); -extern Boolean x_print_multi_appts P((void *, CSA_entry_handle*, int, - int, Glance)); -extern void x_print_todo P((void *, CSA_entry_handle*, int, +extern void x_day_header(void *); +extern void x_day_timeslots(void *, int, Boolean); +extern void x_finish_printer(void *); +extern void x_finish_std_month(); +extern int x_get_day_lines_per_page(void *); +extern int x_get_month_lines_per_page(void *); +extern int x_get_week_lines_per_page(void *); +extern void x_init_day(void *, int); +extern void x_init_list(void *); +extern void x_init_month(void *, int); +extern void x_init_printer(void *, short); +extern void x_init_std_year(void *); +extern void x_init_week(void *); +extern void x_month_daynames(void *, int); +extern void x_month_timeslots(void *, Tick, Boolean); +extern void * x_open_file (Calendar *); +extern void x_print_file(void *, Calendar *); +extern void x_print_header(void *, char*, int, int); +extern void x_print_list_range(Calendar*, CSA_sint32, int, + Tick, Tick); +extern void x_print_little_months(void *, Tick); +extern void x_print_month(void *, int, int, int, + int, int, int, int); +extern Boolean x_print_month_appts(void *, CSA_entry_handle*, int, + int, time_t, int); +extern Boolean x_print_multi_appts(void *, CSA_entry_handle*, int, + int, Glance); +extern void x_print_todo(void *, CSA_entry_handle*, int, CSA_sint32, Boolean, int, time_t, - char *)); -extern void x_print_year P((void *, int)); -extern void x_std_month_name P((void *, char*)); -extern void x_std_year_name P((void *, int)); -extern void x_week_appt_boxes P((void *)); -extern void x_week_daynames P((void *, char*, int, Boolean)); -extern void x_week_sched_boxes P((void *)); -extern void x_week_sched_draw P((void *, int)); -extern void x_week_sched_init P((void *)); + char *); +extern void x_print_year(void *, int); +extern void x_std_month_name(void *, char*); +extern void x_std_year_name(void *, int); +extern void x_week_appt_boxes(void *); +extern void x_week_daynames(void *, char*, int, Boolean); +extern void x_week_sched_boxes(void *); +extern void x_week_sched_draw(void *, int); +extern void x_week_sched_init(void *); #endif diff --git a/cde/programs/dtcm/dtcm/yearglance.h b/cde/programs/dtcm/dtcm/yearglance.h index 7a22328fc..9a6470fc4 100644 --- a/cde/programs/dtcm/dtcm/yearglance.h +++ b/cde/programs/dtcm/dtcm/yearglance.h @@ -65,9 +65,9 @@ typedef struct year { int year_shown; } Year; -extern void cleanup_after_yearview P((Calendar *)); -extern void year_button P((Widget, XtPointer, XtPointer)); -extern CSA_return_code paint_year P((Calendar*)); -extern void print_std_year_range P((int, int)); +extern void cleanup_after_yearview(Calendar *); +extern void year_button(Widget, XtPointer, XtPointer); +extern CSA_return_code paint_year(Calendar*); +extern void print_std_year_range(int, int); #endif diff --git a/cde/programs/dtcm/libDtCmP/cm_tty.h b/cde/programs/dtcm/libDtCmP/cm_tty.h index b98427f34..7b9f20059 100644 --- a/cde/programs/dtcm/libDtCmP/cm_tty.h +++ b/cde/programs/dtcm/libDtCmP/cm_tty.h @@ -54,7 +54,6 @@ #include #include -#include "ansi_c.h" #include "timeops.h" #include "util.h" #include "props.h" @@ -175,60 +174,60 @@ static const int ALL_DAY = -2; /* * External function definitions */ -extern char *boolean_str P((boolean_t)); -extern int cm_tty_delete P((nl_catd, CSA_session_handle, int, int, CSA_entry_handle*)); -extern void cm_tty_format_header P((Props*, Tick, char*)); -extern int cm_tty_insert P((nl_catd, CSA_session_handle, int, char*, char*, +extern char *boolean_str(boolean_t); +extern int cm_tty_delete(nl_catd, CSA_session_handle, int, int, CSA_entry_handle*); +extern void cm_tty_format_header(Props*, Tick, char*); +extern int cm_tty_insert(nl_catd, CSA_session_handle, int, char*, char*, char*, char*, char*, char*, - char*, Props*)); -extern void cm_tty_load_props P((Props**)); -extern int cm_tty_lookup P((nl_catd, CSA_session_handle, int, char*, char*, - CSA_entry_handle**, Props*)); -extern boolean_t convert_boolean_str P((char*)); -extern CSA_sint32 convert_privacy_str P((char*)); -extern int convert_privacy_str_to_op P((char*)); -extern SeparatorType convert_separator_str P((char*)); -extern Time_scope_menu_op convert_time_scope_str P((char*)); -extern char *day_str P((Days_op)); -extern char *default_repeat_cnt_str P((Repeat_menu_op)); -extern char *default_repeat_scope_str P((nl_catd, Repeat_menu_op)); -extern char *for_str P((For_menu_op)); -extern char *get_datemsg P((OrderingType, - SeparatorType)); -extern Parse_key_op identify_parse_key P((char*)); -extern void load_appt_defaults P((Dtcm_appointment*, Props*)); -extern void load_reminder_props P((Dtcm_appointment*, Props*)); -extern char *month_str P((Months_op)); -extern Validate_op parse_appt_from_file P((nl_catd, char*, CmDataList*, + char*, Props*); +extern void cm_tty_load_props(Props**); +extern int cm_tty_lookup(nl_catd, CSA_session_handle, int, char*, char*, + CSA_entry_handle**, Props*); +extern boolean_t convert_boolean_str(char*); +extern CSA_sint32 convert_privacy_str(char*); +extern int convert_privacy_str_to_op (char*); +extern SeparatorType convert_separator_str(char*); +extern Time_scope_menu_op convert_time_scope_str(char*); +extern char *day_str(Days_op); +extern char *default_repeat_cnt_str(Repeat_menu_op); +extern char *default_repeat_scope_str(nl_catd, Repeat_menu_op); +extern char *for_str(For_menu_op); +extern char *get_datemsg(OrderingType, + SeparatorType); +extern Parse_key_op identify_parse_key(char*); +extern void load_appt_defaults(Dtcm_appointment*, Props*); +extern void load_reminder_props(Dtcm_appointment*, Props*); +extern char *month_str(Months_op); +extern Validate_op parse_appt_from_file(nl_catd, char*, CmDataList*, Props*, boolean_t(*)(void*), - void*, int)); -extern char *parse_attrs_to_string P((Dtcm_appointment*, Props*, - char*)); -extern char *attrs_to_string P((CSA_attribute *, int)); -extern char *create_rfc_message P((char *, char *, char**, int)); -extern char *parse_appt_to_string P((CSA_session_handle, CSA_entry_handle, Props*, int)); -extern char *periodstr_from_period P((CSA_sint32, int)); -extern char *privacy_str P((int)); -extern char *privacy_str_old P((int)); -extern char *repeat_str P((nl_catd, Repeat_menu_op)); -extern char *repeat_scope_str P((nl_catd, Repeat_scope_menu_op)); -extern char *privacy_str_411 P((int)); -extern char *separator_str P((SeparatorType)); -extern void str_to_period P((char*, CSA_sint32*, int*)); -extern int timescopestring_to_tick P((char*)); -extern char *time_scope_str P((Time_scope_menu_op)); -extern char *time_scope_str_i18n P((nl_catd, Time_scope_menu_op)); -extern boolean_t valid_time P((Props*, char*)); -extern Validate_op validate_appt P((nl_catd, Dtcm_appointment*, + void*, int); +extern char *parse_attrs_to_string(Dtcm_appointment*, Props*, + char*); +extern char *attrs_to_string(CSA_attribute *, int); +extern char *create_rfc_message(char *, char *, char**, int); +extern char *parse_appt_to_string(CSA_session_handle, CSA_entry_handle, Props*, int); +extern char *periodstr_from_period(CSA_sint32, int); +extern char *privacy_str(int); +extern char *privacy_str_old(int); +extern char *repeat_str (nl_catd, Repeat_menu_op); +extern char *repeat_scope_str(nl_catd, Repeat_scope_menu_op); +extern char *privacy_str_411(int); +extern char *separator_str(SeparatorType); +extern void str_to_period(char*, CSA_sint32*, int*); +extern int timescopestring_to_tick(char*); +extern char *time_scope_str(Time_scope_menu_op); +extern char *time_scope_str_i18n(nl_catd, Time_scope_menu_op); +extern boolean_t valid_time(Props*, char*); +extern Validate_op validate_appt(nl_catd, Dtcm_appointment*, char*, char*, char*, int, char*, char*, char*, boolean_t(*)(void*), void*, - int)); -extern Validate_op validate_dssw P((Dtcm_appointment*, char*, + int); +extern Validate_op validate_dssw(Dtcm_appointment*, char*, char*, char*, int, char*, - boolean_t(*)(void*), void*)); -extern Validate_op validate_rfp P((nl_catd, Dtcm_appointment*, - char*, char*, int)); -extern Validate_op validate_reminders P((Dtcm_appointment*)); + boolean_t(*)(void*), void*); +extern Validate_op validate_rfp(nl_catd, Dtcm_appointment*, + char*, char*, int); +extern Validate_op validate_reminders(Dtcm_appointment*); #endif diff --git a/cde/programs/dtcm/libDtCmP/getdate.h b/cde/programs/dtcm/libDtCmP/getdate.h index 6d3289d85..f0dd5b752 100644 --- a/cde/programs/dtcm/libDtCmP/getdate.h +++ b/cde/programs/dtcm/libDtCmP/getdate.h @@ -64,7 +64,6 @@ struct timeb #include #endif #include -#include "ansi_c.h" #define BOT_YEAR 1970 #define EOT_YEAR 2037 @@ -77,12 +76,12 @@ struct timeb #define DATE_BHOUR -7 /* date had a bad hour number */ #define DATE_CONV -8 /* date converted poorly for am/pm/24hr */ -extern time_t dateconv P((int, int, int, int, int, int, int, int, int)); -extern time_t dayconv P((int, int, time_t)); -extern time_t timeconv P((int, int, int, int)); -extern time_t monthadd P((time_t, time_t)); -extern time_t daylcorr P((time_t, time_t)); -extern time_t cm_getdate P((char*, struct timeb *)); +extern time_t dateconv (int, int, int, int, int, int, int, int, int); +extern time_t dayconv (int, int, time_t); +extern time_t timeconv (int, int, int, int); +extern time_t monthadd (time_t, time_t); +extern time_t daylcorr (time_t, time_t); +extern time_t cm_getdate (char*, struct timeb *); int yylex(); extern void yyerror(char *s); diff --git a/cde/programs/dtcm/libDtCmP/props.h b/cde/programs/dtcm/libDtCmP/props.h index b8f0385e1..b5f763845 100644 --- a/cde/programs/dtcm/libDtCmP/props.h +++ b/cde/programs/dtcm/libDtCmP/props.h @@ -53,7 +53,6 @@ #define _PROPS_H #include -#include "ansi_c.h" #include "resource.h" /******************************************************************************* @@ -150,14 +149,14 @@ typedef struct { ** External function declarations ** *******************************************************************************/ -extern boolean_t cal_convert_cmrc P((Props*)); -extern char *get_char_prop P((Props*, Props_op)); -extern char *get_char_prop_default P((Props_op)); -extern int get_int_prop P((Props*, Props_op)); -extern void props_clean_up P((Props*)); -extern boolean_t read_props P((Props*)); -extern boolean_t save_props P((Props*)); -extern boolean_t set_char_prop P((Props*, Props_op, char*)); -extern boolean_t set_int_prop P((Props*, Props_op, int)); +extern boolean_t cal_convert_cmrc(Props*); +extern char *get_char_prop(Props*, Props_op); +extern char *get_char_prop_default(Props_op); +extern int get_int_prop(Props*, Props_op); +extern void props_clean_up(Props*); +extern boolean_t read_props(Props*); +extern boolean_t save_props(Props*); +extern boolean_t set_char_prop(Props*, Props_op, char*); +extern boolean_t set_int_prop(Props*, Props_op, int); #endif diff --git a/cde/programs/dtcm/libDtCmP/resource.h b/cde/programs/dtcm/libDtCmP/resource.h index c9ab06d3a..830ca7447 100644 --- a/cde/programs/dtcm/libDtCmP/resource.h +++ b/cde/programs/dtcm/libDtCmP/resource.h @@ -51,8 +51,7 @@ #ifndef _RESOURCE_H #define _RESOURCE_H - -#include "ansi_c.h" + #include /* @@ -68,14 +67,14 @@ typedef struct Resource Resource; /* ** Function declarations */ -extern void free_resources P((Resource*)); -extern char *get_resource P((Resource*, char *, char*, - char*, char*)); -extern char *get_resource_by_val P((Resource*, char*, char*)); -extern boolean_t load_resources P((Resource**, char*)); -extern boolean_t save_resources P((Resource*, char*)); -extern boolean_t set_resource P((Resource**, char*, char*, - char*, char*)); -extern boolean_t set_resource_by_val P((Resource**, char*, char*)); +extern void free_resourcee(Resource*); +extern char *get_resource(Resource*, char *, char*, + char*, char*); +extern char *get_resource_by_val(Resource*, char*, char*); +extern boolean_t load_resources(Resource**, char*); +extern boolean_t save_resources(Resource*, char*); +extern boolean_t set_resource(Resource**, char*, char*, + char*, char*); +extern boolean_t set_resource_by_val(Resource**, char*, char*); #endif diff --git a/cde/programs/dtcm/libDtCmP/timeops.h b/cde/programs/dtcm/libDtCmP/timeops.h index c9a6f682c..70664b3ef 100644 --- a/cde/programs/dtcm/libDtCmP/timeops.h +++ b/cde/programs/dtcm/libDtCmP/timeops.h @@ -53,7 +53,6 @@ #define _TIMEOPS_H #include -#include "ansi_c.h" typedef enum { minsec = 60, @@ -81,71 +80,71 @@ extern char *months2[]; extern int monthsecs[]; extern char *numbers[]; -extern int days_to_seconds P((int)); -extern int dom P((Tick)); -extern int dow P((Tick)); -extern int fdom P((Tick)); -extern Tick first_dom P((Tick)); -extern Tick first_dow P((Tick)); -extern Tick get_eot P(()); -extern Tick get_bot P(()); -extern long gmt_off P(()); -extern int hour P((Tick)); -extern int hours_to_seconds P((int)); -extern void init_time P(()); -extern Tick jan1 P((Tick)); -extern Tick last_dom P((Tick)); -extern Tick last_dow P((Tick)); -extern Tick last_ndays P((Tick t, int)); -extern int lastapptofweek P((u_int)); -extern Tick lastjan1 P((Tick)); -extern int ldom P((Tick)); -extern Tick lower_bound P((int, Tick)); -extern Tick lowerbound P((Tick)); -extern boolean_t magic_time P((Tick t)); -extern Tick midnight P(()); -extern int minutes_to_seconds P((int)); -extern int minute P((Tick)); -extern int month P((Tick)); -extern Tick monthdayyear P((int, int, int)); -extern int monthlength P((Tick)); -extern Tick next_ndays P((Tick, int)); -extern Tick next_nhours P((Tick, int)); -extern Tick next2weeks P((Tick)); -extern Tick nextday P((Tick)); -extern Tick nextjan1 P((Tick)); -extern Tick nextmonth P((Tick t)); -extern Tick next_nmonth P((Tick t, int n)); -extern Tick nextmonth_exactday P((Tick t)); -extern Tick nextweek P((Tick t)); -extern Tick nextyear P((Tick)); -extern Tick nextnyear P((Tick t, int n)); -extern Tick now P(()); -extern int ntimes_this_week P((u_int, int)); -extern int numwks P((Tick)); -extern Tick prev_nmonth P((Tick t, int n)); -extern Tick prevmonth_exactday P((Tick)); -extern Tick previousmonth P((Tick t)); -extern Tick prevweek P((Tick t)); -extern Tick prev2weeks P((Tick t)); -extern Tick prevnyear P((Tick t, int n)); -extern int seconds P((int n, Unit unit)); -extern double seconds_dble P((double n, Unit unit)); -extern int seconds_to_days P((int)); -extern int seconds_to_hours P((int)); -extern int seconds_to_minutes P((int)); -extern int seconds_to_weeks P((int)); -extern void set_timezone P((char*)); -extern int timeok P((Tick t)); -extern Tick upperbound P((Tick)); -extern int weeks_to_seconds P((int)); -extern int wom P((Tick)); -extern boolean_t weekofmonth P((Tick, int*)); -extern Tick xytoclock P((int, int, Tick)); -extern int year P((Tick)); -extern int adjust_dst P((Tick, Tick)); -extern boolean_t adjust_hour P((int*)); -extern int leapyr P((int)); -extern Tick prevday P((Tick)); +extern int days_to_seconds (int); +extern int dom (Tick); +extern int dow (Tick); +extern int fdom (Tick); +extern Tick first_dom (Tick); +extern Tick first_dow (Tick); +extern Tick get_eot (void); +extern Tick get_bot (void); +extern long gmt_off (void); +extern int hour (Tick); +extern int hours_to_seconds(int); +extern void init_time (void); +extern Tick jan1 (Tick); +extern Tick last_dom (Tick); +extern Tick last_dow (Tick); +extern Tick last_ndays (Tick t, int); +extern int lastapptofweek (u_int); +extern Tick lastjan1 (Tick); +extern int ldom (Tick); +extern Tick lower_bound (int, Tick); +extern Tick lowerbound (Tick); +extern boolean_t magic_time (Tick t); +extern Tick midnight (); +extern int minutes_to_seconds(int); +extern int minute (Tick); +extern int month (Tick); +extern Tick monthdayyear (int, int, int); +extern int monthlength (Tick); +extern Tick next_ndays (Tick, int); +extern Tick next_nhours (Tick, int); +extern Tick next2weeks (Tick); +extern Tick nextday (Tick); +extern Tick nextjan1 (Tick); +extern Tick nextmonth (Tick t); +extern Tick next_nmonth (Tick t, int n); +extern Tick nextmonth_exactday(Tick t); +extern Tick nextweek (Tick t); +extern Tick nextyear (Tick); +extern Tick nextnyear (Tick t, int n); +extern Tick now (void); +extern int ntimes_this_week(u_int, int); +extern int numwks (Tick); +extern Tick prev_nmonth (Tick t, int n); +extern Tick prevmonth_exactday(Tick); +extern Tick previousmonth (Tick t); +extern Tick prevweek (Tick t); +extern Tick prev2weeks (Tick t); +extern Tick prevnyear (Tick t, int n); +extern int seconds (int n, Unit unit); +extern double seconds_dble (double n, Unit unit); +extern int seconds_to_days (int); +extern int seconds_to_hours(int); +extern int seconds_to_minutes(int); +extern int seconds_to_weeks(int); +extern void set_timezone (char*); +extern int timeok (Tick t); +extern Tick upperbound (Tick); +extern int weeks_to_seconds(int); +extern int wom (Tick); +extern boolean_t weekofmonth (Tick, int*); +extern Tick xytoclock (int, int, Tick); +extern int year (Tick); +extern int adjust_dst (Tick, Tick); +extern boolean_t adjust_hour (int*); +extern int leapyr (int); +extern Tick prevday (Tick); #endif diff --git a/cde/programs/dtcm/libDtCmP/util.h b/cde/programs/dtcm/libDtCmP/util.h index 0ab470992..143d17e44 100644 --- a/cde/programs/dtcm/libDtCmP/util.h +++ b/cde/programs/dtcm/libDtCmP/util.h @@ -55,7 +55,6 @@ #include #include #include -#include "ansi_c.h" #include "timeops.h" #include "props.h" @@ -212,79 +211,79 @@ typedef struct { * forth to the backend. These functions and structures make hard coding * indexes into the arrays unnecessary. */ -extern Dtcm_appointment *allocate_appt_struct P((Allocation_reason , int, ...)); -extern CSA_return_code query_appt_struct P((CSA_session_handle, +extern Dtcm_appointment *allocate_appt_struct(Allocation_reason , int, ...); +extern CSA_return_code query_appt_struct (CSA_session_handle, CSA_entry_handle, - Dtcm_appointment *)); -extern Dtcm_calendar *allocate_cal_struct P((Allocation_reason, int, ...)); -extern CSA_return_code query_cal_struct P((CSA_session_handle, - Dtcm_calendar *)); -extern void free_appt_struct P((Dtcm_appointment**)); -extern void free_cal_struct P((Dtcm_calendar**)); + Dtcm_appointment *); +extern Dtcm_calendar *allocate_cal_struct(Allocation_reason, int, ...); +extern CSA_return_code query_cal_struct (CSA_session_handle, + Dtcm_calendar *); +extern void free_appt_struct(Dtcm_appointment**); +extern void free_cal_struct (Dtcm_calendar**); -extern boolean_t cal_ident_index_ro P((int, int)); -extern boolean_t entry_ident_index_ro P((int, int)); -extern CSA_enum cal_ident_index_tag P((int)); -extern CSA_enum entry_ident_index_tag P((int)); -extern boolean_t ident_name_ro P((char*, int)); -extern void initialize_cal_attr P((int, CSA_attribute*, - Allocation_reason, int)); -extern void initialize_entry_attr P((int, CSA_attribute*, - Allocation_reason, int)); -extern void set_appt_links P((Dtcm_appointment*)); -extern void set_cal_links P((Dtcm_calendar*)); -extern void scrub_cal_attr_list P((Dtcm_calendar*)); -extern void setup_range P((CSA_attribute**, +extern boolean_t cal_ident_index_ro(int, int); +extern boolean_t entry_ident_index_ro(int, int); +extern CSA_enum cal_ident_index_tag(int); +extern CSA_enum entry_ident_index_tag(int); +extern boolean_t ident_name_ro(char*, int); +extern void initialize_cal_attr(int, CSA_attribute*, + Allocation_reason, int); +extern void initialize_entry_attr(int, CSA_attribute*, + Allocation_reason, int); +extern void set_appt_links (Dtcm_appointment*); +extern void set_cal_links (Dtcm_calendar*); +extern void scrub_cal_attr_list(Dtcm_calendar*); +extern void setup_range (CSA_attribute**, CSA_enum**, int*, time_t, time_t, CSA_sint32, CSA_sint32, - boolean_t, int)); -extern void free_range P((CSA_attribute**, - CSA_enum**, int)); + boolean_t, int); +extern void free_range (CSA_attribute**, + CSA_enum**, int); /* * Other utilty functions */ -extern int blank_buf P((char*)); -extern int embedded_blank P((char*)); -extern char *ckalloc P(()); -extern char *cm_def_printer P(()); -extern char *cm_get_credentials P(()); -extern char *cm_get_local_domain P(()); -extern char *cm_get_local_host P(()); -extern char *cm_get_uname P(()); -extern char *cm_pqtarget P((char*)); -extern char *cm_strcat P((char*, char*)); -extern char *cm_strcpy P((char*, char*)); -extern char *cm_strdup P((char*)); -extern int cm_strlen P((char*)); -extern char *cm_target2domain P((char*)); -extern char *cm_target2host P((char*)); -extern char *cm_target2location P((char*)); -extern char *cm_target2name P((char*)); -extern char *cr_to_str P((char*)); -extern void destroy_lines P((Lines*)); -extern void expand_esc_chars P((char*)); -extern char *get_head P((char*, char)); -extern char *get_tail P((char*, char)); -extern void print_tick P((time_t)); -extern boolean_t same_path P((char*, char*)); -extern boolean_t same_user P((char*, char*)); -extern char *str_to_cr P((char*)); -extern char *strncat P(()); -extern char *substr P((char*, int, int n)); -extern void syserr P((char*, int, int, int)); -extern Lines *text_to_lines P((char*, int)); -extern int get_data_version P((CSA_session_handle)); -extern int get_server_version P((CSA_session_handle)); -extern CSA_sint32 privacy_set P((Dtcm_appointment *)); -extern CSA_sint32 showtime_set P((Dtcm_appointment *)); -extern int max P((int, int)); -extern int min P((int, int)); -extern int parse_date P((OrderingType, SeparatorType, char*, char*, char*, char*)); +extern int blank_buf (char*); +extern int embedded_blank(char*); +extern char * ckalloc(unsigned int size); +extern char * cm_def_printer(void); +extern char * cm_get_credentials(void); +extern char * cm_get_local_domain(void); +extern char * cm_get_local_host(void); +extern char * cm_get_uname(void); +extern char * cm_pqtarget(char*); +extern char * cm_strcat(char*, char*); +extern char * cm_strcpy(char*, char*); +extern char * cm_strdup(char*); +extern int cm_strlen(char*); +extern char * cm_target2domain(char*); +extern char * cm_target2host (char*); +extern char * cm_target2location(char*); +extern char * cm_target2name (char*); +extern char * cr_to_str(char*); +extern void destroy_lines(Lines*); +extern void expand_esc_chars(char*); +extern char * get_head(char*, char); +extern char * get_tail(char*, char); +extern void print_tick(time_t); +extern boolean_t same_path(char*, char*); +extern boolean_t same_user(char*, char*); +extern char * str_to_cr(char*); +extern char * strncat(char *, const char *, size_t n); +extern char * substr(char*, int, int n); +extern void syserr(char*, int, int, int); +extern Lines * text_to_lines (char*, int); +extern int get_data_version(CSA_session_handle); +extern int get_server_version(CSA_session_handle); +extern CSA_sint32 privacy_set(Dtcm_appointment *); +extern CSA_sint32 showtime_set(Dtcm_appointment *); +extern int max(int, int); +extern int min(int, int); +extern int parse_date(OrderingType, SeparatorType, char*, char*, char*, char*); -extern int datestr2mdy P((char*, OrderingType, SeparatorType, char*)); -extern void format_tick P((time_t, OrderingType, SeparatorType, char*)); -extern void format_time P((Tick, DisplayType, char*)); +extern int datestr2mdy(char*, OrderingType, SeparatorType, char*); +extern void format_tick(time_t, OrderingType, SeparatorType, char*); +extern void format_time(Tick, DisplayType, char*); /* * In Motif you can't associate user data with items in a list. To get around @@ -303,12 +302,12 @@ typedef struct _CmDataList { int count; } CmDataList; -extern CmDataList *CmDataListCreate P((void)); -extern void CmDataListDestroy P((CmDataList *, int)); -extern int CmDataListAdd P((CmDataList *, void *, int)); -extern void *CmDataListGetData P((CmDataList *, int)); -extern void *CmDataListDeletePos P((CmDataList *, int, int)); -extern void CmDataListDeleteAll P((CmDataList *, int)); +extern CmDataList * CmDataListCreate(void); +extern void CmDataListDestroy(CmDataList *, int); +extern int CmDataListAdd(CmDataList *, void *, int); +extern void * CmDataListGetData(CmDataList *, int); +extern void * CmDataListDeletePos(CmDataList *, int, int); +extern void CmDataListDeleteAll(CmDataList *, int); #endif diff --git a/cde/programs/dtcm/server/access.h b/cde/programs/dtcm/server/access.h index f2359a581..c6160994d 100644 --- a/cde/programs/dtcm/server/access.h +++ b/cde/programs/dtcm/server/access.h @@ -31,7 +31,6 @@ #ifndef _ACCESS_H #define _ACCESS_H -#include "ansi_c.h" #include "cm.h" #include "rtable4.h" #include "cmscalendar.h" @@ -70,46 +69,46 @@ #define _DTCMS_HAS_V4_WRITE_ACCESS(a) \ ((a) & (access_write_4 | CSA_OWNER_RIGHTS)) -extern CSA_return_code _DtCmsV4LoadAndCheckAccess P(( +extern CSA_return_code _DtCmsV4LoadAndCheckAccess( struct svc_req *svcrq, char *target, char **sender, uint *access, - _DtCmsCalendar **cal)); + _DtCmsCalendar **cal); -extern CSA_return_code _DtCmsV5LoadAndCheckAccess P(( +extern CSA_return_code _DtCmsV5LoadAndCheckAccess( struct svc_req *svcrq, char *target, char **sender, uint *access, - _DtCmsCalendar **cal)); + _DtCmsCalendar **cal); -extern CSA_return_code _DtCmsGetClientInfo P(( +extern CSA_return_code _DtCmsGetClientInfo( struct svc_req *svcrq, - char **source)); + char **source); -extern boolean_t _DtCmsIsFileOwner P((char *owner, char *user, char *target)); +extern boolean_t _DtCmsIsFileOwner(char *owner, char *user, char *target); -extern void _DtCmsShowAccessList P((Access_Entry_4 *l)); +extern void _DtCmsShowAccessList(Access_Entry_4 *l); -extern Access_Entry_4 *_DtCmsCalendarAccessList P((_DtCmsCalendar *cal)); +extern Access_Entry_4 *_DtCmsCalendarAccessList(_DtCmsCalendar *cal); -extern Privacy_Level_4 _DtCmCheckPrivacyLevel P((char **p_src, Appt_4 *p_appt)); +extern Privacy_Level_4 _DtCmCheckPrivacyLevel(char **p_src, Appt_4 *p_appt); -extern CSA_return_code _DtCmsCheckViewAccess P(( +extern CSA_return_code _DtCmsCheckViewAccess( char *user, uint access, - cms_entry *eptr)); + cms_entry *eptr); -extern CSA_return_code _DtCmsCheckChangeAccess P(( +extern CSA_return_code _DtCmsCheckChangeAccess( char *user, uint access, - cms_entry *eptr)); + cms_entry *eptr); -extern uint _DtCmsClassToInsertAccess P((cms_entry *entry)); +extern uint _DtCmsClassToInsertAccess(cms_entry *entry); -extern uint _DtCmsClassToViewAccess P((cms_entry *entry)); +extern uint _DtCmsClassToViewAccess(cms_entry *entry); -extern uint _DtCmsClassToChangeAccess P((cms_entry *entry)); +extern uint _DtCmsClassToChangeAccess(cms_entry *entry); #endif diff --git a/cde/programs/dtcm/server/callback.h b/cde/programs/dtcm/server/callback.h index 9fa3cb6d9..d1ebf3d43 100644 --- a/cde/programs/dtcm/server/callback.h +++ b/cde/programs/dtcm/server/callback.h @@ -31,7 +31,6 @@ #ifndef _CALLBACK_H #define _CALLBACK_H -#include "ansi_c.h" #include "rtable4.h" typedef struct __DtCmsRegistrationInfo { @@ -44,81 +43,81 @@ typedef struct __DtCmsRegistrationInfo { struct __DtCmsRegistrationInfo *next; } _DtCmsRegistrationInfo; -extern _DtCmsRegistrationInfo *_DtCmsMakeRegistrationInfo P(( +extern _DtCmsRegistrationInfo *_DtCmsMakeRegistrationInfo( char *client, int types, u_long prognum, u_long versnum, u_long procnum, - int pid)); + int pid); -extern void _DtCmsFreeRegistrationInfo P((_DtCmsRegistrationInfo *w)); +extern void _DtCmsFreeRegistrationInfo(_DtCmsRegistrationInfo *w); -extern _DtCmsRegistrationInfo *_DtCmsGetRegistration P(( +extern _DtCmsRegistrationInfo *_DtCmsGetRegistration( _DtCmsRegistrationInfo **rlist, char *client, u_long prognum, u_long versnum, u_long procnum, - int pid)); + int pid); -extern _DtCmsRegistrationInfo *_DtCmsRemoveRegistration P(( +extern _DtCmsRegistrationInfo *_DtCmsRemoveRegistration( _DtCmsRegistrationInfo *rlist, - _DtCmsRegistrationInfo *rinfo)); + _DtCmsRegistrationInfo *rinfo); -extern _DtCmsRegistrationInfo *_DtCmsCheckRegistrationList P(( - _DtCmsRegistrationInfo *rlist)); +extern _DtCmsRegistrationInfo *_DtCmsCheckRegistrationList( + _DtCmsRegistrationInfo *rlist); -extern _DtCmsRegistrationInfo * _DtCmsDoV1CbForV4Data P(( +extern _DtCmsRegistrationInfo * _DtCmsDoV1CbForV4Data( _DtCmsRegistrationInfo *rlist, char *source, int pid, cms_key *key1, - cms_key *key2)); + cms_key *key2); -extern _DtCmsRegistrationInfo *_DtCmsDoV1Callback P(( +extern _DtCmsRegistrationInfo *_DtCmsDoV1Callback( _DtCmsRegistrationInfo *rlist, char *source, int pid, - Appt_4 *a)); + Appt_4 *a); -extern _DtCmsRegistrationInfo *_DtCmsDoOpenCalCallback P(( +extern _DtCmsRegistrationInfo *_DtCmsDoOpenCalCallback( _DtCmsRegistrationInfo *rlist, char *cal, char *user, - int pid)); + int pid); -extern _DtCmsRegistrationInfo *_DtCmsDoRemoveCalCallback P(( +extern _DtCmsRegistrationInfo *_DtCmsDoRemoveCalCallback( _DtCmsRegistrationInfo *rlist, char *cal, char *user, - int pid)); + int pid); -extern _DtCmsRegistrationInfo *_DtCmsDoUpdateCalAttrsCallback P(( +extern _DtCmsRegistrationInfo *_DtCmsDoUpdateCalAttrsCallback( _DtCmsRegistrationInfo *rlist, char *cal, char *user, uint num_attrs, cms_attribute *attrs, - int pid)); + int pid); -extern _DtCmsRegistrationInfo *_DtCmsDoInsertEntryCallback P(( +extern _DtCmsRegistrationInfo *_DtCmsDoInsertEntryCallback( _DtCmsRegistrationInfo *rlist, char *cal, char *source, long id, - int pid)); + int pid); -extern _DtCmsRegistrationInfo *_DtCmsDoDeleteEntryCallback P(( +extern _DtCmsRegistrationInfo *_DtCmsDoDeleteEntryCallback( _DtCmsRegistrationInfo *rlist, char *cal, char *source, long id, int scope, time_t time, - int pid)); + int pid); -extern _DtCmsRegistrationInfo *_DtCmsDoUpdateEntryCallback P(( +extern _DtCmsRegistrationInfo *_DtCmsDoUpdateEntryCallback( _DtCmsRegistrationInfo *rlist, char *cal, char *source, @@ -126,10 +125,10 @@ extern _DtCmsRegistrationInfo *_DtCmsDoUpdateEntryCallback P(( long oldid, int scope, long time, - int pid)); + int pid); -extern void _DtCmsListRegistration P((_DtCmsRegistrationInfo *rlist, - char *cal)); +extern void _DtCmsListRegistration(_DtCmsRegistrationInfo *rlist, + char *cal); #endif diff --git a/cde/programs/dtcm/server/cmsattr.h b/cde/programs/dtcm/server/cmsattr.h index 1bf1239a5..cb07372d6 100644 --- a/cde/programs/dtcm/server/cmsattr.h +++ b/cde/programs/dtcm/server/cmsattr.h @@ -44,36 +44,35 @@ #ifndef _CMSATTR_H #define _CMSATTR_H -#include "ansi_c.h" #include "cm.h" #include "cmscalendar.h" -extern CSA_return_code _DtCmsUpdateSint32AttrVal P(( +extern CSA_return_code _DtCmsUpdateSint32AttrVal( cms_attribute_value *newval, - cms_attribute_value **attrval)); + cms_attribute_value **attrval); -extern CSA_return_code _DtCmsUpdateUint32AttrVal P(( +extern CSA_return_code _DtCmsUpdateUint32AttrVal( cms_attribute_value *newval, - cms_attribute_value **attrval)); + cms_attribute_value **attrval); -extern CSA_return_code _DtCmsUpdateStringAttrVal P(( +extern CSA_return_code _DtCmsUpdateStringAttrVal( cms_attribute_value *newval, - cms_attribute_value **attrval)); + cms_attribute_value **attrval); -extern CSA_return_code _DtCmsUpdateAccessListAttrVal P(( +extern CSA_return_code _DtCmsUpdateAccessListAttrVal( cms_attribute_value *newval, - cms_attribute_value **attrval)); + cms_attribute_value **attrval); -extern CSA_return_code _DtCmsUpdateReminderAttrVal P(( +extern CSA_return_code _DtCmsUpdateReminderAttrVal( cms_attribute_value *newval, - cms_attribute_value **attrval)); + cms_attribute_value **attrval); -extern CSA_return_code _DtCmsUpdateDateTimeListAttrVal P(( +extern CSA_return_code _DtCmsUpdateDateTimeListAttrVal( cms_attribute_value *newval, - cms_attribute_value **attrval)); + cms_attribute_value **attrval); -extern CSA_return_code _DtCmsUpdateOpaqueDataAttrVal P(( +extern CSA_return_code _DtCmsUpdateOpaqueDataAttrVal( cms_attribute_value *newval, - cms_attribute_value **attrval)); + cms_attribute_value **attrval); #endif diff --git a/cde/programs/dtcm/server/cmscalendar.h b/cde/programs/dtcm/server/cmscalendar.h index 27df5198b..3e1e8acc4 100644 --- a/cde/programs/dtcm/server/cmscalendar.h +++ b/cde/programs/dtcm/server/cmscalendar.h @@ -31,7 +31,6 @@ #ifndef _CMSCALENDAR_H #define _CMSCALENDAR_H -#include "ansi_c.h" #include "csa.h" #include "cm.h" #include "nametbl.h" @@ -89,84 +88,84 @@ typedef struct __DtCmsCalendar { } _DtCmsCalendar; -extern _DtCmsCalendar * _DtCmsMakeCalendar P(( +extern _DtCmsCalendar * _DtCmsMakeCalendar( char *owner, - char *name)); + char *name); -extern void _DtCmsPutInCalList P((_DtCmsCalendar *cal)); +extern void _DtCmsPutInCalList(_DtCmsCalendar *cal); -extern void _DtCmsFreeCalendar P((_DtCmsCalendar *cal)); +extern void _DtCmsFreeCalendar(_DtCmsCalendar *cal); -extern CSA_return_code _DtCmsSetFileVersion P(( +extern CSA_return_code _DtCmsSetFileVersion( _DtCmsCalendar *cal, - int version)); + int version); -extern CSA_return_code _DtCmsLoadCalendar P(( +extern CSA_return_code _DtCmsLoadCalendar( char *target, - _DtCmsCalendar **cal)); + _DtCmsCalendar **cal); -extern char * _DtCmsGetCalendarOwner P((char *target)); +extern char * _DtCmsGetCalendarOwner(char *target); -extern CSA_return_code _DtCmsGetCalendarByName P(( +extern CSA_return_code _DtCmsGetCalendarByName( char *target, boolean_t load, - _DtCmsCalendar **cal)); + _DtCmsCalendar **cal); -extern CSA_return_code _DtCmsInsertEntry4Parser P(( +extern CSA_return_code _DtCmsInsertEntry4Parser( _DtCmsCalendar *cal, - cms_entry *entry)); + cms_entry *entry); -extern void _DtCmsSetAccess4Parser P(( +extern void _DtCmsSetAccess4Parser( _DtCmsCalendar *cal, Access_Entry_4 *list, - int type)); + int type); -extern void _DtCmsSetCalendarAttrs4Parser P(( +extern void _DtCmsSetCalendarAttrs4Parser( _DtCmsCalendar *cal, int len, - cms_attribute *attrs)); + cms_attribute *attrs); -extern void _DtCmsGenerateKey P((_DtCmsCalendar *cal, long *key)); +extern void _DtCmsGenerateKey(_DtCmsCalendar *cal, long *key); -extern CSA_return_code _DtCmsEnumerateUp P(( +extern CSA_return_code _DtCmsEnumerateUp( _DtCmsCalendar *cal, - _DtCmsEnumerateProc doit)); + _DtCmsEnumerateProc doit); -extern void _DtCmsEnumerateDown P(( +extern void _DtCmsEnumerateDown( _DtCmsCalendar *cal, - _DtCmsEnumerateProc doit)); + _DtCmsEnumerateProc doit); -extern CSA_return_code _DtCmsRbToCsaStat P((Rb_Status rb_stat)); +extern CSA_return_code _DtCmsRbToCsaStat(Rb_Status rb_stat); -extern CSA_return_code _DtCmsGetCalAttrsByName P(( +extern CSA_return_code _DtCmsGetCalAttrsByName( _DtCmsCalendar *cal, uint num_names, cms_attr_name *names, uint *num_attrs_r, - cms_attribute **attrs_r)); + cms_attribute **attrs_r); -extern CSA_return_code _DtCmsGetAllCalAttrs P(( +extern CSA_return_code _DtCmsGetAllCalAttrs( _DtCmsCalendar *cal, u_int *num_attrs_r, cms_attribute **attrs_r, - boolean_t returnall)); + boolean_t returnall); -extern CSA_return_code _DtCmsGetCalAttrNames P(( +extern CSA_return_code _DtCmsGetCalAttrNames( _DtCmsCalendar *cal, uint *num_names_r, - cms_attr_name **names_r)); + cms_attr_name **names_r); -extern void _DtCmsFreeCmsAttrNames P((uint num, cms_attr_name *names)); +extern void _DtCmsFreeCmsAttrNames(uint num, cms_attr_name *names); -extern CSA_return_code _DtCmsUpdateCalAttributesAndLog P(( +extern CSA_return_code _DtCmsUpdateCalAttributesAndLog( _DtCmsCalendar *cal, uint numsrc, cms_attribute *srcattrs, - uint access)); + uint access); -extern CSA_return_code _DtCmsV5TransactLog P(( +extern CSA_return_code _DtCmsV5TransactLog( _DtCmsCalendar *cal, cms_entry *e, - _DtCmsLogOps op)); + _DtCmsLogOps op); #endif diff --git a/cde/programs/dtcm/server/cmsconvert.h b/cde/programs/dtcm/server/cmsconvert.h index f2ff80e71..c0a30d641 100644 --- a/cde/programs/dtcm/server/cmsconvert.h +++ b/cde/programs/dtcm/server/cmsconvert.h @@ -32,59 +32,58 @@ #define _CMSCONVERT_H #include -#include "ansi_c.h" #include "cm.h" #include "rtable4.h" #include "v4ops.h" -extern CSA_return_code _DtCmsCmsentriesToAppt4ForClient P(( +extern CSA_return_code _DtCmsCmsentriesToAppt4ForClient( cms_entry *entries, - Appt_4 **appt)); + Appt_4 **appt); -extern CSA_return_code _DtCmsCmsentriesToAbbrAppt4ForClient P(( +extern CSA_return_code _DtCmsCmsentriesToAbbrAppt4ForClient( cms_entry *entries, - Abb_Appt_4 **abbr)); + Abb_Appt_4 **abbr); -extern CSA_return_code _DtCmsCmsentryToAbbrAppt4 P(( +extern CSA_return_code _DtCmsCmsentryToAbbrAppt4( cms_entry *entry, - Abb_Appt_4 **abbr)); + Abb_Appt_4 **abbr); -extern Access_Entry_4 *_DtCmsConvertV5AccessList P(( +extern Access_Entry_4 *_DtCmsConvertV5AccessList( cms_access_entry *cmslist, - boolean_t strictmode)); + boolean_t strictmode); -extern cms_access_entry *_DtCmsConvertV4AccessList P(( - Access_Entry_4 *alist)); +extern cms_access_entry *_DtCmsConvertV4AccessList( + Access_Entry_4 *alist); -extern CSA_return_code _DtCmsReminderRefToReminder P(( +extern CSA_return_code _DtCmsReminderRefToReminder( cms_reminder_ref *rems, - Reminder_4 **r4)); + Reminder_4 **r4); -extern CSA_return_code _DtCmsV4ReminderToReminderRef P(( +extern CSA_return_code _DtCmsV4ReminderToReminderRef( char *calname, Reminder_4 *r4, _DtCmsEntryId *ids, - cms_reminder_ref **rems)); + cms_reminder_ref **rems); -extern CSA_return_code _DtCmsCmsAccessToV4Access P(( +extern CSA_return_code _DtCmsCmsAccessToV4Access( cms_access_entry *alist, - Access_Entry_4 **a4)); + Access_Entry_4 **a4); -extern CSA_return_code _DtCmsAppt4ToCmsentriesForClient P(( +extern CSA_return_code _DtCmsAppt4ToCmsentriesForClient( char *calname, Appt_4 *appt, - cms_entry **e_r)); + cms_entry **e_r); -extern CSA_return_code _DtCmsAppt4ToCmsentry P(( +extern CSA_return_code _DtCmsAppt4ToCmsentry( char *calname, Appt_4 *a4, cms_entry **entry_r, - boolean_t rerule)); + boolean_t rerule); -extern CSA_return_code _DtCmsAttrsToAppt4 P(( +extern CSA_return_code _DtCmsAttrsToAppt4( uint size, cms_attribute *attrs, Appt_4 *appt, - boolean_t check)); + boolean_t check); #endif diff --git a/cde/programs/dtcm/server/cmsentry.h b/cde/programs/dtcm/server/cmsentry.h index 63936eb32..41924b2e7 100644 --- a/cde/programs/dtcm/server/cmsentry.h +++ b/cde/programs/dtcm/server/cmsentry.h @@ -32,23 +32,22 @@ #define _CMSENTRY_H #include -#include "ansi_c.h" #include "nametbl.h" #include "cm.h" #include "csa.h" #include "cmscalendar.h" -extern CSA_return_code _DtCmsMakeHashedEntry P(( +extern CSA_return_code _DtCmsMakeHashedEntry( _DtCmsCalendar *cal, uint num, cms_attribute *attrs, - cms_entry **entry)); + cms_entry **entry); -extern void _DtCmsFreeEntryAttrResItem P((cms_get_entry_attr_res_item *elist)); +extern void _DtCmsFreeEntryAttrResItem(cms_get_entry_attr_res_item *elist); -extern CSA_return_code _DtCmsGetCmsEntryForClient P(( +extern CSA_return_code _DtCmsGetCmsEntryForClient( cms_entry *e, cms_entry **e_r, - boolean_t time_only)); + boolean_t time_only); #endif diff --git a/cde/programs/dtcm/server/cmsmatch.h b/cde/programs/dtcm/server/cmsmatch.h index b24c8eb83..926cd66b5 100644 --- a/cde/programs/dtcm/server/cmsmatch.h +++ b/cde/programs/dtcm/server/cmsmatch.h @@ -32,14 +32,13 @@ #define _CMSMATCH_H #include -#include "ansi_c.h" #include "cm.h" #include "nametbl.h" -extern boolean_t _DtCmsMatchAttributes P(( +extern boolean_t _DtCmsMatchAttributes( cms_entry *entry, uint num_attrs, cms_attribute *attrs, - CSA_enum *ops)); + CSA_enum *ops); #endif diff --git a/cde/programs/dtcm/server/data.h b/cde/programs/dtcm/server/data.h index 23d021c2a..0435fdac5 100644 --- a/cde/programs/dtcm/server/data.h +++ b/cde/programs/dtcm/server/data.h @@ -35,8 +35,6 @@ * Common definition for internal data storage */ -#include "ansi_c.h" - typedef enum { rb_ok = 0, rb_duplicate = 1, diff --git a/cde/programs/dtcm/server/delete.h b/cde/programs/dtcm/server/delete.h index 1bc11d619..a1a38e8c1 100644 --- a/cde/programs/dtcm/server/delete.h +++ b/cde/programs/dtcm/server/delete.h @@ -31,31 +31,30 @@ #ifndef _DELETE_H #define _DELETE_H -#include "ansi_c.h" #include "cm.h" #include "cmscalendar.h" -extern CSA_return_code _DtCmsDeleteEntry P(( +extern CSA_return_code _DtCmsDeleteEntry( _DtCmsCalendar *cal, char *sender, uint access, cms_key *key, - cms_entry **entry_r)); + cms_entry **entry_r); -extern CSA_return_code _DtCmsDeleteEntryAndLog P(( +extern CSA_return_code _DtCmsDeleteEntryAndLog( _DtCmsCalendar *cal, char *sender, uint access, cms_key *key, - cms_entry **entry_r)); + cms_entry **entry_r); -extern CSA_return_code _DtCmsDeleteInstancesAndLog P(( +extern CSA_return_code _DtCmsDeleteInstancesAndLog( _DtCmsCalendar *cal, char *sender, uint access, cms_key *key, int scope, cms_entry **newe, - cms_entry **olde)); + cms_entry **olde); #endif diff --git a/cde/programs/dtcm/server/garbage.h b/cde/programs/dtcm/server/garbage.h index dd635b82b..8548e1098 100644 --- a/cde/programs/dtcm/server/garbage.h +++ b/cde/programs/dtcm/server/garbage.h @@ -31,8 +31,6 @@ #ifndef _GARBAGE_H #define _GARBAGE_H -#include "ansi_c.h" - /* ** Housekeeping mechanism to clean up the calendar log file. It copies the ** log file to a backup file, dumps the red/black tree to a temp file, copies @@ -41,8 +39,8 @@ ** The garbage collector runs at midnight every. */ -extern void _DtCmsCollectOne P((_DtCmsCalendar *cal)); -extern CSA_return_code _DtCmsDumpDataV1 P((char *file, _DtCmsCalendar *cal)); -extern CSA_return_code _DtCmsDumpDataV2 P((char *file, _DtCmsCalendar *cal)); +extern void _DtCmsCollectOne(_DtCmsCalendar *cal); +extern CSA_return_code _DtCmsDumpDataV1(char *file, _DtCmsCalendar *cal); +extern CSA_return_code _DtCmsDumpDataV2(char *file, _DtCmsCalendar *cal); #endif diff --git a/cde/programs/dtcm/server/insert.h b/cde/programs/dtcm/server/insert.h index bf1d639aa..b0d28fbcb 100644 --- a/cde/programs/dtcm/server/insert.h +++ b/cde/programs/dtcm/server/insert.h @@ -31,16 +31,15 @@ #ifndef _INSERT_H #define _INSERT_H -#include "ansi_c.h" #include "cm.h" #include "cmscalendar.h" -extern CSA_return_code _DtCmsInsertEntry P(( +extern CSA_return_code _DtCmsInsertEntry( _DtCmsCalendar *cal, - cms_entry *entry)); + cms_entry *entry); -extern CSA_return_code _DtCmsInsertEntryAndLog P(( +extern CSA_return_code _DtCmsInsertEntryAndLog( _DtCmsCalendar *cal, - cms_entry *entry)); + cms_entry *entry); #endif diff --git a/cde/programs/dtcm/server/lexer.h b/cde/programs/dtcm/server/lexer.h index 932cbf67b..e9866cb21 100644 --- a/cde/programs/dtcm/server/lexer.h +++ b/cde/programs/dtcm/server/lexer.h @@ -31,7 +31,6 @@ #ifndef _LEXER_H #define _LEXER_H -#include "ansi_c.h" #include "rtable4.h" extern int yyylineno; @@ -42,7 +41,7 @@ extern Tag_4 externTag; extern Appt_Status_4 externApptStatus; extern Privacy_Level_4 externPrivacy; -extern void setinput P((FILE*)); -extern int yyylex P(()); +extern void setinput(FILE*); +extern int yyylex(void); #endif diff --git a/cde/programs/dtcm/server/lexit.c b/cde/programs/dtcm/server/lexit.c index afd6c6e43..ebe2653c6 100644 --- a/cde/programs/dtcm/server/lexit.c +++ b/cde/programs/dtcm/server/lexit.c @@ -46,7 +46,6 @@ #include "rtable4.h" #include "parser.h" -#include "ansi_c.h" extern char *pgname; int yyylineno; @@ -58,8 +57,8 @@ Appt_Status_4 externApptStatus; Tag_4 externTag; Privacy_Level_4 externPrivacy; -static int hash_string P((char *)); -static char *strescapes P((char *)); +static int hash_string(char *); +static char *strescapes(char *); static int len; static caddr_t start_of_mmapped_area; diff --git a/cde/programs/dtcm/server/list.h b/cde/programs/dtcm/server/list.h index 899a0032f..66e9d817c 100644 --- a/cde/programs/dtcm/server/list.h +++ b/cde/programs/dtcm/server/list.h @@ -31,7 +31,6 @@ #ifndef _LIST_H #define _LIST_H -#include "ansi_c.h" #include "data.h" #include "rerule.h" @@ -49,28 +48,28 @@ typedef struct { caddr_t private; /* for internal tool state */ } Hc_list; -typedef int(*Destroy_proc)P((caddr_t)); +typedef int(*Destroy_proc)(caddr_t); #define hc_lookup_next(p_node) (p_node)->rlink #define hc_lookup_previous(p_node) (p_node)->llink -extern Rb_Status hc_check_list P((Hc_list*)); -extern Hc_list* hc_create P((_DtCmsGetKeyProc, _DtCmsCompareProc)); -extern List_node *hc_delete P((Hc_list*, caddr_t key)); -extern List_node *hc_delete_node P((Hc_list*, List_node*)); -extern void hc_destroy P((Hc_list*, Destroy_proc)); -extern void hc_enumerate_down P((Hc_list*, _DtCmsEnumerateProc)); -extern Rb_Status hc_enumerate_up P((Hc_list*, _DtCmsEnumerateProc)); -extern Rb_Status hc_insert P((Hc_list*, caddr_t data, caddr_t key, - RepeatEvent *re, List_node **node_r)); -extern caddr_t hc_lookup P((Hc_list*, caddr_t key)); -extern caddr_t hc_lookup_largest P((Hc_list*)); -extern caddr_t hc_lookup_next_larger P((Hc_list*, caddr_t key)); -extern caddr_t hc_lookup_next_smaller P((Hc_list*, caddr_t key)); -extern caddr_t hc_lookup_smallest P((Hc_list*)); -extern int hc_size P((Hc_list*)); -extern List_node *hc_lookup_node P((Hc_list*, caddr_t key)); -extern Hc_list* hc_create P((_DtCmsGetKeyProc, _DtCmsCompareProc)); -extern Rb_Status hc_insert_node P((Hc_list *, List_node *, caddr_t key)); +extern Rb_Status hc_check_list(Hc_list*); +extern Hc_list* hc_create(_DtCmsGetKeyProc, _DtCmsCompareProc); +extern List_node *hc_delete(Hc_list*, caddr_t key); +extern List_node *hc_delete_node(Hc_list*, List_node*); +extern void hc_destroy(Hc_list*, Destroy_proc); +extern void hc_enumerate_down(Hc_list*, _DtCmsEnumerateProc); +extern Rb_Status hc_enumerate_up(Hc_list*, _DtCmsEnumerateProc); +extern Rb_Status hc_insert(Hc_list*, caddr_t data, caddr_t key, + RepeatEvent *re, List_node **node_r); +extern caddr_t hc_lookup(Hc_list*, caddr_t key); +extern caddr_t hc_lookup_largest(Hc_list*); +extern caddr_t hc_lookup_next_larger(Hc_list*, caddr_t key); +extern caddr_t hc_lookup_next_smaller(Hc_list*, caddr_t key); +extern caddr_t hc_lookup_smallest(Hc_list*); +extern int hc_size(Hc_list*); +extern List_node *hc_lookup_node(Hc_list*, caddr_t key); +extern Hc_list* hc_create(_DtCmsGetKeyProc, _DtCmsCompareProc); +extern Rb_Status hc_insert_node(Hc_list *, List_node *, caddr_t key); #endif diff --git a/cde/programs/dtcm/server/log.h b/cde/programs/dtcm/server/log.h index db7a84a29..3eef53839 100644 --- a/cde/programs/dtcm/server/log.h +++ b/cde/programs/dtcm/server/log.h @@ -31,7 +31,6 @@ #ifndef _LOG_H #define _LOG_H -#include "ansi_c.h" #include "cm.h" #include "rtable4.h" @@ -48,63 +47,63 @@ typedef enum { _DtCmsLogAdd, _DtCmsLogRemove } _DtCmsLogOps; -extern CSA_return_code _DtCmsAppendAppt4ByFN P((char*, Appt_4*, _DtCmsLogOps)); -extern CSA_return_code _DtCmsAppendAppt4ByFD P((int, Appt_4*, _DtCmsLogOps)); +extern CSA_return_code _DtCmsAppendAppt4ByFN(char*, Appt_4*, _DtCmsLogOps); +extern CSA_return_code _DtCmsAppendAppt4ByFD(int, Appt_4*, _DtCmsLogOps); -extern CSA_return_code _DtCmsAppendCalAttrsByFN P((char *file, +extern CSA_return_code _DtCmsAppendCalAttrsByFN(char *file, int size, - cms_attribute * attrs)); -extern CSA_return_code _DtCmsAppendCalAttrsByFD P((int f, + cms_attribute * attrs); +extern CSA_return_code _DtCmsAppendCalAttrsByFD(int f, int size, - cms_attribute * attrs)); + cms_attribute * attrs); -extern CSA_return_code _DtCmsAppendEntryByFN P((char *, +extern CSA_return_code _DtCmsAppendEntryByFN(char *, cms_entry *, - _DtCmsLogOps)); -extern CSA_return_code _DtCmsAppendEntryByFD P((int, + _DtCmsLogOps); +extern CSA_return_code _DtCmsAppendEntryByFD(int, cms_entry *, - _DtCmsLogOps)); + _DtCmsLogOps); -extern CSA_return_code _DtCmsAppendHTableByFN P((char *file, +extern CSA_return_code _DtCmsAppendHTableByFN(char *file, uint size, char **names, - int *types)); + int *types); -extern CSA_return_code _DtCmsAppendHTableByFD P((int fd, +extern CSA_return_code _DtCmsAppendHTableByFD(int fd, uint size, char **names, - int *types)); + int *types); -extern CSA_return_code _DtCmsAppendAccessByFN P((char*, +extern CSA_return_code _DtCmsAppendAccessByFN(char*, int, - Access_Entry_4 *)); -extern CSA_return_code _DtCmsAppendAccessByFD P((int, int, Access_Entry_4 *)); + Access_Entry_4 *); +extern CSA_return_code _DtCmsAppendAccessByFD(int, int, Access_Entry_4 *); -extern CSA_return_code _DtCmsCreateLogV1 P((char*, char *)); +extern CSA_return_code _DtCmsCreateLogV1(char*, char *); -extern CSA_return_code _DtCmsCreateLogV2 P((char *owner, char *file)); +extern CSA_return_code _DtCmsCreateLogV2(char *owner, char *file); -extern CSA_return_code _DtCmsWriteVersionString P((char *file, int version)); +extern CSA_return_code _DtCmsWriteVersionString(char *file, int version); -extern int _DtCmsSetFileMode P((char *file, +extern int _DtCmsSetFileMode(char *file, uid_t uid, gid_t gid, mode_t mode, boolean_t changeeuid, - boolean_t printerr)); + boolean_t printerr); -extern CSA_return_code _DtCmsRemoveLog P((char *calendar, char *user)); +extern CSA_return_code _DtCmsRemoveLog(char *calendar, char *user); -extern char *_DtCmsGetBakFN P((char*)); -extern char *_DtCmsGetLogFN P((char*)); -extern char *_DtCmsGetTmpFN P((char*)); -extern char *_DtCmsGetDelFN P((char*)); +extern char *_DtCmsGetBakFN(char*); +extern char *_DtCmsGetLogFN(char*); +extern char *_DtCmsGetTmpFN(char*); +extern char *_DtCmsGetDelFN(char*); -extern boolean_t _DtCmsPrintAppt4 P((caddr_t data)); -extern void _DtCmsPrintExceptions P((int len, int *exceptions)); +extern boolean_t _DtCmsPrintAppt4(caddr_t data); +extern void _DtCmsPrintExceptions(int len, int *exceptions); -extern CSA_return_code _DtCmsGetFileSize P((char *calendar, int *size)); +extern CSA_return_code _DtCmsGetFileSize(char *calendar, int *size); -extern void _DtCmsTruncateFile P((char *calendar, int size)); +extern void _DtCmsTruncateFile(char *calendar, int size); #endif diff --git a/cde/programs/dtcm/server/lookup.h b/cde/programs/dtcm/server/lookup.h index b4a1c1e6f..287d6acc4 100644 --- a/cde/programs/dtcm/server/lookup.h +++ b/cde/programs/dtcm/server/lookup.h @@ -31,21 +31,20 @@ #ifndef _LOOKUP_H #define _LOOKUP_H -#include "ansi_c.h" #include "cm.h" #include "cmscalendar.h" -extern _DtCmsComparisonResult _DtCmsCompareEntry P(( +extern _DtCmsComparisonResult _DtCmsCompareEntry( cms_key *key, - caddr_t data)); + caddr_t data); -extern _DtCmsComparisonResult _DtCmsCompareRptEntry P(( +extern _DtCmsComparisonResult _DtCmsCompareRptEntry( cms_key *key, - caddr_t data)); + caddr_t data); -extern caddr_t _DtCmsGetEntryKey P((caddr_t data)); +extern caddr_t _DtCmsGetEntryKey(caddr_t data); -extern CSA_return_code _DtCmsLookupEntries P(( +extern CSA_return_code _DtCmsLookupEntries( _DtCmsCalendar *cal, char *sender, uint access, @@ -57,9 +56,9 @@ extern CSA_return_code _DtCmsLookupEntries P(( CSA_uint32 num_attrs, cms_attribute *attrs, CSA_enum *ops, - cms_entry **entries)); + cms_entry **entries); -extern CSA_return_code _DtCmsLookupEntriesById P(( +extern CSA_return_code _DtCmsLookupEntriesById( _DtCmsCalendar *cal, char *sender, uint access, @@ -73,9 +72,9 @@ extern CSA_return_code _DtCmsLookupEntriesById P(( CSA_uint32 num_attrs, cms_attribute *attrs, CSA_enum *ops, - cms_entry **entries)); + cms_entry **entries); -extern CSA_return_code _DtCmsEnumerateSequenceById P(( +extern CSA_return_code _DtCmsEnumerateSequenceById( _DtCmsCalendar *cal, char *sender, uint access, @@ -89,9 +88,9 @@ extern CSA_return_code _DtCmsEnumerateSequenceById P(( CSA_uint32 num_attrs, cms_attribute *attrs, CSA_enum *ops, - cms_entry **entries)); + cms_entry **entries); -extern CSA_return_code _DtCmsLookupEntriesByKey P(( +extern CSA_return_code _DtCmsLookupEntriesByKey( _DtCmsCalendar *cal, char *sender, uint access, @@ -99,10 +98,10 @@ extern CSA_return_code _DtCmsLookupEntriesByKey P(( cms_key *keys, uint num_names, cms_attr_name *names, - cms_get_entry_attr_res_item **res)); + cms_get_entry_attr_res_item **res); -extern CSA_return_code _DtCmsGetEntryAttrByKey P(( +extern CSA_return_code _DtCmsGetEntryAttrByKey( _DtCmsCalendar *cal, char *sender, uint access, @@ -110,6 +109,6 @@ extern CSA_return_code _DtCmsGetEntryAttrByKey P(( uint num_names, cms_attr_name *names, cms_entry **entry_r, - cms_get_entry_attr_res_item **res_r)); + cms_get_entry_attr_res_item **res_r); #endif diff --git a/cde/programs/dtcm/server/reminder.h b/cde/programs/dtcm/server/reminder.h index a6861a489..630fd4286 100644 --- a/cde/programs/dtcm/server/reminder.h +++ b/cde/programs/dtcm/server/reminder.h @@ -31,7 +31,6 @@ #ifndef _REMINDER_H #define _REMINDER_H -#include "ansi_c.h" #include "EUSCompat.h" #include "cm.h" #include "rtable4.h" @@ -71,50 +70,50 @@ typedef struct reminder_q { struct reminder_q *next; } Rm_que; -extern void _DtCmsAddReminderV4 P((Rm_que **qhead, Rm_que *p_reminder)); +extern void _DtCmsAddReminderV4(Rm_que **qhead, Rm_que *p_reminder); -extern Rm_que *_DtCmsRemoveReminderV4 P(( +extern Rm_que *_DtCmsRemoveReminderV4( Rm_que **qhead, Rm_que *p_prev, - Rm_que *p_curr)); + Rm_que *p_curr); -extern Rm_que *build_reminder P(( +extern Rm_que *build_reminder( time_t current_time, Appt_4 *p_appt, Attr_4 p_attr, time_t start_tick, - u_int start_ord)); + u_int start_ord); -extern Reminder_4 *_DtCmsGetReminderInfoV4 P((Rm_que *original)); +extern Reminder_4 *_DtCmsGetReminderInfoV4(Rm_que *original); -extern void _DtCmsPrintReminderListV4 P((Rm_que *qhead)); +extern void _DtCmsPrintReminderListV4(Rm_que *qhead); -extern void _DtCmsObsoleteReminderV4 P(( +extern void _DtCmsObsoleteReminderV4( Rm_que **qhead, Appt_4 *p_appt, int ord, - boolean_t delforward)); + boolean_t delforward); -extern void _DtCmsAddReminders4Entry P(( +extern void _DtCmsAddReminders4Entry( _DtCmsRemQueue **qhead, cms_entry *entry, - List_node *lnode)); + List_node *lnode); -extern void _DtCmsObsoleteReminder4Entry P(( +extern void _DtCmsObsoleteReminder4Entry( _DtCmsRemQueue *qhead, cms_entry *entry, List_node *lnode, time_t starttime, - boolean_t delfwd)); + boolean_t delfwd); -extern CSA_return_code _DtCmsLookupReminder P(( +extern CSA_return_code _DtCmsLookupReminder( _DtCmsRemQueue *remq, time_t tick, uint num_names, cms_attr_name *names, - cms_reminder_ref **rems)); + cms_reminder_ref **rems); -extern void _DtCmsFreeReminderRef P((cms_reminder_ref *rems)); +extern void _DtCmsFreeReminderRef(cms_reminder_ref *rems); extern void _DtCmsUpdateReminders(_DtCmsRemQueue *remq); diff --git a/cde/programs/dtcm/server/repeat.h b/cde/programs/dtcm/server/repeat.h index 6dbcdd8ef..ce50a197f 100644 --- a/cde/programs/dtcm/server/repeat.h +++ b/cde/programs/dtcm/server/repeat.h @@ -32,7 +32,6 @@ #define _REPEAT_H #include -#include "ansi_c.h" #include "cm.h" #include "rtable4.h" #include "rerule.h" @@ -41,45 +40,45 @@ typedef time_t Tick; extern int monthdays[]; -extern void init_time P(()); +extern void init_time(void); -extern time_t _DtCms_closest_tick_v4 P((time_t target, +extern time_t _DtCms_closest_tick_v4(time_t target, time_t ftick, Period_4 period, - int *ordinal)); + int *ordinal); -extern time_t _DtCms_last_tick_v4 P((time_t ftick, +extern time_t _DtCms_last_tick_v4(time_t ftick, Period_4 period, - int ntimes)); + int ntimes); -extern time_t _DtCms_next_tick_v4 P((time_t tick, Period_4 period)); +extern time_t _DtCms_next_tick_v4(time_t tick, Period_4 period); -extern time_t _DtCms_prev_tick_v4 P((time_t tick, Period_4 period)); +extern time_t _DtCms_prev_tick_v4(time_t tick, Period_4 period); -extern time_t _DtCms_first_tick_v4 P((time_t t, Period_4 period, int ordinal)); +extern time_t _DtCms_first_tick_v4(time_t t, Period_4 period, int ordinal); -extern void _DtCms_adjust_appt_startdate P((Appt_4 *appt)); +extern void _DtCms_adjust_appt_startdate(Appt_4 *appt); -extern time_t next_nmins P((time_t t, int m)); +extern time_t next_nmins(time_t t, int m); -extern time_t next_ndays P((time_t t, int n)); +extern time_t next_ndays(time_t t, int n); -extern int _DtCms_marked_4_cancellation P((Appt_4 *a, int i)); +extern int _DtCms_marked_4_cancellation(Appt_4 *a, int i); -extern int _DtCms_get_new_ntimes_v4 P((Period_4 period, +extern int _DtCms_get_new_ntimes_v4(Period_4 period, time_t tick, - int ninstance)); + int ninstance); -extern int _DtCms_get_ninstance_v4 P((Appt_4 *appt)); +extern int _DtCms_get_ninstance_v4(Appt_4 *appt); -extern int _DtCms_in_repeater P((Id_4 *key, +extern int _DtCms_in_repeater(Id_4 *key, Appt_4 *p_appt, - boolean_t dont_care_cancel)); + boolean_t dont_care_cancel); -extern int monthlength P((Tick)); -extern int leapyr P((int)); -extern int fdom P((Tick)); -extern int ldom P((Tick)); +extern int monthlength(Tick); +extern int leapyr(int); +extern int fdom(Tick); +extern int ldom(Tick); /* * returns the tick of the beginning of the day @@ -94,6 +93,6 @@ extern time_t _DtCmsTimeOfDay(time_t t); /* * routines to deal with recurrence rule and exception dates */ -extern boolean_t _DtCmsInExceptionList P((cms_entry *eptr, time_t tick)); +extern boolean_t _DtCmsInExceptionList(cms_entry *eptr, time_t tick); #endif diff --git a/cde/programs/dtcm/server/rpcextras.h b/cde/programs/dtcm/server/rpcextras.h index d0a2c773f..8cc426cc2 100644 --- a/cde/programs/dtcm/server/rpcextras.h +++ b/cde/programs/dtcm/server/rpcextras.h @@ -31,8 +31,6 @@ #ifndef _RPCEXTRAS_H #define _RPCEXTRAS_H -#include "ansi_c.h" - #define RPCGEN_ACTION(routine) routine struct rpcgen_table { @@ -58,7 +56,7 @@ typedef struct prog_object { typedef program_object *program_handle; -extern program_handle newph P(()); -extern program_handle getph P(()); +extern program_handle newph(void); +extern program_handle getph(void); #endif diff --git a/cde/programs/dtcm/server/tree.h b/cde/programs/dtcm/server/tree.h index 7fa1ec0b0..3c439d243 100644 --- a/cde/programs/dtcm/server/tree.h +++ b/cde/programs/dtcm/server/tree.h @@ -31,7 +31,6 @@ #ifndef _TREE_H #define _TREE_H -#include "ansi_c.h" #include "data.h" /* @@ -52,32 +51,32 @@ typedef struct { caddr_t private; /* for internal tool state */ } Rb_tree; -extern Rb_tree* rb_create P((_DtCmsGetKeyProc, _DtCmsCompareProc)); +extern Rb_tree* rb_create(_DtCmsGetKeyProc, _DtCmsCompareProc); -extern void rb_destroy P((Rb_tree*, _DtCmsEnumerateProc)); +extern void rb_destroy(Rb_tree*, _DtCmsEnumerateProc); -extern int rb_size P((Rb_tree*t)); +extern int rb_size(Rb_tree*t); -extern Rb_Status rb_insert P((Rb_tree*, caddr_t data, caddr_t key)); +extern Rb_Status rb_insert(Rb_tree*, caddr_t data, caddr_t key); -extern Rb_Status rb_insert_node P((Rb_tree*, Tree_node*, caddr_t key)); +extern Rb_Status rb_insert_node(Rb_tree*, Tree_node*, caddr_t key); -extern Tree_node * rb_delete P((Rb_tree*, caddr_t key)); +extern Tree_node * rb_delete(Rb_tree*, caddr_t key); -extern caddr_t rb_lookup P((Rb_tree*, caddr_t key)); +extern caddr_t rb_lookup(Rb_tree*, caddr_t key); -extern caddr_t rb_lookup_next_larger P((Rb_tree*, caddr_t key)); +extern caddr_t rb_lookup_next_larger(Rb_tree*, caddr_t key); -extern caddr_t rb_lookup_next_smaller P((Rb_tree*, caddr_t key)); +extern caddr_t rb_lookup_next_smaller(Rb_tree*, caddr_t key); -extern caddr_t rb_lookup_smallest P((Rb_tree*)); +extern caddr_t rb_lookup_smallest(Rb_tree*); -extern caddr_t rb_lookup_largest P((Rb_tree*)); +extern caddr_t rb_lookup_largest(Rb_tree*); -extern Rb_Status rb_enumerate_up P((Rb_tree*, _DtCmsEnumerateProc)); +extern Rb_Status rb_enumerate_up(Rb_tree*, _DtCmsEnumerateProc); -extern void rb_enumerate_down P((Rb_tree*, _DtCmsEnumerateProc)); +extern void rb_enumerate_down(Rb_tree*, _DtCmsEnumerateProc); -extern Rb_Status rb_check_tree P((Rb_tree *)); +extern Rb_Status rb_check_tree(Rb_tree *); #endif diff --git a/cde/programs/dtcm/server/update.h b/cde/programs/dtcm/server/update.h index b68967f1c..587b99d7b 100644 --- a/cde/programs/dtcm/server/update.h +++ b/cde/programs/dtcm/server/update.h @@ -31,16 +31,15 @@ #ifndef _UPDATE_H #define _UPDATE_H -#include "ansi_c.h" #include "cm.h" #include "cmscalendar.h" -extern CSA_return_code _DtCmsUpdateCalAttrs P(( +extern CSA_return_code _DtCmsUpdateCalAttrs( _DtCmsCalendar *cal, uint num_attrs, - cms_attribute *attrs)); + cms_attribute *attrs); -extern CSA_return_code _DtCmsUpdateEntry P(( +extern CSA_return_code _DtCmsUpdateEntry( _DtCmsCalendar *cal, char *sender, uint access, @@ -48,9 +47,9 @@ extern CSA_return_code _DtCmsUpdateEntry P(( uint num_attrs, cms_attribute *attrs, cms_entry **oldentry, - cms_entry **newentry)); + cms_entry **newentry); -extern CSA_return_code _DtCmsUpdateInstances P(( +extern CSA_return_code _DtCmsUpdateInstances( _DtCmsCalendar *cal, char *sender, uint access, @@ -59,6 +58,6 @@ extern CSA_return_code _DtCmsUpdateInstances P(( uint num_attrs, cms_attribute *attrs, cms_entry **oldentry, - cms_entry **newentry)); + cms_entry **newentry); #endif diff --git a/cde/programs/dtcm/server/utility.h b/cde/programs/dtcm/server/utility.h index 2daa3a55a..7a6ec47f5 100644 --- a/cde/programs/dtcm/server/utility.h +++ b/cde/programs/dtcm/server/utility.h @@ -31,14 +31,12 @@ #ifndef _UTILITY_H #define _UTILITY_H -#include "ansi_c.h" +extern char *_DtCmsTarget2Name(char *target); -extern char *_DtCmsTarget2Name P((char *target)); +extern char *_DtCmsTarget2Location(char *target); -extern char *_DtCmsTarget2Location P((char *target)); +extern char *_DtCmsTarget2Host(char *target); -extern char *_DtCmsTarget2Host P((char *target)); - -extern char *_DtCmsTarget2Domain P((char *target)); +extern char *_DtCmsTarget2Domain(char *target); #endif diff --git a/cde/programs/dtcm/server/v4ops.h b/cde/programs/dtcm/server/v4ops.h index 91dca8c1c..322982b52 100644 --- a/cde/programs/dtcm/server/v4ops.h +++ b/cde/programs/dtcm/server/v4ops.h @@ -31,7 +31,6 @@ #ifndef _V4OPS_H #define _V4OPS_H -#include "ansi_c.h" #include "rtable4.h" #include "cm.h" #include "log.h" @@ -45,64 +44,64 @@ typedef struct __DtCmsEntryId { struct __DtCmsEntryId *next; } _DtCmsEntryId; -extern CSA_return_code _DtCmsInsertAppt P((_DtCmsCalendar *cal, Appt_4 *appt4)); +extern CSA_return_code _DtCmsInsertAppt(_DtCmsCalendar *cal, Appt_4 *appt4); -extern CSA_return_code _DtCmsDeleteAppt P(( +extern CSA_return_code _DtCmsDeleteAppt( _DtCmsCalendar *cal, char *user, uint access, Id_4 *p_key, - Appt_4 **appt_r)); + Appt_4 **appt_r); -extern CSA_return_code _DtCmsDeleteApptAndLog P(( +extern CSA_return_code _DtCmsDeleteApptAndLog( _DtCmsCalendar *cal, char *user, uint access, Id_4 *key, - Appt_4 **oldappt)); + Appt_4 **oldappt); -extern CSA_return_code _DtCmsDeleteApptInstancesAndLog P(( +extern CSA_return_code _DtCmsDeleteApptInstancesAndLog( _DtCmsCalendar *cal, char *source, uint access, Id_4 *key, Options_4 option, int *remain, - Appt_4 **oldappt)); + Appt_4 **oldappt); -extern CSA_return_code _DtCmsChangeAll P(( +extern CSA_return_code _DtCmsChangeAll( _DtCmsCalendar *cal, char *source, uint access, Id_4 *p_key, Appt_4 *newa, - Appt_4 **oldappt)); + Appt_4 **oldappt); -extern CSA_return_code _DtCmsChangeSome P(( +extern CSA_return_code _DtCmsChangeSome( _DtCmsCalendar *cal, char *source, uint access, Id_4 *p_key, Appt_4 *p_appt, Options_4 option, - Appt_4 **oldappt)); + Appt_4 **oldappt); -extern CSA_return_code _DtCmsInsertApptAndLog P(( +extern CSA_return_code _DtCmsInsertApptAndLog( _DtCmsCalendar *cal, - Appt_4 *appt)); + Appt_4 *appt); -extern _DtCmsComparisonResult _DtCmsCompareAppt P((Id_4 *key, caddr_t data)); +extern _DtCmsComparisonResult _DtCmsCompareAppt(Id_4 *key, caddr_t data); -extern _DtCmsComparisonResult _DtCmsCompareRptAppt P((Id_4 *key, caddr_t data)); +extern _DtCmsComparisonResult _DtCmsCompareRptAppt(Id_4 *key, caddr_t data); -extern caddr_t _DtCmsGetApptKey P((caddr_t data)); +extern caddr_t _DtCmsGetApptKey(caddr_t data); -extern CSA_return_code v4_transact_log P(( +extern CSA_return_code v4_transact_log( char *calendar, Appt_4 *a, - _DtCmsLogOps op)); + _DtCmsLogOps op); -extern CSA_return_code _DtCmsLookupRangeV4 P(( +extern CSA_return_code _DtCmsLookupRangeV4( _DtCmsCalendar *cal, char *user, uint access, @@ -115,9 +114,9 @@ extern CSA_return_code _DtCmsLookupRangeV4 P(( cms_attribute *attrs, CSA_enum *ops, Appt_4 **appt_r, - Abb_Appt_4 **abbr_r)); + Abb_Appt_4 **abbr_r); -extern CSA_return_code _DtCmsLookupKeyrangeV4 P(( +extern CSA_return_code _DtCmsLookupKeyrangeV4( _DtCmsCalendar *cal, char *user, uint access, @@ -133,48 +132,48 @@ extern CSA_return_code _DtCmsLookupKeyrangeV4 P(( cms_attribute *attrs, CSA_enum *ops, Appt_4 **appt_r, - Abb_Appt_4 **abbr_r)); + Abb_Appt_4 **abbr_r); -extern CSA_return_code _AddToLinkedAppts P(( +extern CSA_return_code _AddToLinkedAppts( Appt_4 *p_appt, char *user, uint access, - caddr_t *ilp)); + caddr_t *ilp); -extern CSA_return_code _AddToLinkedAbbrAppts P(( +extern CSA_return_code _AddToLinkedAbbrAppts( Appt_4 *p_appt, char *user, uint access, - caddr_t *ilp)); + caddr_t *ilp); -extern Privacy_Level_4 _GetAccessLevel P(( +extern Privacy_Level_4 _GetAccessLevel( char *user, uint access, - Appt_4 *p_appt)); + Appt_4 *p_appt); -extern Appt_4 * _AddApptInOrder P((Appt_4 * head, Appt_4 * aptr)); +extern Appt_4 * _AddApptInOrder(Appt_4 * head, Appt_4 * aptr); -extern Abb_Appt_4 * _AddAbbApptInOrder P((Abb_Appt_4 *head, Abb_Appt_4 *aptr)); +extern Abb_Appt_4 * _AddAbbApptInOrder(Abb_Appt_4 *head, Abb_Appt_4 *aptr); -extern CSA_return_code _DtCmsSetV4AccessListAndLog P(( +extern CSA_return_code _DtCmsSetV4AccessListAndLog( _DtCmsCalendar *cal, - Access_Entry_4 *alist)); + Access_Entry_4 *alist); -extern CSA_return_code _DtCmsGetV4Reminders P(( +extern CSA_return_code _DtCmsGetV4Reminders( _DtCmsCalendar *cal, long tick, Reminder_4 **rem_r, - _DtCmsEntryId **ids_r)); + _DtCmsEntryId **ids_r); -extern void _DtCmsFreeEntryIds P((_DtCmsEntryId *ids)); +extern void _DtCmsFreeEntryIds(_DtCmsEntryId *ids); -extern CSA_return_code _DtCmsTruncateElist P(( +extern CSA_return_code _DtCmsTruncateElist( Appt_4 *parent_p, int remain, - Except_4 **excpt)); + Except_4 **excpt); -extern CSA_return_code _DtCmsSetV4AccessListInCal P(( +extern CSA_return_code _DtCmsSetV4AccessListInCal( _DtCmsCalendar *cal, - Access_Entry_4 *e)); + Access_Entry_4 *e); #endif diff --git a/cde/programs/dtcm/server/v5ops.h b/cde/programs/dtcm/server/v5ops.h index 11307e1eb..2a2332eb5 100644 --- a/cde/programs/dtcm/server/v5ops.h +++ b/cde/programs/dtcm/server/v5ops.h @@ -31,42 +31,41 @@ #ifndef _V5OPS_H #define _V5OPS_H -#include "ansi_c.h" #include "cm.h" #include "cmscalendar.h" #include "rerule.h" #include "repeat.h" -extern _DtCmsComparisonResult _DtCmsCompareEntry P(( +extern _DtCmsComparisonResult _DtCmsCompareEntry( cms_key *key, - caddr_t data)); + caddr_t data); -extern _DtCmsComparisonResult _DtCmsCompareRptEntry P(( +extern _DtCmsComparisonResult _DtCmsCompareRptEntry( cms_key *key, - caddr_t data)); + caddr_t data); -extern caddr_t _DtCmsGetEntryKey P((caddr_t data)); +extern caddr_t _DtCmsGetEntryKey(caddr_t data); -extern CSA_return_code _DtCmsSetLastUpdate P((cms_entry *entry)); +extern CSA_return_code _DtCmsSetLastUpdate(cms_entry *entry); -extern void _DtCmsConvertToOnetime P((cms_entry *entry, RepeatEvent *re)); +extern void _DtCmsConvertToOnetime(cms_entry *entry, RepeatEvent *re); -extern int _DtCmsGetDuration P((cms_entry *eptr)); +extern int _DtCmsGetDuration(cms_entry *eptr); -extern CSA_return_code _DtCmsCheckInitialAttributes P((cms_entry *entry)); +extern CSA_return_code _DtCmsCheckInitialAttributes(cms_entry *entry); -extern CSA_return_code _DtCmsCheckStartEndTime P((cms_entry *entry)); +extern CSA_return_code _DtCmsCheckStartEndTime(cms_entry *entry); -extern void _DtCmsCleanupExceptionDates P((cms_entry *newe, long ftick)); +extern void _DtCmsCleanupExceptionDates(cms_entry *newe, long ftick); -extern int _DtCmsNumberExceptionDates P((cms_entry *entry)); +extern int _DtCmsNumberExceptionDates(cms_entry *entry); -extern CSA_return_code _DtCmsUpdateDurationInRule P(( +extern CSA_return_code _DtCmsUpdateDurationInRule( cms_entry *entry, - uint remain)); + uint remain); -extern CSA_return_code _DtCmsAddEndDateToRule P(( +extern CSA_return_code _DtCmsAddEndDateToRule( cms_attribute *attr, RepeatEvent *re, - long time)); + long time); #endif