dtappbuilder: Change to ANSI function definitions

This commit is contained in:
Peter Howkins
2018-06-28 04:08:35 +01:00
parent 6478653e18
commit bb7ac1f24e
41 changed files with 170 additions and 239 deletions

View File

@@ -307,8 +307,7 @@ ab_position_window(
}
BOOL
ab_window_leader_iconified(
)
ab_window_leader_iconified(void)
{
return(AB_win_leader->state & WindowIconified);
}
@@ -677,15 +676,13 @@ set_windows_visibility(
}
void
ab_takedown_windows(
)
ab_takedown_windows(void)
{
set_windows_visibility(False);
}
void
ab_putback_windows(
)
ab_putback_windows(void)
{
set_windows_visibility(True);
}
@@ -1222,7 +1219,7 @@ ab_palette_set_active(
}
void
ab_exit_dtbuilder()
ab_exit_dtbuilder(void)
{
static DTB_MODAL_ANSWER answer;
XtAppContext app;

View File

@@ -226,8 +226,7 @@ BOOL in_undo = FALSE;
* Called from main()...
*/
void
abobj_edit_init(
)
abobj_edit_init(void)
{
obj_add_destroy_callback(edit_destroyOCB, "ATTCH_ED");
}
@@ -401,8 +400,7 @@ edit_destroyOCB(
* Initializes the clipboard
*/
static void
init_clipboard(
)
init_clipboard(void)
{
if (!ABClipboard)
{
@@ -1452,8 +1450,7 @@ init_undo_rec(
* Initializes undo buffer
*/
static void
init_undo(
)
init_undo(void)
{
init_undo_rec(&ABUndo);
}
@@ -2124,8 +2121,7 @@ clear_undo_rec(
*/
int
abobj_cut(
)
abobj_cut(void)
{
ABObj project = proj_get_project();
ABObj newObj = NULL;
@@ -2171,8 +2167,7 @@ abobj_cut(
}
int
abobj_copy(
)
abobj_copy(void)
{
ABObj project = proj_get_project(),
newObj;
@@ -2807,8 +2802,7 @@ abobj_paste(
}
int
abobj_delete(
)
abobj_delete(void)
{
ABObj project = proj_get_project(),
parent = NULL;
@@ -2862,8 +2856,7 @@ abobj_delete(
}
int
abobj_undo(
)
abobj_undo(void)
{
int iRet = 0;
@@ -2929,16 +2922,14 @@ abobj_set_undo(
}
int
abobj_cancel_undo(
)
abobj_cancel_undo(void)
{
clear_undo_rec(&ABUndo);
return 0;
}
BOOL
abobj_undo_active(
)
abobj_undo_active(void)
{
BOOL i;
@@ -2956,8 +2947,7 @@ abobj_undo_active(
* Is clipboard empty ?
*/
BOOL
abobj_clipboard_is_empty(
)
abobj_clipboard_is_empty(void)
{
return(!ABClipboard || (ABClipboard->count == 0));
}
@@ -2990,8 +2980,7 @@ abobj_in_clipboard(
* Clears the clipboard
*/
void
abobj_clipboard_clear(
)
abobj_clipboard_clear(void)
{
int i;

View File

@@ -1200,8 +1200,7 @@ abobj_set_menu_item_state(
}
void
abobj_strings_init(
)
abobj_strings_init(void)
{
char *props_str;
char *undo_str;

View File

@@ -2112,22 +2112,19 @@ abobj_set_save_needed(
}
void
abobj_disable_save_needed(
)
abobj_disable_save_needed(void)
{
save_needed_enabled = FALSE;
}
void
abobj_enable_save_needed(
)
abobj_enable_save_needed(void)
{
save_needed_enabled = TRUE;
}
BOOL
abobj_save_needed_enabled(
)
abobj_save_needed_enabled(void)
{
return (save_needed_enabled);
}

View File

@@ -531,8 +531,7 @@ appfw_editor_apply(
}
static void
turnoff_changebars(
)
turnoff_changebars(void)
{
prop_set_changebar(afs->vendor.changebar, PROP_CB_OFF);
@@ -621,8 +620,7 @@ obj_destroyedOCB(
* the Application Framework Editor
*/
static BOOL
appfw_editor_pending(
)
appfw_editor_pending(void)
{
if (afs && prop_changebars_pending(afs->prop_sheet))
return TRUE;

View File

@@ -387,8 +387,7 @@ attch_ed_get_parent(
}
void
attch_ed_init(
)
attch_ed_init(void)
{
obj_add_destroy_callback(attch_obj_destroyCB, "ATTCH_ED");
obj_add_reparent_callback(attch_obj_reparentCB, "ATTCH_ED");
@@ -1189,8 +1188,7 @@ attch_editor_apply(
}
static BOOL
attch_edP_pending(
)
attch_edP_pending(void)
{
AttchEditorSettingsRec *ats = &attch_editor_settings_rec;
@@ -1218,8 +1216,7 @@ attch_editor_activate(
}
static void
turnoff_changebars(
)
turnoff_changebars(void)
{
AttchEditorSettingsRec *ats = &attch_editor_settings_rec;
@@ -3345,8 +3342,7 @@ attach_obj_changed(
static void
attch_ed_view_child_attachments(
)
attch_ed_view_child_attachments(void)
{
AttchEditorSettingsRec *ats = &attch_editor_settings_rec;
ABObj cur_obj,
@@ -3377,8 +3373,7 @@ attch_ed_view_child_attachments(
static void
attch_ed_view_parent_attachments(
)
attch_ed_view_parent_attachments(void)
{
AttchEditorSettingsRec *ats = &attch_editor_settings_rec;
ABObj cur_obj,
@@ -3410,8 +3405,7 @@ attch_ed_view_parent_attachments(
}
static void
attch_ed_activate_parent_child_button(
)
attch_ed_activate_parent_child_button(void)
{
AttchEditorSettingsRec *ats = &attch_editor_settings_rec;
DtbAttchEdAttchEdDialogInfo attch_ed_cgen
@@ -3663,8 +3657,7 @@ print_attach_type(
}
static BOOL
attch_ed_verify_props(
)
attch_ed_verify_props(void)
{
AttchEditorSettingsRec *ats = &attch_editor_settings_rec;
ATTCH_ED_ATTACH_TYPE attach_type = ATTCH_ED_NONE;

View File

@@ -1591,10 +1591,7 @@ brws_delete_objects
/*
* create_browser_window - creates a new browser main window
*/
ABBrowser
brws_create
(
)
ABBrowser brws_create(void)
{
ABBrowser b;
@@ -2160,7 +2157,7 @@ aob_proj_init_state
* Initialize the object browser.
*/
static ABBrowser
create_browser_struct()
create_browser_struct(void)
{
ABBrowser b;
@@ -2290,10 +2287,7 @@ draw_viewer(Viewer *v)
/*
* Create (malloc) structure to hold browser UI objects
*/
BrowserUiObj
aob_create_ui_obj
(
)
BrowserUiObj aob_create_ui_obj(void)
{
BrowserUiObj ui;
@@ -2317,9 +2311,7 @@ aob_create_ui_obj
* Create (malloc) structure to hold browser properties
*/
static BrowserProps
aob_create_props
(
)
aob_create_props(void)
{
BrowserProps props;
@@ -2952,8 +2944,7 @@ brws_show_browser(
}
void
brws_init(
)
brws_init(void)
{
obj_add_rename_callback(brwsP_obj_renameOCB, "BRWS");
obj_add_destroy_callback(brwsP_obj_destroyOCB, "BRWS");

View File

@@ -452,7 +452,7 @@ cgen_notify_new_directory(STRING dir)
int
cgen_abort()
cgen_abort(void)
{
public_entry_point();
return cgenP_abort();
@@ -501,8 +501,7 @@ cgenP_init_props_module_list(
* Add callbacks for object rename & destroy
*/
void
cgenP_prop_init(
)
cgenP_prop_init(void)
{
obj_add_rename_callback(obj_renamedOCB, "cgen_prop_init");
obj_add_update_callback(obj_updateOCB, "cgen_prop_init");
@@ -584,7 +583,7 @@ print_to_term(STRING msg)
* Sends stdout and stderr to term window
*/
static int
send_output_to_term()
send_output_to_term(void)
{
static BOOL done = FALSE;
int rc = 0;
@@ -859,7 +858,7 @@ term_execute_command(CG_SUBCOMMAND cmd_code, STRING cmd, STRING argv[])
* Gets the slave device name and puts it into the file variable
*/
static int
get_slave_device_name()
get_slave_device_name(void)
{
String deviceName = NULL;
@@ -889,7 +888,7 @@ get_slave_device_name()
*************************************************************************/
static int
exec_generate_code()
exec_generate_code(void)
{
ABObj project= proj_get_project();
STRING project_name= NULL;
@@ -929,7 +928,7 @@ exec_generate_code()
}
static int
exec_generate_main()
exec_generate_main(void)
{
int rc = 0; /* return code */
ABObj project= proj_get_project();
@@ -967,7 +966,7 @@ exec_generate_main()
}
static int
exec_generate_proj()
exec_generate_proj(void)
{
int rc = 0; /* return code */
ABObj project= proj_get_project();
@@ -1004,7 +1003,7 @@ exec_generate_proj()
}
static int
exec_generate_specific_files()
exec_generate_specific_files(void)
{
int returnValue = 0;
int rc = 0; /* return code */
@@ -1055,7 +1054,7 @@ epilogue:
}
static int
exec_generate_specific_files_and_main()
exec_generate_specific_files_and_main(void)
{
int returnValue = 0;
int rc = 0; /* return code */
@@ -1172,7 +1171,7 @@ epilogue:
static int
exec_make()
exec_make(void)
{
int rc = 0; /* return code */
STRING cmd = NULL;
@@ -1200,7 +1199,7 @@ exec_make()
static int
exec_run()
exec_run(void)
{
ABObj project= NULL;
char executable_name[1024];
@@ -1373,7 +1372,7 @@ exec_next_command_for_build_and_run(CG_SUBCOMMAND cmd_code, int exit_code)
static int
exec_first_build_and_run_command()
exec_first_build_and_run_command(void)
{
int return_value= 0;
if (!util_file_exists("Makefile"))
@@ -1470,7 +1469,7 @@ subprocess_exit(int exit_code)
static int
print_internal_err_message()
print_internal_err_message(void)
{
print_to_term("****> UNSUCCESSFUL (Internal failure occurred).\n");
return 0;
@@ -1492,7 +1491,7 @@ print_failure_message(CG_SUBCOMMAND cmd_code, int exit_code)
static int
print_success_message()
print_success_message(void)
{
print_to_term("====> Completed successfully.\n");
user_goal= CG_GOAL_UNDEF;
@@ -1545,7 +1544,7 @@ print_exit_message(int exitCode)
static int
print_abort_message()
print_abort_message(void)
{
print_to_term("\n====> Command aborted.\n");
user_goal= CG_GOAL_UNDEF;
@@ -1659,7 +1658,7 @@ epilogue:
* We are running a process - desensitize most buttons.
*/
static int
goto_busy_state()
goto_busy_state(void)
{
XtSetSensitive(abort_button, True);
XtSetSensitive(abort_item, True);
@@ -1681,7 +1680,7 @@ goto_busy_state()
* We are waiting for user input
*/
static int
goto_ready_state()
goto_ready_state(void)
{
XtSetSensitive(abort_button, False);
XtSetSensitive(abort_item, False);
@@ -2135,8 +2134,7 @@ obj_updateOCB(
}
int
cgenP_sync_up_dir(
)
cgenP_sync_up_dir(void)
{
STRING cmd = NULL;
STRING request_dir = NULL;
@@ -2289,7 +2287,7 @@ save_done_cb(int status)
static int
check_path()
check_path(void)
{
int return_value = 0;
int rc = 0; /* return code */
@@ -2688,7 +2686,7 @@ epilogue:
static int
destroy_makefile()
destroy_makefile(void)
{
destroy_links_to_file("makefile");
destroy_links_to_file("Makefile");

View File

@@ -140,8 +140,7 @@ static Widget CacheAnchor; /* Dummy widget used to control caching of color
objxm_name_to_pixel (via XtConvertAndStore). */
char *
display_color_chooser(
)
display_color_chooser(void)
{
extern Widget AB_toplevel;
static int first_time = 1;
@@ -187,8 +186,7 @@ display_color_chooser(
}
void
create_color_chooser(
)
create_color_chooser(void)
{
extern Widget AB_toplevel;
XmString label;

View File

@@ -856,8 +856,7 @@ conn_set_source(
}
extern ABObj
connP_get_source(
)
connP_get_source(void)
{
return cur_source;
}
@@ -882,8 +881,7 @@ conn_set_target(
}
extern ABObj
connP_get_target(
)
connP_get_target(void)
{
return cur_target;
}
@@ -1521,8 +1519,7 @@ connP_make_help_vol_conn(
* Initializes strings used in connections editor
*/
extern void
conn_strings_init(
)
conn_strings_init(void)
{
unknown_str =
XtNewString(catgets(Dtb_project_catd, 100, 158, "??unknown??"));

View File

@@ -297,8 +297,7 @@ static void set_ctrls_for_target(
extern void
conn_init(
)
conn_init(void)
{
conn_strings_init();
@@ -1883,7 +1882,7 @@ connP_update_on_show_status(
BOOL
connP_conn_is_possible()
connP_conn_is_possible(void)
{
BOOL ConnIsPossible = FALSE;
ABObj source = NULL,

View File

@@ -186,8 +186,7 @@ static DndEditorSettingsRec dndEdInfo;
*/
void
dnd_ed_show_dialog(
)
dnd_ed_show_dialog(void)
{
/* If there is no DragAndDrop Editor, create it */
if (AB_dnd_dialog == (Widget)NULL)
@@ -540,8 +539,7 @@ dnd_ed_editor_apply(void)
static void
dnd_turnoff_changebars(
)
dnd_turnoff_changebars(void)
{
DndEditorSettings dds = &dndEdInfo;
prop_set_changebar(dds->drag_ops_checkbox.changebar,PROP_CB_OFF);
@@ -720,8 +718,7 @@ do_auto_apply(
static void
clear_editor_fields(
)
clear_editor_fields(void)
{
DndEditorSettingsRec *dds = &dndEdInfo;

View File

@@ -595,8 +595,7 @@ do_auto_apply(
}
static void
clear_editor_fields(
)
clear_editor_fields(void)
{
HelpEditorSettingsRec *hes = &Help_Editor_Settings_Rec;
@@ -982,7 +981,7 @@ help_dispatchCB(Widget widget, XtPointer clientData, XtPointer callData)
** apps built with App Builder will use as well.)
*/
static void
help_test_onitem_help()
help_test_onitem_help(void)
{
ABObj obj, root_obj, help_obj;
Widget target;
@@ -1183,7 +1182,7 @@ update_object_menu_from_obj(
** if there are no base or popup windows.
*/
static ABObj
find_toplevel_obj()
find_toplevel_obj(void)
{
ABObj obj, bwobj, pwobj, fcobj;
AB_TRAVERSAL trav;

View File

@@ -249,8 +249,7 @@ static void change_msg_moduleCB(
******************************************************************/
void
msgEd_show_dialog(
)
msgEd_show_dialog(void)
{
int numMods = 0;
ABObj current_module = proj_get_cur_module();
@@ -340,8 +339,7 @@ msgEd_show_dialog(
* Add callbacks for object rename & destroy
*/
static void
msgEdP_init(
)
msgEdP_init(void)
{
/*
* Initialize static strings used in message editor
@@ -521,8 +519,7 @@ msg_editor_init(
}
static int
msg_editor_clear(
)
msg_editor_clear(void)
{
MsgEditorSettingsRec *mes = &msg_editor_settings_rec;
int sel_pos = 0;
@@ -717,14 +714,13 @@ msg_editor_load(
static BOOL
msg_editor_pending(
)
msg_editor_pending(void)
{
return(prop_changebars_pending(msg_editor_settings_rec.prop_sheet));
}
static BOOL
verify_name()
verify_name(void)
{
BOOL retVal = TRUE;
MsgEditorSettingsRec *mes = &msg_editor_settings_rec;
@@ -739,8 +735,7 @@ verify_name()
}
static void
turnoff_changebars(
)
turnoff_changebars(void)
{
MsgEditorSettingsRec *mes = &msg_editor_settings_rec;
@@ -1610,7 +1605,7 @@ objlist_test_func(
static BOOL
verify_default_btn()
verify_default_btn(void)
{
MsgEditorSettingsRec *mes = &msg_editor_settings_rec;
AB_DEFAULT_BUTTON default_btn = AB_DEFAULT_BTN_UNDEF;
@@ -1679,7 +1674,7 @@ verify_default_btn()
}
static BOOL
verify_label()
verify_label(void)
{
MsgEditorSettingsRec *mes = &msg_editor_settings_rec;
BOOL validLabel = TRUE;
@@ -1731,7 +1726,7 @@ verify_label()
}
static BOOL
verify_buttons()
verify_buttons(void)
{
MsgEditorSettingsRec *mes = &msg_editor_settings_rec;
BOOL hasButtons = TRUE;
@@ -2555,8 +2550,7 @@ update_mod_opmenu(
}
static void
msgEdP_strings_init(
)
msgEdP_strings_init(void)
{
msgEd_strings[MSG_ED_RETRY_STR] =
XtNewString(catgets(Dtb_project_catd, 100, 202, "Retry"));

View File

@@ -843,7 +843,7 @@ typeCB(
* Object destroy callback
*/
static int
prop_choice_install_obj_destroy_CB()
prop_choice_install_obj_destroy_CB(void)
{
static BOOL callback_installed = False;

View File

@@ -736,7 +736,7 @@ turnoff_changebars(
}
static int
combobox_install_obj_destroy_CB()
combobox_install_obj_destroy_CB(void)
{
static BOOL callback_installed = False;

View File

@@ -312,8 +312,7 @@ PropGroupSettingsRec prop_group_settings_rec[AB_PROP_TYPE_NUM_VALUES];
* Create a group object out of the selected group of objects.
*/
void
abobj_group_selected_objects(
)
abobj_group_selected_objects(void)
{
ABObj project = proj_get_project();
ABObj obj;
@@ -429,8 +428,7 @@ group_objects(
* them after all groups have been ungrouped.
*/
void
abobj_ungroup_selected_objects(
)
abobj_ungroup_selected_objects(void)
{
ABObj project = proj_get_project();
ABSelectedRec sel;

View File

@@ -870,7 +870,7 @@ turnoff_changebars(
* Object destroy callback
*/
static int
prop_list_install_obj_destroy_CB()
prop_list_install_obj_destroy_CB(void)
{
static BOOL callback_installed = False;

View File

@@ -931,7 +931,7 @@ menu_editCB(
* Object destroy callback
*/
static int
prop_menu_install_obj_destroy_CB()
prop_menu_install_obj_destroy_CB(void)
{
static BOOL callback_installed = False;

View File

@@ -597,7 +597,7 @@ turnoff_changebars(
* Object destroy callback
*/
static int
prop_menubar_install_obj_destroy_CB()
prop_menubar_install_obj_destroy_CB(void)
{
static BOOL callback_installed = False;

View File

@@ -814,7 +814,7 @@ pw_obj_reparentedOCB(
}
static void
panedwinEdP_init()
panedwinEdP_init(void)
{
obj_add_reparent_callback(pw_obj_reparentedOCB, "panedwinEdP_init");
obj_add_rename_callback(pw_obj_renamedOCB, "panedwinEdP_init");
@@ -826,8 +826,7 @@ panedwinEdP_init()
* Create a paned window out of the selected group of objects.
*/
void
abobj_make_panedwin(
)
abobj_make_panedwin(void)
{
ABObj project = proj_get_project();
ABObj obj = (ABObj) NULL;
@@ -1076,8 +1075,7 @@ west_compare(
* paned window and delete the paned window object.
*/
void
abobj_unmake_panedwin(
)
abobj_unmake_panedwin(void)
{
ABObj project = proj_get_project();
ABObj pw_obj = NULL;

View File

@@ -916,7 +916,7 @@ setup_content_settings(
}
static int
spinbox_install_obj_destroy_CB()
spinbox_install_obj_destroy_CB(void)
{
static BOOL callback_installed = False;

View File

@@ -248,7 +248,7 @@ static int select_fn(
* Dialog shell.
*/
void
proj_show_dialog()
proj_show_dialog(void)
{
ABObj proj = proj_get_project();
BrowserUiObj ui;
@@ -320,7 +320,7 @@ projP_store_viewer(
* Create viewer data structure for project window
*/
static Vwr
create_proj_struct()
create_proj_struct(void)
{
Vwr v;
extern VMethods projP_methods;
@@ -893,8 +893,7 @@ mult_module_selected(
}
int
proj_init(
)
proj_init(void)
{
obj_add_rename_callback(projP_obj_renameOCB, "PROJ");
obj_add_destroy_callback(projP_obj_destroyOCB, "PROJ");
@@ -948,8 +947,7 @@ proj_set_project(
}
ABObj
proj_get_project(
)
proj_get_project(void)
{
return AB_project;
}
@@ -972,8 +970,7 @@ proj_set_cur_module(
}
ABObj
proj_get_cur_module(
)
proj_get_cur_module(void)
{
return AB_cur_module;
}

View File

@@ -1837,7 +1837,7 @@ proj_show_proj_dir(void)
}
void
proj_name_proj()
proj_name_proj(void)
{
STRING proj_name = NULL;
UI_MODAL_ANSWER answer = UI_ANSWER_NONE;

View File

@@ -4475,8 +4475,7 @@ obj_options_buildCB(
}
void
strings_init(
)
strings_init(void)
{
LabelForString =
XtNewString(catgets(Dtb_project_catd, 100, 215, "Label:"));

View File

@@ -823,9 +823,7 @@ ui_set_busy_cursor(
* Initialize object pixmaps
*/
static void
init_obj_pixmaps
(
)
init_obj_pixmaps(void)
{
Display *dpy;
Pixmap tmp;

View File

@@ -170,7 +170,7 @@ vwr_destroy_tree
}
VNode
vwr_create_node()
vwr_create_node(void)
{
VNode bnode;