hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=731d0bed5b9bfcd17223064874d71f7afcdd9e07
commit 731d0bed5b9bfcd17223064874d71f7afcdd9e07 Author: Hermet Park <[email protected]> Date: Fri Jul 1 18:58:26 2016 +0900 ++secure code. --- src/bin/base_gui.c | 46 +++++++++++------- src/bin/build_setting.c | 13 ++++-- src/bin/config_data.c | 90 ++++++++++++++++++++++++++++++++++++ src/bin/edc_navigator.c | 12 +++-- src/bin/file_browser.c | 12 ++--- src/bin/file_mgr.c | 21 ++++++++- src/bin/file_tab.c | 8 ++-- src/bin/globals.c | 6 ++- src/bin/goto.c | 10 +++- src/bin/help.c | 8 ++++ src/bin/live_edit.c | 5 ++ src/bin/menu.c | 20 ++++++++ src/bin/newfile.c | 108 +++++++++++++++++++++++-------------------- src/bin/panes.c | 34 +++++++++++--- src/bin/preference_setting.c | 11 +++-- src/bin/search.c | 10 +++- src/bin/setting.c | 8 ++-- src/bin/statusbar.c | 14 ++++++ src/bin/text_setting.c | 8 ++-- src/bin/tools.c | 26 +++++------ 20 files changed, 345 insertions(+), 125 deletions(-) diff --git a/src/bin/base_gui.c b/src/bin/base_gui.c index 8a61085..9875ab1 100644 --- a/src/bin/base_gui.c +++ b/src/bin/base_gui.c @@ -12,6 +12,8 @@ typedef struct base_s static base_data *g_bd = NULL; + + /*****************************************************************************/ /* Internal method implementation */ /*****************************************************************************/ @@ -50,7 +52,8 @@ void base_error_msg_set(const char *msg) { base_data *bd = g_bd; - assert(bd); + EINA_SAFETY_ON_NULL_RETURN(bd); + if (config_red_alert_get()) elm_object_signal_emit(bd->layout, "elm,state,alert,show", ""); console_text_set(bd->console, msg); @@ -62,7 +65,7 @@ void base_title_set(const char *path) { base_data *bd = g_bd; - assert(bd); + EINA_SAFETY_ON_NULL_RETURN(bd); char buf[PATH_MAX]; snprintf(buf, sizeof(buf), _("%s - Enventor"), path); elm_win_title_set(bd->win, buf); @@ -72,7 +75,7 @@ void base_statusbar_toggle(Eina_Bool toggle) { base_data *bd = g_bd; - assert(bd); + EINA_SAFETY_ON_NULL_RETURN(bd); if (toggle) config_stats_bar_set(!config_stats_bar_get()); @@ -86,7 +89,7 @@ void base_file_tab_toggle(Eina_Bool toggle) { base_data *bd = g_bd; - assert(bd); + EINA_SAFETY_ON_NULL_RETURN(bd); if (toggle) config_file_tab_set(!config_file_tab_get()); @@ -105,7 +108,7 @@ base_file_tab_toggle(Eina_Bool toggle) void base_file_browser_toggle(Eina_Bool toggle) { base_data *bd = g_bd; - assert(bd); + EINA_SAFETY_ON_NULL_RETURN(bd); if (toggle) config_file_browser_set(!config_file_browser_get()); @@ -124,7 +127,7 @@ void base_edc_navigator_deselect(void) void base_edc_navigator_toggle(Eina_Bool toggle) { base_data *bd = g_bd; - assert(bd); + EINA_SAFETY_ON_NULL_RETURN(bd); if (toggle) config_edc_navigator_set(!config_edc_navigator_get()); @@ -157,7 +160,8 @@ Evas_Object * base_win_get(void) { base_data *bd = g_bd; - assert(bd && bd->win); + EINA_SAFETY_ON_NULL_RETURN_VAL(bd, NULL); + return bd->win; } @@ -165,7 +169,8 @@ Evas_Object * base_layout_get(void) { base_data *bd = g_bd; - assert(bd && bd->layout); + EINA_SAFETY_ON_NULL_RETURN_VAL(bd, NULL); + return bd->layout; } @@ -173,7 +178,8 @@ void base_win_resize_object_add(Evas_Object *resize_obj) { base_data *bd = g_bd; - assert(bd); + EINA_SAFETY_ON_NULL_RETURN(bd); + elm_win_resize_object_add(bd->win, resize_obj); } @@ -233,7 +239,7 @@ void base_console_auto_hide(void) { base_data *bd = g_bd; - assert(bd); + EINA_SAFETY_ON_NULL_RETURN(bd);; if (!config_console_get()) return; if (bd->console_msg) return; @@ -260,7 +266,7 @@ void base_gui_term(void) { base_data *bd = g_bd; - if (!bd) return; + EINA_SAFETY_ON_NULL_RETURN(bd); ecore_timer_del(bd->edc_navi_update_timer); file_browser_term(); @@ -278,7 +284,7 @@ base_edc_navigator_group_update(void) if (!config_edc_navigator_get()) return; base_data *bd = g_bd; - if (!bd) return; + EINA_SAFETY_ON_NULL_RETURN(bd); ecore_timer_del(bd->edc_navi_update_timer); bd->edc_navi_update_timer = ecore_timer_add(EDC_NAVIGATOR_UPDATE_TIME, @@ -290,7 +296,7 @@ void base_console_reset(void) { base_data *bd = g_bd; - if (!bd) return; + EINA_SAFETY_ON_NULL_RETURN(bd); console_text_set(bd->console, ""); bd->console_msg = EINA_FALSE; @@ -373,14 +379,18 @@ base_gui_init(void) void base_gui_show(void) { - evas_object_show(g_bd->win); + base_data *bd = g_bd; + EINA_SAFETY_ON_NULL_RETURN(bd); + + evas_object_show(bd->win); } Enventor_Object * base_enventor_get(void) { base_data *bd = g_bd; - assert(bd); + EINA_SAFETY_ON_NULL_RETURN(bd); + return bd->enventor; } @@ -388,7 +398,8 @@ void base_enventor_set(Enventor_Object *enventor) { base_data *bd = g_bd; - assert(bd); + EINA_SAFETY_ON_NULL_RETURN(bd); + bd->enventor = enventor; } @@ -396,6 +407,7 @@ void base_text_editor_set(Enventor_Item *it) { base_data *bd = g_bd; - assert(bd); + EINA_SAFETY_ON_NULL_RETURN(bd); + panes_text_editor_set(enventor_item_editor_get(it)); } diff --git a/src/bin/build_setting.c b/src/bin/build_setting.c index e2c2aa1..71001c0 100644 --- a/src/bin/build_setting.c +++ b/src/bin/build_setting.c @@ -91,14 +91,15 @@ snd_path_entry_update(Evas_Object *entry, Eina_List *edc_snd_paths) void build_setting_focus_set(build_setting_data *bsd) { - if (!bsd) return; + EINA_SAFETY_ON_NULL_RETURN(bsd); + elm_object_focus_set(bsd->img_path_entry, EINA_TRUE); } void build_setting_config_set(build_setting_data *bsd) { - if (!bsd) return; + EINA_SAFETY_ON_NULL_RETURN(bsd); config_img_path_set(elm_object_text_get(bsd->img_path_entry)); config_snd_path_set(elm_object_text_get(bsd->snd_path_entry)); @@ -109,7 +110,7 @@ build_setting_config_set(build_setting_data *bsd) void build_setting_reset(build_setting_data *bsd) { - if (!bsd) return; + EINA_SAFETY_ON_NULL_RETURN(bsd); img_path_entry_update(bsd->img_path_entry, (Eina_List *)config_img_path_list_get()); @@ -124,7 +125,8 @@ build_setting_reset(build_setting_data *bsd) Evas_Object * build_setting_content_get(build_setting_data *bsd, Evas_Object *parent) { - if (!bsd) return NULL; + EINA_SAFETY_ON_NULL_RETURN_VAL(bsd, NULL); + if (bsd->layout) return bsd->layout; //Layout @@ -230,7 +232,8 @@ build_setting_init(void) void build_setting_term(build_setting_data *bsd) { - if (!bsd) return; + EINA_SAFETY_ON_NULL_RETURN(bsd); + evas_object_del(bsd->layout); free(bsd); } diff --git a/src/bin/config_data.c b/src/bin/config_data.c index 27695ed..40e1327 100644 --- a/src/bin/config_data.c +++ b/src/bin/config_data.c @@ -51,6 +51,10 @@ typedef struct config_s static config_data *g_cd = NULL; static Eet_Data_Descriptor *edd_base = NULL; +/*****************************************************************************/ +/* Internal method implementation */ +/*****************************************************************************/ + static void config_edj_path_update(config_data *cd) { @@ -680,10 +684,16 @@ config_syntax_color_get(Enventor_Syntax_Color_Type color_type) return (const char *) eina_list_nth(cd->syntax_color_list, color_type); } +/*****************************************************************************/ +/* Externally accessible calls */ +/*****************************************************************************/ + Eina_Bool config_linenumber_get(void) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN_VAL(cd, EINA_FALSE); + return cd->linenumber; } @@ -691,6 +701,8 @@ void config_linenumber_set(Eina_Bool enabled) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN(cd); + cd->linenumber = enabled; } @@ -698,6 +710,8 @@ Eina_Bool config_file_tab_get(void) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN_VAL(cd, EINA_FALSE); + return cd->file_tab; } @@ -705,6 +719,8 @@ void config_file_tab_set(Eina_Bool enabled) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN(cd); + cd->file_tab = enabled; } @@ -712,6 +728,8 @@ Eina_Bool config_stats_bar_get(void) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN_VAL(cd, EINA_FALSE); + return cd->stats_bar; } @@ -719,6 +737,8 @@ void config_stats_bar_set(Eina_Bool enabled) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN(cd); + cd->stats_bar = enabled; } @@ -726,6 +746,8 @@ void config_update_cb_set(void (*cb)(void *data), void *data) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN(cd); + cd->update_cb = cb; cd->update_cb_data = data; } @@ -734,6 +756,8 @@ Eina_Bool config_part_highlight_get(void) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN_VAL(cd, EINA_FALSE); + return cd->part_highlight; } @@ -741,6 +765,8 @@ void config_part_highlight_set(Eina_Bool highlight) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN(cd); + cd->part_highlight = highlight; } @@ -748,6 +774,8 @@ Eina_Bool config_dummy_parts_get(void) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN_VAL(cd, EINA_FALSE); + return cd->dummy_parts; } @@ -755,6 +783,8 @@ void config_dummy_parts_set(Eina_Bool dummy_parts) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN(cd); + cd->dummy_parts = dummy_parts; } @@ -762,6 +792,8 @@ Eina_Bool config_parts_outline_get(void) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN_VAL(cd, EINA_FALSE); + return cd->outline; } @@ -769,6 +801,8 @@ void config_parts_outline_set(Eina_Bool outline) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN(cd); + cd->outline = outline; } @@ -776,6 +810,8 @@ Eina_Bool config_mirror_mode_get(void) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN_VAL(cd, EINA_FALSE); + return cd->mirror_mode; } @@ -783,6 +819,8 @@ void config_mirror_mode_set(Eina_Bool mirror_mode) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN(cd); + cd->mirror_mode = mirror_mode; } @@ -790,6 +828,8 @@ Eina_Bool config_auto_indent_get(void) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN_VAL(cd, EINA_FALSE); + return cd->auto_indent; } @@ -797,6 +837,8 @@ Eina_Bool config_auto_complete_get(void) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN_VAL(cd, EINA_FALSE); + return cd->auto_complete; } @@ -804,6 +846,7 @@ void config_font_set(const char *font_name, const char *font_style) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN(cd); eina_stringshare_replace(&cd->font_name, font_name); eina_stringshare_replace(&cd->font_style, font_style); @@ -813,6 +856,7 @@ void config_font_get(const char **font_name, const char **font_style) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN(cd); if (font_name) *font_name = cd->font_name; if (font_style) *font_style = cd->font_style; @@ -822,6 +866,7 @@ void config_font_scale_set(float font_scale) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN(cd); if (font_scale > MAX_FONT_SCALE) font_scale = MAX_FONT_SCALE; @@ -835,6 +880,8 @@ float config_font_scale_get(void) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN_VAL(cd, 0); + return cd->font_scale; } @@ -842,6 +889,8 @@ Eina_Bool config_smart_undo_redo_get(void) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN_VAL(cd, EINA_FALSE); + return cd->smart_undo_redo; } @@ -849,6 +898,8 @@ void config_smart_undo_redo_set(Eina_Bool smart_undo_redo) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN(cd); + cd->smart_undo_redo = smart_undo_redo; } @@ -856,6 +907,8 @@ void config_auto_complete_set(Eina_Bool auto_complete) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN(cd); + cd->auto_complete = auto_complete; } @@ -863,6 +916,8 @@ void config_auto_indent_set(Eina_Bool auto_indent) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN(cd); + cd->auto_indent = auto_indent; } @@ -870,6 +925,7 @@ void config_view_scale_set(double view_scale) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN(cd); if (view_scale > MAX_VIEW_SCALE) view_scale = MAX_VIEW_SCALE; @@ -882,6 +938,8 @@ double config_view_scale_get(void) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN_VAL(cd, 0); + return cd->view_scale; } @@ -889,6 +947,7 @@ void config_view_size_set(Evas_Coord w, Evas_Coord h) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN(cd); cd->view_size_w = w; cd->view_size_h = h; @@ -898,6 +957,7 @@ void config_view_size_get(Evas_Coord *w, Evas_Coord *h) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN(cd); if (w) *w = cd->view_size_w; if (h) *h = cd->view_size_h; @@ -907,6 +967,8 @@ double config_editor_size_get(void) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN(cd); + return cd->editor_size; } @@ -914,6 +976,8 @@ void config_editor_size_set(double size) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN(cd); + cd->editor_size = size; } @@ -921,6 +985,8 @@ double config_console_size_get(void) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN_VAL(cd, 0); + return cd->console_size; } @@ -928,6 +994,8 @@ void config_console_size_set(double size) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN(cd); + cd->console_size = size; } @@ -935,6 +1003,7 @@ void config_win_size_set(Evas_Coord w, Evas_Coord h) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN(cd); cd->win_size_w = w; cd->win_size_h = h; @@ -944,6 +1013,7 @@ void config_win_size_get(Evas_Coord *w, Evas_Coord *h) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN(cd); if (w) *w = cd->win_size_w; if (h) *h = cd->win_size_h; @@ -953,6 +1023,8 @@ Eina_Bool config_console_get(void) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN_VAL(cd, EINA_FALSE); + return cd->console; } @@ -960,6 +1032,8 @@ void config_console_set(Eina_Bool enabled) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN(cd); + cd->console = enabled; } @@ -967,6 +1041,8 @@ Eina_Bool config_tools_get(void) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN_VAL(cd, EINA_FALSE); + return cd->tools; } @@ -974,6 +1050,8 @@ void config_tools_set(Eina_Bool enabled) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN(cd); + cd->tools = enabled; } @@ -981,6 +1059,8 @@ void config_red_alert_set(Eina_Bool enabled) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN(cd); + cd->red_alert = enabled; } @@ -988,6 +1068,8 @@ Eina_Bool config_red_alert_get(void) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN_VAL(cd, EINA_FALSE); + return cd->red_alert; } @@ -995,6 +1077,8 @@ void config_file_browser_set(Eina_Bool enabled) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN(cd); + cd->file_browser = enabled; cd->file_browser_loaded = enabled; } @@ -1003,6 +1087,8 @@ Eina_Bool config_file_browser_get(void) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN_VAL(cd, EINA_FALSE); + return cd->file_browser; } @@ -1010,6 +1096,8 @@ void config_edc_navigator_set(Eina_Bool enabled) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN(cd); + cd->edc_navigator = enabled; } @@ -1017,5 +1105,7 @@ Eina_Bool config_edc_navigator_get(void) { config_data *cd = g_cd; + EINA_SAFETY_ON_NULL_RETURN_VAL(cd, EINA_FALSE); + return cd->edc_navigator; } diff --git a/src/bin/edc_navigator.c b/src/bin/edc_navigator.c index 6402eab..e9d04e9 100644 --- a/src/bin/edc_navigator.c +++ b/src/bin/edc_navigator.c @@ -1356,7 +1356,9 @@ void edc_navigator_deselect(void) { navi_data *nd = g_nd; - if (!nd || !nd->selected) return; + EINA_SAFETY_ON_NULL_RETURN(nd); + + if (!nd->selected) return; navigator_item_deselect(nd); } @@ -1364,7 +1366,7 @@ void edc_navigator_group_update(const char *cur_group) { navi_data *nd = g_nd; - if (!nd) return; + EINA_SAFETY_ON_NULL_RETURN(nd); //FIXME: This function is unnecessarily called... why? @@ -1541,7 +1543,7 @@ void edc_navigator_term(void) { navi_data *nd = g_nd; - if (!nd) return; + EINA_SAFETY_ON_NULL_RETURN(nd); navigator_groups_clear(nd); @@ -1561,7 +1563,7 @@ void edc_navigator_tools_set(void) { navi_data *nd = g_nd; - if (!nd) return; + EINA_SAFETY_ON_NULL_RETURN(nd); Evas_Object *rect = evas_object_rectangle_add(evas_object_evas_get(nd->base_layout)); @@ -1573,7 +1575,7 @@ void edc_navigator_tools_visible_set(Eina_Bool visible) { navi_data *nd = g_nd; - if (!nd) return; + EINA_SAFETY_ON_NULL_RETURN(nd); if (visible) elm_object_signal_emit(nd->base_layout, "elm,state,tools,show", ""); diff --git a/src/bin/file_browser.c b/src/bin/file_browser.c index f000886..7d5a737 100644 --- a/src/bin/file_browser.c +++ b/src/bin/file_browser.c @@ -576,7 +576,7 @@ show_all_check_changed_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { brows_data *bd = g_bd; - if (!bd) return; + EINA_SAFETY_ON_NULL_RETURN(bd); if (bd->mode == FILE_BROWSER_MODE_DEFAULT) file_browser_workspace_reset(); @@ -600,7 +600,7 @@ void file_browser_workspace_set(const char *workspace_path) { brows_data *bd = g_bd; - if (!bd) return; + EINA_SAFETY_ON_NULL_RETURN(bd); if (!workspace_path) return; if (!ecore_file_exists(workspace_path)) return; @@ -617,7 +617,7 @@ file_browser_workspace_set(const char *workspace_path) //Create file with creating its sub file list. brows_file *workspace = brows_file_create(workspace_path, EINA_TRUE); - if (!workspace) return; + EINA_SAFETY_ON_NULL_RETURN(workspace); bd->workspace = workspace; elm_object_disabled_set(bd->base_layout, EINA_FALSE); @@ -753,7 +753,7 @@ void file_browser_term(void) { brows_data *bd = g_bd; - if (!bd) return; + EINA_SAFETY_ON_NULL_RETURN(bd); if (bd->workspace) brows_file_free(bd->workspace); if (bd->search_file_list) brows_file_list_free(bd->search_file_list); @@ -771,7 +771,7 @@ void file_browser_tools_set(void) { brows_data *bd = g_bd; - if (!bd) return; + EINA_SAFETY_ON_NULL_RETURN(bd); Evas_Object *rect = evas_object_rectangle_add(evas_object_evas_get(bd->base_layout)); @@ -783,7 +783,7 @@ void file_browser_tools_visible_set(Eina_Bool visible) { brows_data *bd = g_bd; - if (!bd) return; + EINA_SAFETY_ON_NULL_RETURN(bd); if (visible) elm_object_signal_emit(bd->base_layout, "elm,state,tools,show", ""); diff --git a/src/bin/file_mgr.c b/src/bin/file_mgr.c index ac4427b..a3b9689 100644 --- a/src/bin/file_mgr.c +++ b/src/bin/file_mgr.c @@ -12,6 +12,10 @@ typedef struct file_mgr_s { static file_mgr_data *g_fmd = NULL; +/*****************************************************************************/ +/* Internal method implementation */ +/*****************************************************************************/ + static void warning_dismiss_done(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, @@ -127,10 +131,16 @@ enventor_edc_modified_cb(void *data, Evas_Object *obj EINA_UNUSED, warning_open(fmd); } +/*****************************************************************************/ +/* Externally accessible calls */ +/*****************************************************************************/ + void file_mgr_reset(void) { file_mgr_data *fmd = g_fmd; + EINA_SAFETY_ON_NULL_RETURN(fmd); + fmd->edc_modified = EINA_FALSE; } @@ -138,6 +148,8 @@ int file_mgr_edc_modified_get(void) { file_mgr_data *fmd = g_fmd; + EINA_SAFETY_ON_NULL_RETURN(fmd); + return fmd->edc_modified; } @@ -163,13 +175,17 @@ Eina_Bool file_mgr_warning_is_opened(void) { file_mgr_data *fmd = g_fmd; - return ((fmd && fmd->warning_layout) ? EINA_TRUE : EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(fmd, EINA_FALSE); + + return (fmd->warning_layout ? EINA_TRUE : EINA_FALSE); } void file_mgr_warning_open(void) { file_mgr_data *fmd = g_fmd; + EINA_SAFETY_ON_NULL_RETURN(fmd); + warning_open(fmd); } @@ -177,6 +193,7 @@ void file_mgr_warning_close(void) { file_mgr_data *fmd = g_fmd; + EINA_SAFETY_ON_NULL_RETURN(fmd); if (fmd->warning_layout) warning_close(fmd); @@ -201,5 +218,7 @@ void file_mgr_term(void) { file_mgr_data *fmd = g_fmd; + EINA_SAFETY_ON_NULL_RETURN(fmd); + free(fmd); } diff --git a/src/bin/file_tab.c b/src/bin/file_tab.c index a31a858..82082d3 100644 --- a/src/bin/file_tab.c +++ b/src/bin/file_tab.c @@ -64,7 +64,7 @@ list_item_selected_cb(void *data, Evas_Object *obj EINA_UNUSED, Eina_Bool file_tab_it_select(Enventor_Item *enventor_it) { file_data *fd = g_fd; - if (!fd) return EINA_FALSE; + EINA_SAFETY_ON_NULL_RETURN_VAL(fd, EINA_FALSE); Eina_List *list = (Eina_List*) elm_list_items_get(fd->list); Eina_List *l; @@ -86,7 +86,7 @@ Eina_Bool file_tab_it_select(Enventor_Item *enventor_it) void file_tab_clear(void) { file_data *fd = g_fd; - if (!fd) return; + EINA_SAFETY_ON_NULL_RETURN(fd); Eina_List *list = (Eina_List*) elm_list_items_get(fd->list); Eina_List *l; @@ -153,7 +153,7 @@ void file_tab_disabled_set(Eina_Bool disabled) { file_data *fd = g_fd; - if (!fd) return; + EINA_SAFETY_ON_NULL_RETURN(fd); elm_object_disabled_set(fd->list, disabled); if (disabled) return; @@ -236,7 +236,7 @@ void file_tab_term(void) { file_data *fd = g_fd; - if (!fd) return; + EINA_SAFETY_ON_NULL_RETURN(fd); evas_object_del(fd->box); diff --git a/src/bin/globals.c b/src/bin/globals.c index a7a3ed5..3ff43c8 100644 --- a/src/bin/globals.c +++ b/src/bin/globals.c @@ -16,6 +16,8 @@ void mem_fail_msg(void) void facade_it_select(Enventor_Item *it) { + EINA_SAFETY_ON_NULL_RETURN(it); + file_tab_it_select(it); enventor_item_focus_set(it); base_text_editor_set(it); @@ -25,7 +27,7 @@ void facade_it_select(Enventor_Item *it) Enventor_Item *facade_sub_file_add(const char *path) { Enventor_Item *it = enventor_object_sub_file_add(base_enventor_get(), path); - if (!it) return NULL; + EINA_SAFETY_ON_NULL_RETURN_VAL(it, NULL); file_tab_it_add(it); file_tab_it_select(it); @@ -38,7 +40,7 @@ Enventor_Item *facade_sub_file_add(const char *path) Enventor_Item *facade_main_file_set(const char *path) { Enventor_Item *it = enventor_object_main_file_set(base_enventor_get(), path); - if (!it) return NULL; + EINA_SAFETY_ON_NULL_RETURN_VAL(it, NULL); file_tab_clear(); file_tab_it_add(it); diff --git a/src/bin/goto.c b/src/bin/goto.c index f33b5a4..4862591 100644 --- a/src/bin/goto.c +++ b/src/bin/goto.c @@ -21,6 +21,10 @@ static Evas_Coord win_y = -1; static Evas_Coord win_w = DEFAULT_GOTO_WIN_W; static Evas_Coord win_h = DEFAULT_GOTO_WIN_H; +/*****************************************************************************/ +/* Internal method implementation */ +/*****************************************************************************/ + static void win_delete_request_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) @@ -116,6 +120,10 @@ keygrabber_key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, goto_close(); } +/*****************************************************************************/ +/* Externally accessible calls */ +/*****************************************************************************/ + void goto_open(void) { @@ -222,7 +230,7 @@ Eina_Bool goto_close(void) { goto_data *gd = g_gd; - if (!gd) return EINA_FALSE; + EINA_SAFETY_ON_NULL_RETURN_VAL(gd, EINA_FALSE); //Save last state evas_object_geometry_get(gd->win, NULL, NULL, &win_w, &win_h); diff --git a/src/bin/help.c b/src/bin/help.c index 3b3d21b..f639fc5 100644 --- a/src/bin/help.c +++ b/src/bin/help.c @@ -10,6 +10,10 @@ static Evas_Coord win_w = DEFAULT_HELP_WIN_W; static Evas_Coord win_h = DEFAULT_HELP_WIN_H; static Evas_Object *g_win = NULL; +/*****************************************************************************/ +/* Internal method implementation */ +/*****************************************************************************/ + static void keygrabber_key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, @@ -35,6 +39,10 @@ win_moved_cb(void *data EINA_UNUSED, Evas_Object *obj, evas_object_smart_callback_del(obj, "moved", win_moved_cb); } +/*****************************************************************************/ +/* Externally accessible calls */ +/*****************************************************************************/ + void help_open(void) { diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c index 1a99a2f..2d10ae1 100644 --- a/src/bin/live_edit.c +++ b/src/bin/live_edit.c @@ -2129,6 +2129,7 @@ live_edit_update(void) if (!live_edit_get()) return; live_data *ld = g_ld; + EINA_SAFETY_ON_NULL_RETURN(ld); //Scale up/down of the symbol object. Evas_Object *layout_symbol = @@ -2151,6 +2152,8 @@ Eina_Bool live_edit_cancel(Eina_Bool phase_in) { live_data *ld = g_ld; + EINA_SAFETY_ON_NULL_RETURN_VAL(ld, EINA_FALSE); + if (!ld->on) return EINA_FALSE; //Dismiss Relative To Ctxpopup firstly. @@ -2289,6 +2292,8 @@ void live_edit_term(void) { live_data *ld = g_ld; + EINA_SAFETY_ON_NULL_RETURN(ld); + live_edit_cancel(EINA_FALSE); free_auto_align_data(ld->auto_align_array); diff --git a/src/bin/menu.c b/src/bin/menu.c index 8efa023..8bece7c 100644 --- a/src/bin/menu.c +++ b/src/bin/menu.c @@ -30,6 +30,10 @@ static void edc_file_save(menu_data *md); static void new_yes_btn_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +/*****************************************************************************/ +/* Internal method implementation */ +/*****************************************************************************/ + static void fileselector_close(menu_data *md) { @@ -598,6 +602,10 @@ menu_open(menu_data *md) md->active_request++; } +/*****************************************************************************/ +/* Externally accessible calls */ +/*****************************************************************************/ + void menu_init(void) { @@ -638,6 +646,7 @@ void menu_edc_save(void) { menu_data *md = g_md; + EINA_SAFETY_ON_NULL_RETURN(md); edc_file_save(md); } @@ -645,6 +654,8 @@ void menu_edc_load(void) { menu_data *md = g_md; + EINA_SAFETY_ON_NULL_RETURN(md); + if (enventor_object_modified_get(base_enventor_get())) warning_open(md, load_yes_btn_cb, load_save_btn_cb); else @@ -655,6 +666,7 @@ void menu_toggle(void) { menu_data *md = g_md; + EINA_SAFETY_ON_NULL_RETURN(md); if (setting_is_opened()) { @@ -698,6 +710,8 @@ enventor_ctxpopup_dismissed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { menu_data *md = data; + EINA_SAFETY_ON_NULL_RETURN(md); + warning_open(md, exit_yes_btn_cb, exit_save_btn_cb); } @@ -705,6 +719,8 @@ void menu_exit(void) { menu_data *md = g_md; + EINA_SAFETY_ON_NULL_RETURN(md); + Enventor_Object *enventor = base_enventor_get(); if (enventor_object_modified_get(enventor)) { @@ -730,6 +746,8 @@ void menu_deactivate_request(void) { menu_data *md = g_md; + EINA_SAFETY_ON_NULL_RETURN(md); + md->active_request--; if (md->active_request == 0) @@ -745,6 +763,8 @@ void menu_activate_request(void) { menu_data *md = g_md; + EINA_SAFETY_ON_NULL_RETURN(md); + if (md->menu_layout) elm_object_disabled_set(md->menu_layout, EINA_TRUE); md->active_request++; } diff --git a/src/bin/newfile.c b/src/bin/newfile.c index 1f4395d..c339fa0 100644 --- a/src/bin/newfile.c +++ b/src/bin/newfile.c @@ -11,6 +11,10 @@ typedef struct new_data_s { static new_data *g_nd = NULL; +/*****************************************************************************/ +/* Internal method implementation */ +/*****************************************************************************/ + static void list_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) @@ -20,14 +24,66 @@ list_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, g_nd = NULL; } +static void +file_dir_list_cb(const char *name, const char *path EINA_UNUSED, void *data) +{ + new_data *nd = data; + + char *ext = strrchr(name, '.'); + if (!ext || strcmp(ext, ".edc")) return; + + char *file_name = ecore_file_strip_ext(name); + nd->templates = eina_list_append(nd->templates, + eina_stringshare_add(file_name)); + free(file_name); +} + +static void +list_item_selected_cb(void *data, Evas_Object *obj EINA_UNUSED, + void *event_info) +{ + Evas_Object *layout = data; + Elm_Object_Item *it = event_info; + char *name = (char *)elm_object_item_text_get(it); + + /* empty is real empty. cannot load the edj. so replace the empty to minimum + to show the preview layout. */ + if (!strcmp("empty", name)) name = "minimum"; + + char buf[PATH_MAX]; + snprintf(buf, sizeof(buf), "%s/templates/%s.edj", elm_app_data_dir_get(), + name); + + elm_layout_file_set(layout, buf, "main"); +} + +static void +templates_get(new_data *nd) +{ + char buf[PATH_MAX]; + snprintf(buf, sizeof(buf), "%s/templates", elm_app_data_dir_get()); + + if (!ecore_file_path_dir_exists(buf)) + { + EINA_LOG_ERR(_("Cannot find templates folder! \"%s\""), buf); + return; + } + + eina_file_dir_list(buf, EINA_FALSE, file_dir_list_cb, nd); +} + +/*****************************************************************************/ +/* Externally accessible calls */ +/*****************************************************************************/ + void newfile_set(Eina_Bool template_new) { new_data *nd = g_nd; - if (!nd) return; + EINA_SAFETY_ON_NULL_RETURN(nd); Elm_Object_Item *it = elm_list_selected_item_get(nd->list); - if (!it) return; + EINA_SAFETY_ON_NULL_RETURN(it); Eina_Bool success = EINA_TRUE; char buf[PATH_MAX]; @@ -80,54 +136,6 @@ newfile_default_set(Eina_Bool default_edc) } } -static void -file_dir_list_cb(const char *name, const char *path EINA_UNUSED, void *data) -{ - new_data *nd = data; - - char *ext = strrchr(name, '.'); - if (!ext || strcmp(ext, ".edc")) return; - - char *file_name = ecore_file_strip_ext(name); - nd->templates = eina_list_append(nd->templates, - eina_stringshare_add(file_name)); - free(file_name); -} - -static void -list_item_selected_cb(void *data, Evas_Object *obj EINA_UNUSED, - void *event_info) -{ - Evas_Object *layout = data; - Elm_Object_Item *it = event_info; - char *name = (char *)elm_object_item_text_get(it); - - /* empty is real empty. cannot load the edj. so replace the empty to minimum - to show the preview layout. */ - if (!strcmp("empty", name)) name = "minimum"; - - char buf[PATH_MAX]; - snprintf(buf, sizeof(buf), "%s/templates/%s.edj", elm_app_data_dir_get(), - name); - - elm_layout_file_set(layout, buf, "main"); -} - -static void -templates_get(new_data *nd) -{ - char buf[PATH_MAX]; - snprintf(buf, sizeof(buf), "%s/templates", elm_app_data_dir_get()); - - if (!ecore_file_path_dir_exists(buf)) - { - EINA_LOG_ERR(_("Cannot find templates folder! \"%s\""), buf); - return; - } - - eina_file_dir_list(buf, EINA_FALSE, file_dir_list_cb, nd); -} - Evas_Object * newfile_create(Evas_Object *parent, Evas_Smart_Cb selected_cb, void *data) { diff --git a/src/bin/panes.c b/src/bin/panes.c index 225d746..74c9452 100644 --- a/src/bin/panes.c +++ b/src/bin/panes.c @@ -29,6 +29,10 @@ typedef struct _panes_data static panes_data *g_pd = NULL; +/*****************************************************************************/ +/* Internal method implementation */ +/*****************************************************************************/ + static void transit_op_v(void *data, Elm_Transit *transit EINA_UNUSED, double progress) { @@ -150,10 +154,15 @@ panes_v_full_view_cancel(panes_data *pd) pd->vert.state = PANES_SPLIT_VIEW; } +/*****************************************************************************/ +/* Externally accessible calls */ +/*****************************************************************************/ + void panes_text_editor_full_view(void) { panes_data *pd = g_pd; + EINA_SAFETY_ON_NULL_RETURN(pd); //Revert state if the current state is full view right already. if (pd->horiz.state == PANES_TEXT_EDITOR_EXPAND) @@ -185,6 +194,7 @@ void panes_live_view_full_view(void) { panes_data *pd = g_pd; + EINA_SAFETY_ON_NULL_RETURN(pd); //Revert state if the current state is full view left already. if (pd->horiz.state == PANES_LIVE_VIEW_EXPAND) @@ -216,6 +226,8 @@ Eina_Bool panes_editors_full_view_get(void) { panes_data *pd = g_pd; + EINA_SAFETY_ON_NULL_RETURN_VAL(pd, EINA_FALSE); + if (pd->vert.state == PANES_EDITORS_EXPAND) return EINA_TRUE; else return EINA_FALSE; } @@ -224,6 +236,7 @@ void panes_editors_full_view(Eina_Bool full_view) { panes_data *pd = g_pd; + EINA_SAFETY_ON_NULL_RETURN(pd); if (full_view) { @@ -254,6 +267,7 @@ void panes_console_full_view(void) { panes_data *pd = g_pd; + EINA_SAFETY_ON_NULL_RETURN(pd); //Revert state if the current state is full view top already. if (pd->vert.state == PANES_CONSOLE_EXPAND) @@ -285,6 +299,8 @@ void panes_text_editor_set(Evas_Object *text_editor) { panes_data *pd = g_pd; + EINA_SAFETY_ON_NULL_RETURN(pd); + Evas_Object *prev = elm_object_content_unset(pd->text_tool_layout); evas_object_hide(prev); elm_object_content_set(pd->text_tool_layout, text_editor); @@ -294,6 +310,8 @@ void panes_live_view_set(Evas_Object *live_view) { panes_data *pd = g_pd; + EINA_SAFETY_ON_NULL_RETURN(pd); + elm_object_content_set(pd->live_tool_layout, live_view); } @@ -301,6 +319,8 @@ void panes_console_set(Evas_Object *console) { panes_data *pd = g_pd; + EINA_SAFETY_ON_NULL_RETURN(pd); + elm_object_part_content_set(pd->vert.obj, "bottom", console); } @@ -308,6 +328,8 @@ void panes_term(void) { panes_data *pd = g_pd; + EINA_SAFETY_ON_NULL_RETURN(pd); + evas_object_del(pd->vert.obj); elm_transit_del(pd->vert.transit); elm_transit_del(pd->horiz.transit); @@ -389,7 +411,7 @@ void panes_live_view_tools_set(Evas_Object *tools) { panes_data *pd = g_pd; - if (!pd) return; + EINA_SAFETY_ON_NULL_RETURN(pd); Evas_Object *live_view = elm_object_part_content_get(pd->horiz.obj, "left"); elm_object_part_content_set(live_view, "elm.swallow.tools", tools); @@ -399,7 +421,7 @@ void panes_live_edit_fixed_bar_set(Evas_Object *fixed_bar) { panes_data *pd = g_pd; - if (!pd) return; + EINA_SAFETY_ON_NULL_RETURN(pd); Evas_Object *live_view = elm_object_part_content_get(pd->horiz.obj, "left"); elm_object_part_content_set(live_view, "elm.swallow.fixed_bar", fixed_bar); @@ -409,7 +431,7 @@ void panes_text_editor_tools_set(Evas_Object *tools) { panes_data *pd = g_pd; - if (!pd) return; + EINA_SAFETY_ON_NULL_RETURN(pd); Evas_Object *text_editor = elm_object_part_content_get(pd->horiz.obj, "right"); @@ -420,7 +442,7 @@ void panes_live_view_tools_visible_set(Eina_Bool visible) { panes_data *pd = g_pd; - if (!pd) return; + EINA_SAFETY_ON_NULL_RETURN(pd); Evas_Object *live_view = elm_object_part_content_get(pd->horiz.obj, "left"); @@ -434,7 +456,7 @@ void panes_live_edit_fixed_bar_visible_set(Eina_Bool visible) { panes_data *pd = g_pd; - if (!pd) return; + EINA_SAFETY_ON_NULL_RETURN(pd); Evas_Object *live_view = elm_object_part_content_get(pd->horiz.obj, "left"); @@ -449,7 +471,7 @@ void panes_text_editor_tools_visible_set(Eina_Bool visible) { panes_data *pd = g_pd; - if (!pd) return; + EINA_SAFETY_ON_NULL_RETURN(pd); Evas_Object *text_editor = elm_object_part_content_get(pd->horiz.obj, "right"); diff --git a/src/bin/preference_setting.c b/src/bin/preference_setting.c index 92e8b9d..41de7f7 100644 --- a/src/bin/preference_setting.c +++ b/src/bin/preference_setting.c @@ -63,14 +63,14 @@ entry_create(Evas_Object *parent) void preference_setting_focus_set(preference_setting_data *psd) { - if (!psd) return; + EINA_SAFETY_ON_NULL_RETURN(psd); elm_object_focus_set(psd->view_size_w_entry, EINA_TRUE); } void preference_setting_config_set(preference_setting_data *psd) { - if (!psd) return; + EINA_SAFETY_ON_NULL_RETURN(psd); config_tools_set(elm_check_state_get(psd->toggle_tools)); config_stats_bar_set(elm_check_state_get(psd->toggle_status)); @@ -92,7 +92,7 @@ preference_setting_config_set(preference_setting_data *psd) void preference_setting_reset(preference_setting_data *psd) { - if (!psd) return; + EINA_SAFETY_ON_NULL_RETURN(psd); elm_check_state_set(psd->toggle_tools, config_tools_get()); elm_check_state_set(psd->toggle_status, config_stats_bar_get()); @@ -120,7 +120,7 @@ preference_setting_content_get(preference_setting_data *psd, static Elm_Entry_Filter_Accept_Set digits_filter_data; static Elm_Entry_Filter_Limit_Size limit_filter_data; - if (!psd) return NULL; + EINA_SAFETY_ON_NULL_RETURN_VAL(psd, NULL); if (psd->box) return psd->box; //Preference @@ -318,7 +318,8 @@ preference_setting_init(void) void preference_setting_term(preference_setting_data *psd) { - if (!psd) return; + EINA_SAFETY_ON_NULL_RETURN(psd); + evas_object_del(psd->box); free(psd); } diff --git a/src/bin/search.c b/src/bin/search.c index 82d7e3a..9517014 100644 --- a/src/bin/search.c +++ b/src/bin/search.c @@ -22,6 +22,10 @@ static Evas_Coord win_y = -1; static Evas_Coord win_w = DEFAULT_SEARCH_WIN_W; static Evas_Coord win_h = DEFAULT_SEARCH_WIN_H; +/*****************************************************************************/ +/* Internal method implementation */ +/*****************************************************************************/ + static void win_delete_request_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) @@ -318,6 +322,10 @@ keygrabber_key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, search_close(); } +/*****************************************************************************/ +/* Externally accessible calls */ +/*****************************************************************************/ + void search_open(void) { @@ -447,7 +455,7 @@ Eina_Bool search_close(void) { search_data *sd = g_sd; - if (!sd) return EINA_FALSE; + EINA_SAFETY_ON_NULL_RETURN_VAL(sd, EINA_FALSE); Enventor_Object *enventor = base_enventor_get(); diff --git a/src/bin/setting.c b/src/bin/setting.c index bb33b0d..dd5a9dd 100644 --- a/src/bin/setting.c +++ b/src/bin/setting.c @@ -1,6 +1,3 @@ -/*****************************************************************************/ -/* Externally accessible calls */ -/*****************************************************************************/ #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -260,7 +257,7 @@ void setting_close() { setting_data *sd = g_sd; - if (!sd) return; + EINA_SAFETY_ON_NULL_RETURN(sd); elm_object_signal_emit(sd->layout, "elm,state,dismiss", ""); } @@ -268,6 +265,7 @@ Eina_Bool setting_is_opened(void) { setting_data *sd = g_sd; - if (!sd) return EINA_FALSE; + EINA_SAFETY_ON_NULL_RETURN_VAL(sd, EINA_FALSE); + return EINA_TRUE; } diff --git a/src/bin/statusbar.c b/src/bin/statusbar.c index 2d135d7..a32ca92 100644 --- a/src/bin/statusbar.c +++ b/src/bin/statusbar.c @@ -284,6 +284,7 @@ void stats_line_num_update(int cur_line, int max_line) { stats_data *sd = g_sd; + EINA_SAFETY_ON_NULL_RETURN(sd); char buf[20]; snprintf(buf, sizeof(buf), "%d", cur_line); @@ -299,6 +300,8 @@ void stats_edc_group_update(Eina_Stringshare *group_name) { stats_data *sd = g_sd; + EINA_SAFETY_ON_NULL_RETURN(sd); + elm_object_part_text_set(sd->layout, "elm.text.group_name", group_name); sd->group_name = eina_stringshare_add(group_name); } @@ -376,6 +379,8 @@ stats_init(Evas_Object *parent) Eina_Stringshare *stats_group_name_get(void) { stats_data *sd = g_sd; + EINA_SAFETY_ON_NULL_RETURN(sd); + return sd->group_name; } @@ -383,6 +388,8 @@ void stats_term(void) { stats_data *sd = g_sd; + EINA_SAFETY_ON_NULL_RETURN(sd); + eina_stringshare_del(sd->group_name); free(sd); } @@ -393,6 +400,8 @@ stats_info_msg_update(const char *msg) if (!config_stats_bar_get()) return; stats_data *sd = g_sd; + EINA_SAFETY_ON_NULL_RETURN(sd); + elm_object_part_text_set(sd->layout, "elm.text.info_msg", msg); elm_object_signal_emit(sd->layout, "elm,action,info_msg,show", ""); } @@ -401,6 +410,7 @@ void stats_view_scale_update(double scale) { stats_data *sd = g_sd; + EINA_SAFETY_ON_NULL_RETURN(sd); char buf[10]; snprintf(buf, sizeof(buf), "%0.2fx", scale); @@ -411,6 +421,7 @@ void stats_view_size_update(Evas_Coord w, Evas_Coord h) { stats_data *sd = g_sd; + EINA_SAFETY_ON_NULL_RETURN(sd); char buf[10]; snprintf(buf, sizeof(buf), "%d", w); @@ -423,6 +434,7 @@ void stats_cursor_pos_update(Evas_Coord x, Evas_Coord y, float rel_x, float rel_y) { stats_data *sd = g_sd; + EINA_SAFETY_ON_NULL_RETURN(sd); char buf[10]; snprintf(buf, sizeof(buf), "%d", x); @@ -440,6 +452,8 @@ Eina_Bool stats_ctxpopup_dismiss(void) { stats_data *sd = g_sd; + EINA_SAFETY_ON_NULL_RETURN(sd); + if (sd->ctxpopup) { elm_ctxpopup_dismiss(sd->ctxpopup); diff --git a/src/bin/text_setting.c b/src/bin/text_setting.c index 89d3d1e..201e383 100644 --- a/src/bin/text_setting.c +++ b/src/bin/text_setting.c @@ -955,7 +955,7 @@ text_setting_content_get(text_setting_data *tsd, Evas_Object *parent) void text_setting_focus_set(text_setting_data *tsd) { - if (!tsd) return; + EINA_SAFETY_ON_NULL_RETURN(tsd); elm_object_focus_set(tsd->slider_font, EINA_TRUE); } @@ -963,7 +963,7 @@ text_setting_focus_set(text_setting_data *tsd) void text_setting_config_set(text_setting_data *tsd) { - if (!tsd) return; + EINA_SAFETY_ON_NULL_RETURN(tsd); config_font_set(tsd->font_name, tsd->font_style); config_font_scale_set((float) elm_slider_value_get(tsd->slider_font)); @@ -974,7 +974,7 @@ text_setting_config_set(text_setting_data *tsd) void text_setting_reset(text_setting_data *tsd) { - if (!tsd) return; + EINA_SAFETY_ON_NULL_RETURN(tsd); //font scale tsd->font_scale = (double) config_font_scale_get(); @@ -1004,7 +1004,7 @@ text_setting_init(void) void text_setting_term(text_setting_data *tsd) { - if (!tsd) return; + EINA_SAFETY_ON_NULL_RETURN(tsd); evas_object_del(tsd->color_ctxpopup); free(tsd->color_keyword_list); diff --git a/src/bin/tools.c b/src/bin/tools.c index bc6c2ee..a921f07 100644 --- a/src/bin/tools.c +++ b/src/bin/tools.c @@ -122,7 +122,7 @@ console_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { tools_data *td = g_td; - if (!td) return; + EINA_SAFETY_ON_NULL_RETURN(td); base_console_toggle(); } @@ -420,7 +420,7 @@ void tools_highlight_update(Eina_Bool toggle) { tools_data *td = g_td; - if (!td) return; + EINA_SAFETY_ON_NULL_RETURN(td); if (toggle) config_part_highlight_set(!config_part_highlight_get()); enventor_object_part_highlight_set(base_enventor_get(), @@ -444,7 +444,7 @@ void tools_file_browser_update(Eina_Bool toggle) { tools_data *td = g_td; - if (!td) return; + EINA_SAFETY_ON_NULL_RETURN(td); if (toggle) config_file_browser_set(!config_file_browser_get()); @@ -467,7 +467,7 @@ void tools_edc_navigator_update(Eina_Bool toggle) { tools_data *td = g_td; - if (!td) return; + EINA_SAFETY_ON_NULL_RETURN(td); if (toggle) config_edc_navigator_set(!config_edc_navigator_get()); @@ -490,7 +490,7 @@ void tools_lines_update(Eina_Bool toggle) { tools_data *td = g_td; - if (!td) return; + EINA_SAFETY_ON_NULL_RETURN(td); if (toggle) config_linenumber_set(!config_linenumber_get()); enventor_object_linenumber_set(base_enventor_get(), config_linenumber_get()); @@ -506,7 +506,7 @@ void tools_dummy_update(Eina_Bool toggle) { tools_data *td = g_td; - if (!td) return; + EINA_SAFETY_ON_NULL_RETURN(td); if (toggle) config_dummy_parts_set(!config_dummy_parts_get()); enventor_object_dummy_parts_set(base_enventor_get(), @@ -530,7 +530,7 @@ void tools_outline_update(Eina_Bool toggle) { tools_data *td = g_td; - if (!td) return; + EINA_SAFETY_ON_NULL_RETURN(td); if (toggle) config_parts_outline_set(!config_parts_outline_get()); enventor_object_parts_outline_set(base_enventor_get(), @@ -554,7 +554,7 @@ void tools_mirror_mode_update(Eina_Bool toggle) { tools_data *td = g_td; - if (!td) return; + EINA_SAFETY_ON_NULL_RETURN(td); if (toggle) config_mirror_mode_set(!config_mirror_mode_get()); enventor_object_mirror_mode_set(base_enventor_get(), @@ -580,7 +580,7 @@ void tools_file_tab_update(Eina_Bool toggle) { tools_data *td = g_td; - if (!td) return; + EINA_SAFETY_ON_NULL_RETURN(td); base_file_tab_toggle(toggle); @@ -595,7 +595,7 @@ void tools_goto_update(void) { tools_data *td = g_td; - if (!td) return; + EINA_SAFETY_ON_NULL_RETURN(td); if (goto_is_opened()) elm_object_signal_emit(td->goto_btn, "icon,highlight,enabled", ""); @@ -607,7 +607,7 @@ void tools_search_update(void) { tools_data *td = g_td; - if (!td) return; + EINA_SAFETY_ON_NULL_RETURN(td); if (search_is_opened()) elm_object_signal_emit(td->find_btn, "icon,highlight,enabled", ""); @@ -645,7 +645,7 @@ void tools_console_update(Eina_Bool on) { tools_data *td = g_td; - if (!td) return; + EINA_SAFETY_ON_NULL_RETURN(td); if (on) elm_object_signal_emit(td->console_btn, "icon,highlight,enabled", ""); @@ -657,7 +657,7 @@ void tools_menu_update(Eina_Bool on) { tools_data *td = g_td; - if (!td) return; + EINA_SAFETY_ON_NULL_RETURN(td); if (on) elm_object_signal_emit(td->menu_btn, "icon,highlight,enabled", ""); --
