From 2c134302c870f0dbd0dfdd8f8e7fde37d3c87656 Mon Sep 17 00:00:00 2001 From: Peter Howkins Date: Wed, 22 Dec 2021 01:26:51 +0000 Subject: [PATCH] dtcm: Resolve uninitialized warnings --- cde/programs/dtcm/dtcm/find.c | 2 +- cde/programs/dtcm/dtcm/font.c | 2 +- cde/programs/dtcm/dtcm/misc.c | 8 ++++---- cde/programs/dtcm/dtcm/props_pu.c | 4 ++-- cde/programs/dtcm/dtcm/todo.c | 4 +++- cde/programs/dtcm/libDtCmP/util.c | 4 ++-- cde/programs/dtcm/server/cmsfunc.c | 2 +- cde/programs/dtcm/server/lookup.c | 6 +++--- cde/programs/dtcm/server/reclotick.c | 2 +- cde/programs/dtcm/server/relasttick.c | 2 +- cde/programs/dtcm/server/renexttick.c | 2 +- cde/programs/dtcm/server/repeat.c | 3 +++ cde/programs/dtcm/server/reprevtick.c | 2 +- 13 files changed, 24 insertions(+), 19 deletions(-) diff --git a/cde/programs/dtcm/dtcm/find.c b/cde/programs/dtcm/dtcm/find.c index f55e71f48..18a009fc7 100644 --- a/cde/programs/dtcm/dtcm/find.c +++ b/cde/programs/dtcm/dtcm/find.c @@ -575,7 +575,7 @@ find_appts(Widget widget, XtPointer client_data, XmPushButtonCallbackStruct *cbs int num_items, mo, last_match_total = 0, match_total = 0; pr_pos xy; Tick end_of_time, start, stop; - Tick_list *ptr, *next_ptr, *tail_ptr, *new_tick; + Tick_list *ptr, *next_ptr, *tail_ptr = NULL, *new_tick; CSA_session_handle cal = 0; CSA_return_code stat; CSA_entry_handle *entries = NULL; diff --git a/cde/programs/dtcm/dtcm/font.c b/cde/programs/dtcm/dtcm/font.c index dda3482c5..cc4f154bb 100644 --- a/cde/programs/dtcm/dtcm/font.c +++ b/cde/programs/dtcm/dtcm/font.c @@ -60,7 +60,7 @@ get_font( XmFontContext fl_context; XmFontListEntry fl_entry; XtPointer fl_entry_font, - font_to_use; + font_to_use = NULL; char *fl_entry_font_tag; Boolean found_font_set = False, found_font_struct = False; diff --git a/cde/programs/dtcm/dtcm/misc.c b/cde/programs/dtcm/dtcm/misc.c index 947e0d67c..5915488bd 100644 --- a/cde/programs/dtcm/dtcm/misc.c +++ b/cde/programs/dtcm/dtcm/misc.c @@ -682,7 +682,7 @@ dialog_popup(Widget parent, ...) { char *text_str = NULL, *ptr, buf[MAXNAMELEN], *help_str; Pixmap px; va_list pvar; - Widget frame, form, image, sep, text, last_text, button; + Widget frame, form, image, sep, text, last_text = NULL, button; Display *dpy = XtDisplayOfObject(parent); XmString xmstr; Dialog_create_op op; @@ -1301,7 +1301,7 @@ Dimension *dim, ... ) { va_list ap; - int i, _high; + int i, _high = 0; Dimension _max; Widget _targetW, _highestW; Arg _args[3]; @@ -1355,7 +1355,7 @@ Dimension *dim, ... ) { va_list ap; - int i, _wide; + int i, _wide = 0; Widget _targetW, _widestW; Dimension _max; XtWidgetGeometry geo; @@ -1425,7 +1425,7 @@ Dimension *dim, ... ) { va_list ap; - int i, _high; + int i, _high = 0; Dimension _max; Widget _targetW, _highestW; Arg _args[3]; diff --git a/cde/programs/dtcm/dtcm/props_pu.c b/cde/programs/dtcm/dtcm/props_pu.c index 99da5130f..cc6b0bc05 100644 --- a/cde/programs/dtcm/dtcm/props_pu.c +++ b/cde/programs/dtcm/dtcm/props_pu.c @@ -2638,7 +2638,7 @@ extern Boolean get_editor_vals_from_ui(Props_pu *pu, Props *p) { int i, hr, min; char buf[5]; - Widget text; + Widget text = NULL; DisplayType dt = get_int_prop(p, CP_DEFAULTDISP); Reminders_val *val; char *msg, *dur_txt; @@ -2733,7 +2733,7 @@ get_editor_vals_from_ui(Props_pu *pu, Props *p) { if ((status = get_reminders_vals(&pu->ep_reminders, False)) != REMINDERS_OK) { char *title = XtNewString(CATGETS(c->DT_catd, 1, 1079, "Calendar : Error - Editor Settings")); - char *text; + char *text = NULL; char *ident1 = XtNewString(CATGETS(c->DT_catd, 1, 95, "Continue")); switch (status) { diff --git a/cde/programs/dtcm/dtcm/todo.c b/cde/programs/dtcm/dtcm/todo.c index c74e3e8d5..a30795f8d 100644 --- a/cde/programs/dtcm/dtcm/todo.c +++ b/cde/programs/dtcm/dtcm/todo.c @@ -2128,8 +2128,10 @@ build_todo_list(ToDo *t, Tick date, Glance glance, CSA_entry_handle **a, CSA_uin state = CSA_STATUS_COMPLETED; use_state = B_TRUE; } - else + else { + state = 0; use_state = B_FALSE; + } setup_range(&range_attrs, &ops, &range_count, start, stop, CSA_TYPE_TODO, state, use_state, t->cal->general->version); diff --git a/cde/programs/dtcm/libDtCmP/util.c b/cde/programs/dtcm/libDtCmP/util.c index dc8b62c45..75e902578 100644 --- a/cde/programs/dtcm/libDtCmP/util.c +++ b/cde/programs/dtcm/libDtCmP/util.c @@ -377,7 +377,7 @@ text_to_lines(char *s, int n) Lines *prev_l = NULL, *l = NULL, *head= NULL; int i = 0; char *_p; - int clen; + int clen = 0; if (s == NULL || n <= 0) return NULL; @@ -1227,7 +1227,7 @@ Dtcm_appointment *allocate_appt_struct (Allocation_reason reason, int version, . va_list pvar; CmDataList *api_ids = CmDataListCreate(); Dtcm_appointment *appt; - int def_attr_count; + int def_attr_count = 0; /* * The Dtcm_appointment wrapper array diff --git a/cde/programs/dtcm/server/cmsfunc.c b/cde/programs/dtcm/server/cmsfunc.c index effc6f63e..5e6d37d0a 100644 --- a/cde/programs/dtcm/server/cmsfunc.c +++ b/cde/programs/dtcm/server/cmsfunc.c @@ -778,7 +778,7 @@ cms_insert_entry_5_svc(cms_insert_args *args, struct svc_req *svcrq) cms_key key; char *user; uint access, needaccess; - Appt_4 *appt; + Appt_4 *appt = NULL; if (debug) fprintf(stderr, "cms_insert_entry_5_svc called\n"); diff --git a/cde/programs/dtcm/server/lookup.c b/cde/programs/dtcm/server/lookup.c index cb98523d9..8730bf529 100644 --- a/cde/programs/dtcm/server/lookup.c +++ b/cde/programs/dtcm/server/lookup.c @@ -341,10 +341,10 @@ _DtCmsGetEntryAttrByKey( CSA_return_code stat; CSA_return_code stat2; cms_entry *entry = NULL; - char *stime, *etime; + char *stime, *etime = NULL; char sbuf[TIME_BUF_LEN], ebuf[TIME_BUF_LEN]; time_t firsttick = 0; - List_node *lnode; + List_node *lnode = NULL; cms_get_entry_attr_res_item *res = NULL; if (entry_r == NULL && res_r == NULL) @@ -529,7 +529,7 @@ _EnumerateSequence( stat == CSA_SUCCESS && tick < start2; tick = NextTick(tick, fsttick, lnode->re, restate)) { - char *stime, *etime; + char *stime, *etime = NULL; char sbuf[TIME_BUF_LEN], ebuf[TIME_BUF_LEN]; if (tick <= 0 || tick > lnode->lasttick) diff --git a/cde/programs/dtcm/server/reclotick.c b/cde/programs/dtcm/server/reclotick.c index d1d7ddba2..7d75db603 100644 --- a/cde/programs/dtcm/server/reclotick.c +++ b/cde/programs/dtcm/server/reclotick.c @@ -77,7 +77,7 @@ ClosestTick( RepeatEvent *re, RepeatEventState **res) { - Tick closest_tick, + Tick closest_tick = 0, real_start_time, target_time = _target_time; diff --git a/cde/programs/dtcm/server/relasttick.c b/cde/programs/dtcm/server/relasttick.c index 89747dcbe..41c6d0310 100644 --- a/cde/programs/dtcm/server/relasttick.c +++ b/cde/programs/dtcm/server/relasttick.c @@ -61,7 +61,7 @@ LastTick( const Tick start_time, RepeatEvent *re) { - Tick last_time; + Tick last_time = 0; if (!re) return (Tick)0; diff --git a/cde/programs/dtcm/server/renexttick.c b/cde/programs/dtcm/server/renexttick.c index 9f19e9007..19e584e1c 100644 --- a/cde/programs/dtcm/server/renexttick.c +++ b/cde/programs/dtcm/server/renexttick.c @@ -77,7 +77,7 @@ NextTick( RepeatEvent *re, RepeatEventState *res) { - Tick next_time; + Tick next_time = 0; if (!re) return (Tick)0; diff --git a/cde/programs/dtcm/server/repeat.c b/cde/programs/dtcm/server/repeat.c index ac3b15cae..c58d333f3 100644 --- a/cde/programs/dtcm/server/repeat.c +++ b/cde/programs/dtcm/server/repeat.c @@ -339,6 +339,9 @@ _DtCms_closest_tick_v4(time_t target, time_t ftick, Period_4 period, int *ordina struct tm tm1, tm2; _Xltimeparams localtime_buf; + tm1.tm_isdst = 0; + tm2.tm_isdst = 0; + if (target <= ftick) { *ordinal = 1; return(ftick); diff --git a/cde/programs/dtcm/server/reprevtick.c b/cde/programs/dtcm/server/reprevtick.c index c62bd8ded..458c8925d 100644 --- a/cde/programs/dtcm/server/reprevtick.c +++ b/cde/programs/dtcm/server/reprevtick.c @@ -89,7 +89,7 @@ PrevTick( RepeatEvent *re, RepeatEventState *res) { - Tick next_time; + Tick next_time = 0; Tick _start_time; if (!re) return (Tick)0;