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

dtappbuilder: Coverity fixes mostly related to uninitialised variables

Browse source
This commit is contained in:
Peter Howkins 2018-05-01 19:02:14 +01:00
parent 48b97a4c41
commit ad373101d6
18 changed files with 75 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -722,7 +722,7 @@ ab_update_stat_region(
static Widget obj_size = NULL; static Widget obj_size = NULL;
static Widget curs_pos = NULL; static Widget curs_pos = NULL;
static Widget cur_module = NULL; static Widget cur_module = NULL;
Widget widget; Widget widget = NULL;
String nullstr = " "; String nullstr = " ";
switch(type) switch(type)

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

@ -2139,7 +2139,7 @@ abobj_set_pattern_type(
) )
{ {
ABObj subObj; ABObj subObj;
unsigned char value; unsigned char value = 0;
AB_FILE_TYPE_MASK old_fmtype = obj_get_file_type_mask(obj); AB_FILE_TYPE_MASK old_fmtype = obj_get_file_type_mask(obj);
if (old_fmtype != fmtype) if (old_fmtype != fmtype)

33
cde/programs/dtappbuilder/src/ab/attch_ed_stubs.c
View file

@ -1567,11 +1567,11 @@ create_obj_menu_dir(
{ {
DtbAttchEdAttchEdDialogInfo attch_ed_cgen = &dtb_attch_ed_attch_ed_dialog; DtbAttchEdAttchEdDialogInfo attch_ed_cgen = &dtb_attch_ed_attch_ed_dialog;
AttchEditorSettingsRec *ats = &attch_editor_settings_rec; AttchEditorSettingsRec *ats = &attch_editor_settings_rec;
PropOptionsSetting option_setting; PropOptionsSetting option_setting = NULL;
Widget label = NULL, Widget label = NULL,
optionbox, optionbox = NULL,
menu, menu = NULL,
changebar, changebar = NULL,
*item = NULL; *item = NULL;
int item_values = 0, int item_values = 0,
*item_val = NULL, *item_val = NULL,
@ -3090,15 +3090,15 @@ change_opp_attach_type(
int offset = 0, int offset = 0,
position = 0; position = 0;
ABObj attach_obj = NULL; ABObj attach_obj = NULL;
AB_COMPASS_POINT opp_dir; AB_COMPASS_POINT opp_dir = AB_CP_UNDEF;
ATTCH_ED_ATTACH_TYPE opp_attach_type; ATTCH_ED_ATTACH_TYPE opp_attach_type;
PropOptionsSetting opp_attach_type_setting, PropOptionsSetting opp_attach_type_setting = NULL,
opp_objlist_setting; opp_objlist_setting = NULL;
PropFieldSetting opp_offset_setting, PropFieldSetting opp_offset_setting = NULL,
opp_position_setting; opp_position_setting = NULL;
Widget opp_objlist_w, Widget opp_objlist_w = NULL,
opp_offset_w, opp_offset_w = NULL,
opp_position_w; opp_position_w = NULL;
BOOL set_opp_attach = FALSE; BOOL set_opp_attach = FALSE;
/* /*
@ -3279,10 +3279,10 @@ attach_obj_changed(
DtbAttchEdAttchEdDialogInfo attch_ed_cgen DtbAttchEdAttchEdDialogInfo attch_ed_cgen
= &dtb_attch_ed_attch_ed_dialog; = &dtb_attch_ed_attch_ed_dialog;
AttchEditorSettingsRec *ats = &attch_editor_settings_rec; AttchEditorSettingsRec *ats = &attch_editor_settings_rec;
PropFieldSetting offset_setting, PropFieldSetting offset_setting = NULL,
position_setting; position_setting;
PropOptionsSetting objlist_setting, PropOptionsSetting objlist_setting = NULL,
attach_type_setting; attach_type_setting = NULL;
AB_COMPASS_POINT dir = (AB_COMPASS_POINT)client_data; AB_COMPASS_POINT dir = (AB_COMPASS_POINT)client_data;
ATTCH_ED_ATTACH_TYPE attach_type = ATTCH_ED_NONE; ATTCH_ED_ATTACH_TYPE attach_type = ATTCH_ED_NONE;
ABObj attach_obj = NULL; ABObj attach_obj = NULL;
@ -3324,6 +3324,9 @@ attach_obj_changed(
objlist_setting = &(ats->bottom_attach_obj); objlist_setting = &(ats->bottom_attach_obj);
break; break;
default:
return;
} }
attach_type = (ATTCH_ED_ATTACH_TYPE)prop_options_get_value(attach_type_setting); attach_type = (ATTCH_ED_ATTACH_TYPE)prop_options_get_value(attach_type_setting);

5
cde/programs/dtappbuilder/src/ab/brws.c
View file

@ -1751,7 +1751,7 @@ destroy_browser_ui_handles(
) )
{ {
BrowserUiObjects *ui; BrowserUiObjects *ui;
DtbBrwsMainwindowInfo instance; DtbBrwsMainwindowInfo instance = NULL;
if (!b) if (!b)
return; return;
@ -1811,8 +1811,7 @@ destroy_browser_ui_handles(
/* /*
* Free the ip structure * Free the ip structure
*/ */
if (instance) free(instance);
free(instance);
} }

47
cde/programs/dtappbuilder/src/ab/conn_stubs.c
View file

@ -1121,7 +1121,7 @@ select_connection(
{ {
XmListCallbackStruct *list_cl = (XmListCallbackStruct *)call_data; XmListCallbackStruct *list_cl = (XmListCallbackStruct *)call_data;
ABObj *obj_list = (ABObj *)NULL; ABObj *obj_list = (ABObj *)NULL;
ABObj cur_action; ABObj cur_action = NULL;
AB_ACTION_INFO *cur_info; AB_ACTION_INFO *cur_info;
if (list_cl->reason != XmCR_BROWSE_SELECT) if (list_cl->reason != XmCR_BROWSE_SELECT)
@ -1353,19 +1353,20 @@ get_cur_when(
{ {
Widget label_wid = XmOptionButtonGadget(when_menu); Widget label_wid = XmOptionButtonGadget(when_menu);
XmString xm_when_label = (XmString)NULL; XmString xm_when_label = (XmString)NULL;
char *when_label; char *when_label = NULL;
register int i; register int i;
XtVaGetValues(label_wid, XmNlabelString, &xm_when_label, NULL); XtVaGetValues(label_wid, XmNlabelString, &xm_when_label, NULL);
if (xm_when_label != NULL) if (xm_when_label != NULL) {
when_label = objxm_xmstr_to_str(xm_when_label); when_label = objxm_xmstr_to_str(xm_when_label);
for (i = 0; i < ConnP_num_conn_whens; i++) for (i = 0; i < ConnP_num_conn_whens; i++) {
if (!strcmp(when_label, ConnP_conn_whens[i].label)) if (!strcmp(when_label, ConnP_conn_whens[i].label)) {
{ XtFree(when_label);
XtFree(when_label); return((int)ConnP_conn_whens[i].when_type);
return((int)ConnP_conn_whens[i].when_type); }
} }
}
/* /*
* Should never happen * Should never happen
@ -1381,19 +1382,20 @@ get_cur_act(
{ {
Widget label_wid = XmOptionButtonGadget(action_menu); Widget label_wid = XmOptionButtonGadget(action_menu);
XmString xm_act_label = (XmString)NULL; XmString xm_act_label = (XmString)NULL;
char *act_label; char *act_label = NULL;
register int i; register int i;
XtVaGetValues(label_wid, XmNlabelString, &xm_act_label, NULL); XtVaGetValues(label_wid, XmNlabelString, &xm_act_label, NULL);
if (xm_act_label != NULL) if (xm_act_label != NULL) {
act_label = objxm_xmstr_to_str(xm_act_label); act_label = objxm_xmstr_to_str(xm_act_label);
for (i = 0; i < ConnP_num_conn_acts; i++) for (i = 0; i < ConnP_num_conn_acts; i++) {
if (!strcmp(act_label, ConnP_conn_acts[i].label)) if (!strcmp(act_label, ConnP_conn_acts[i].label)) {
{ XtFree(act_label);
XtFree(act_label); return(ConnP_conn_acts[i].act_type);
return(ConnP_conn_acts[i].act_type); }
} }
}
/* /*
* Should never happen * Should never happen
@ -3870,17 +3872,20 @@ get_cur_func_type(void)
{ {
Widget label_wid = XmOptionButtonGadget(action_type_opmenu); Widget label_wid = XmOptionButtonGadget(action_type_opmenu);
XmString xm_act_label = (XmString)NULL; XmString xm_act_label = (XmString)NULL;
char *act_label; char *act_label = NULL;
register int i; register int i;
AB_FUNC_TYPE func_type = AB_FUNC_UNDEF; AB_FUNC_TYPE func_type = AB_FUNC_UNDEF;
XtVaGetValues(label_wid, XmNlabelString, &xm_act_label, NULL); XtVaGetValues(label_wid, XmNlabelString, &xm_act_label, NULL);
if (xm_act_label != NULL) if (xm_act_label != NULL) {
act_label = objxm_xmstr_to_str(xm_act_label); act_label = objxm_xmstr_to_str(xm_act_label);
for (i = 0; i < ACTION_TYPE_NUM_VALUES; i++) for (i = 0; i < ACTION_TYPE_NUM_VALUES; i++) {
if (!strcmp(act_label, action_type_labels[i])) if (!strcmp(act_label, action_type_labels[i])) {
break; break;
}
}
}
switch (i) switch (i)
{ {

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

@ -1925,7 +1925,7 @@ msgEdP_show_msgCB(
ABObj project = obj_get_project(mes->current_obj); ABObj project = obj_get_project(mes->current_obj);
STRING str = (STRING) NULL; STRING str = (STRING) NULL;
DTB_BUTTON default_btn = DTB_NONE; DTB_BUTTON default_btn = DTB_NONE;
unsigned char dialogType; unsigned char dialogType = 0;
/*** DTB_USER_CODE_END ^^^ Add C variables and code above ^^^ ***/ /*** DTB_USER_CODE_END ^^^ Add C variables and code above ^^^ ***/

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

@ -427,7 +427,7 @@ drawp_prop_load(
) )
{ {
PropDrawpSettingsRec *pds = &(prop_drawp_settings_rec[type]); PropDrawpSettingsRec *pds = &(prop_drawp_settings_rec[type]);
AB_SCROLLBAR_POLICY sb_policy; AB_SCROLLBAR_POLICY sb_policy = AB_SCROLLBAR_UNDEF;
BOOL load_all = (loadkey & LoadAll); BOOL load_all = (loadkey & LoadAll);
if (obj == NULL) if (obj == NULL)

4
cde/programs/dtappbuilder/src/ab/prop.c
View file

@ -525,7 +525,7 @@ prop_load_obj(
{ {
PalItemInfo *palitem; PalItemInfo *palitem;
PalItemInfo *viz_palitem; PalItemInfo *viz_palitem;
Widget dialog; Widget dialog = NULL;
PropStateInfo *pstate; PropStateInfo *pstate;
STRING modname = NULL; STRING modname = NULL;
@ -3819,7 +3819,7 @@ close_propsCB(
) )
{ {
AB_PROP_TYPE type = (AB_PROP_TYPE)client_data; AB_PROP_TYPE type = (AB_PROP_TYPE)client_data;
DTB_MODAL_ANSWER answer; DTB_MODAL_ANSWER answer = DTB_ANSWER_NONE;
PalItemInfo *palitem = NULL; PalItemInfo *palitem = NULL;
PropStateInfo *pstate; PropStateInfo *pstate;
WidgetList shell_child; WidgetList shell_child;

4
cde/programs/dtappbuilder/src/ab/prop_items.c
View file

@ -679,7 +679,7 @@ prop_item_change(
) )
{ {
ABObj current_obj; ABObj current_obj;
STRING newlabel, basename, graphic_path; STRING newlabel = NULL, basename = NULL, graphic_path;
BOOL label_type_chg = False; BOOL label_type_chg = False;
AB_LABEL_TYPE new_label_type; AB_LABEL_TYPE new_label_type;
XmString xmitem; XmString xmitem;
@ -902,7 +902,7 @@ prop_item_insert(
*new_iobj_list; *new_iobj_list;
int num_items; int num_items;
int select_pos; int select_pos;
int pos; int pos = 0;
int i, j; int i, j;
XtVaGetValues(pis->item_list, XtVaGetValues(pis->item_list,

4
cde/programs/dtappbuilder/src/ab/ui_util.c
View file

@ -530,7 +530,7 @@ ui_build_menu(
) )
{ {
Widget menu, Widget menu,
cascade, cascade = NULL,
widget; widget;
Arg args[4]; Arg args[4];
int i; int i;
@ -1647,7 +1647,7 @@ ui_obj_set_label_string(
Widget parent = objxm_get_widget(p_obj); Widget parent = objxm_get_widget(p_obj);
AB_ITEM_TYPE itype = (AB_ITEM_TYPE)obj_get_subtype(obj); AB_ITEM_TYPE itype = (AB_ITEM_TYPE)obj_get_subtype(obj);
int pos; int pos;
int num_items; int num_items = 0;
XmString xmitem; XmString xmitem;
if (parent != NULL) if (parent != NULL)

2
cde/programs/dtappbuilder/src/abmf/utils.c
View file

@ -348,7 +348,7 @@ find_longest_label(STRING * label)
{ {
int len1, int len1,
len2, len2,
longest, longest = 0,
i = 0; i = 0;
len1 = len2 = 0; len1 = len2 = 0;

4
cde/programs/dtappbuilder/src/libABil/abuil_load.c
View file

@ -340,7 +340,7 @@ root_into_project(
{ {
sym_root_entry_type *root_node; sym_root_entry_type *root_node;
ABObjPtr ab_module; ABObjPtr ab_module;
ABObjPtr ret_val; ABObjPtr ret_val = NULL;
if (uil_root == (sym_entry_type *)NULL || if (uil_root == (sym_entry_type *)NULL ||
uil_root->header.b_tag != sym_k_root_entry) uil_root->header.b_tag != sym_k_root_entry)
@ -424,7 +424,7 @@ sections_into_module(
sym_entry_type *next_node; sym_entry_type *next_node;
sym_section_entry_type *section_node; sym_section_entry_type *section_node;
short int done; short int done;
ABObjPtr ret_val; ABObjPtr ret_val = NULL;
/* /*
* populate module; * populate module;

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

@ -3355,7 +3355,7 @@ attach_context_store(
{ {
AttachmentContext *attach_context = (AttachmentContext *)context; AttachmentContext *attach_context = (AttachmentContext *)context;
STRING attach_str; STRING attach_str;
AB_ATTACH_TYPE att_type; AB_ATTACH_TYPE att_type = AB_ATTACH_UNDEF;
long att_pos = 0, att_off = 0, offset = 0; long att_pos = 0, att_off = 0, offset = 0;
void *value = NULL; void *value = NULL;
BOOL need_val = TRUE; BOOL need_val = TRUE;

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

@ -267,7 +267,7 @@ bilP_label_style_to_token(AB_LABEL_STYLE type)
AB_LABEL_STYLE AB_LABEL_STYLE
bilP_token_to_label_style(int type) bilP_token_to_label_style(int type)
{ {
AB_LABEL_STYLE obj_type; AB_LABEL_STYLE obj_type = AB_STYLE_UNDEF;
switch (type) switch (type)
{ {

12
cde/programs/dtappbuilder/src/libABil/bil_loadatt.c
View file

@ -979,7 +979,7 @@ STRING
bilP_load_att_hspacing(BIL_TOKEN valueToken) bilP_load_att_hspacing(BIL_TOKEN valueToken)
{ {
ABObj obj = bilP_load.obj; ABObj obj = bilP_load.obj;
int tmp_int; int tmp_int = 0;
int type; int type;
nset_att(AB_BIL_HSPACING); nset_att(AB_BIL_HSPACING);
@ -1000,7 +1000,7 @@ STRING
bilP_load_att_hoffset(BIL_TOKEN valueToken) bilP_load_att_hoffset(BIL_TOKEN valueToken)
{ {
ABObj obj = bilP_load.obj; ABObj obj = bilP_load.obj;
int tmp_int; int tmp_int = 0;
int type; int type;
set_att(":hoffset"); set_att(":hoffset");
@ -1688,7 +1688,7 @@ STRING
bilP_load_att_max_length(BIL_TOKEN valueToken) bilP_load_att_max_length(BIL_TOKEN valueToken)
{ {
ABObj obj = bilP_load.obj; ABObj obj = bilP_load.obj;
int tmp_int; int tmp_int = 0;
int type; int type;
set_att(":max-length"); set_att(":max-length");
@ -1710,7 +1710,7 @@ bilP_load_att_tear_off(BIL_TOKEN valueToken)
ABObj obj = bilP_load.obj; ABObj obj = bilP_load.obj;
int type = AB_BIL_UNDEF; int type = AB_BIL_UNDEF;
STRING value = NULL; STRING value = NULL;
BOOL tear_off; BOOL tear_off = FALSE;
set_att(":tear-off"); set_att(":tear-off");
if (!bilP_token_is_bool(valueToken)) if (!bilP_token_is_bool(valueToken))
@ -1855,7 +1855,7 @@ STRING
bilP_load_att_voffset(BIL_TOKEN valueToken) bilP_load_att_voffset(BIL_TOKEN valueToken)
{ {
ABObj obj = bilP_load.obj; ABObj obj = bilP_load.obj;
int tmp_int; int tmp_int = 0;
int type; int type;
set_att(":voffset"); set_att(":voffset");
@ -1908,7 +1908,7 @@ STRING
bilP_load_att_vspacing(BIL_TOKEN valueToken) bilP_load_att_vspacing(BIL_TOKEN valueToken)
{ {
ABObj obj = bilP_load.obj; ABObj obj = bilP_load.obj;
int tmp_int; int tmp_int = 0;
int type; int type;
set_att(":vspacing"); set_att(":vspacing");

4
cde/programs/dtappbuilder/src/libABobj/obj_fields.c
View file

@ -2992,7 +2992,7 @@ obj_set_attachment(
int offset int offset
) )
{ {
ABAttachment *attachment; ABAttachment *attachment = NULL;
verify_for_write(obj); verify_for_write(obj);
if (obj->attachments == NULL) if (obj->attachments == NULL)
@ -3012,6 +3012,8 @@ obj_set_attachment(
case AB_CP_EAST: case AB_CP_EAST:
attachment = &(obj->attachments->east); attachment = &(obj->attachments->east);
break; break;
default:
return 0;
} }
attachment->type = type; attachment->type = type;
attachment->value = value; attachment->value = value;

2
cde/programs/dtappbuilder/src/libABobjXm/objxm_args.c
View file

@ -1629,6 +1629,8 @@ objxmP_set_attachment_arg(
att_offset_resource = XmNbottomOffset; att_offset_resource = XmNbottomOffset;
att_pos_resource = XmNbottomPosition; att_pos_resource = XmNbottomPosition;
break; break;
default:
return OK;
} }
type = obj_get_attach_type(obj, dir); type = obj_get_attach_type(obj, dir);
value = obj_get_attach_value(obj, dir); value = obj_get_attach_value(obj, dir);

4
cde/programs/dtappbuilder/src/libABobjXm/objxm_config.c
View file

@ -411,7 +411,7 @@ config_attachment(
) )
{ {
ABObj attobj; ABObj attobj;
ABAttachment *attachment; ABAttachment *attachment = NULL;
switch(dir) switch(dir)
{ {
@ -427,6 +427,8 @@ config_attachment(
case AB_CP_SOUTH: case AB_CP_SOUTH:
attachment = &(obj->attachments->south); attachment = &(obj->attachments->south);
break; break;
default:
return;
} }
if (attachment->type == AB_ATTACH_OBJ) if (attachment->type == AB_ATTACH_OBJ)
{ {