seoz pushed a commit to branch elementary-1.8. http://git.enlightenment.org/core/elementary.git/commit/?id=e33aa23cb8b31095d78fe1fc508ef7f4f8cfc677
commit e33aa23cb8b31095d78fe1fc508ef7f4f8cfc677 Author: Jihoon Kim <[email protected]> Date: Tue Dec 31 11:23:28 2013 +0900 entry: add NULL check --- src/lib/elm_entry.c | 85 +++++++++++++++++++++++++++-------------------------- 1 file changed, 44 insertions(+), 41 deletions(-) diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c index b00e9a1..df1cba2 100644 --- a/src/lib/elm_entry.c +++ b/src/lib/elm_entry.c @@ -2767,7 +2767,7 @@ _elm_entry_smart_text_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) const char *item = va_arg(*list, const char *); const char **ret = va_arg(*list, const char **); const char *text; - *ret = NULL; + if (ret) *ret = NULL; Elm_Entry_Smart_Data *sd = _pd; @@ -2775,9 +2775,9 @@ _elm_entry_smart_text_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) { if (!strcmp(item, "default")) goto proceed; else if (!strcmp(item, "guide")) - *ret = edje_object_part_text_get(sd->entry_edje, "elm.guide"); + if (ret) *ret = edje_object_part_text_get(sd->entry_edje, "elm.guide"); else - *ret = edje_object_part_text_get(sd->entry_edje, item); + if (ret) *ret = edje_object_part_text_get(sd->entry_edje, item); return; } @@ -2820,7 +2820,7 @@ proceed: eina_stringshare_replace(&sd->text, text); } - *ret = sd->text; + if (ret) *ret = sd->text; } static char * @@ -3529,7 +3529,7 @@ _text_style_user_peek(Eo *obj EINA_UNUSED, void *_pd, va_list *list) const char **ret = va_arg(*list, const char **); Elm_Entry_Smart_Data *sd = _pd; - *ret = edje_object_part_text_style_user_peek(sd->entry_edje, "elm.text"); + if (ret) *ret = edje_object_part_text_style_user_peek(sd->entry_edje, "elm.text"); } EAPI void @@ -3581,7 +3581,7 @@ _single_line_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->single_line; + if (ret) *ret = sd->single_line; } EAPI void @@ -3643,7 +3643,7 @@ _password_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->password; + if (ret) *ret = sd->password; } EAPI void @@ -3735,10 +3735,10 @@ _is_empty(Eo *obj EINA_UNUSED, void *_pd, va_list *list) will be removed once evas 1.0 is out */ cur = evas_object_textblock_cursor_new((Evas_Object *)tb); evas_textblock_cursor_pos_set(cur, 0); - *ret = evas_textblock_cursor_char_next(cur); + if (ret) *ret = evas_textblock_cursor_char_next(cur); evas_textblock_cursor_free(cur); - *ret = !*ret; + if (ret) *ret = !*ret; } EAPI Evas_Object * @@ -3756,8 +3756,9 @@ _textblock_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Evas_Object **ret = va_arg(*list, Evas_Object **); Elm_Entry_Smart_Data *sd = _pd; - *ret = (Evas_Object *)edje_object_part_object_get - (sd->entry_edje, "elm.text"); + if (ret) + *ret = (Evas_Object *)edje_object_part_object_get + (sd->entry_edje, "elm.text"); } EAPI void @@ -3791,10 +3792,10 @@ _selection_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) { const char **ret = va_arg(*list, const char **); Elm_Entry_Smart_Data *sd = _pd; - *ret = NULL; + if (ret) *ret = NULL; if ((sd->password)) return; - *ret = edje_object_part_text_selection_get(sd->entry_edje, "elm.text"); + if (ret) *ret = edje_object_part_text_selection_get(sd->entry_edje, "elm.text"); } EAPI void @@ -3830,7 +3831,7 @@ _selection_handler_disabled_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->sel_handler_disabled; + if (ret) *ret = sd->sel_handler_disabled; } EAPI void @@ -3887,7 +3888,7 @@ _line_wrap_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Elm_Wrap_Type *ret = va_arg(*list, Elm_Wrap_Type *); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->line_wrap; + if (ret) *ret = sd->line_wrap; } EAPI void @@ -3937,7 +3938,7 @@ _editable_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->editable; + if (ret) *ret = sd->editable; } EAPI void @@ -4034,8 +4035,8 @@ _cursor_next(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Entry_Smart_Data *sd = _pd; - *ret = edje_object_part_text_cursor_next - (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN); + if (ret) *ret = edje_object_part_text_cursor_next + (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN); } EAPI Eina_Bool @@ -4053,7 +4054,7 @@ _cursor_prev(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Entry_Smart_Data *sd = _pd; - *ret = edje_object_part_text_cursor_prev + if (ret) *ret = edje_object_part_text_cursor_prev (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN); } @@ -4072,7 +4073,7 @@ _cursor_up(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Entry_Smart_Data *sd = _pd; - *ret = edje_object_part_text_cursor_up + if (ret) *ret = edje_object_part_text_cursor_up (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN); } @@ -4091,7 +4092,7 @@ _cursor_down(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Entry_Smart_Data *sd = _pd; - *ret = edje_object_part_text_cursor_down + if (ret) *ret = edje_object_part_text_cursor_down (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN); } @@ -4204,7 +4205,7 @@ _cursor_is_format_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Entry_Smart_Data *sd = _pd; - *ret = edje_object_part_text_cursor_is_format_get + if (ret) *ret = edje_object_part_text_cursor_is_format_get (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN); } @@ -4223,7 +4224,7 @@ _cursor_is_visible_format_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Entry_Smart_Data *sd = _pd; - *ret = edje_object_part_text_cursor_is_visible_format_get + if (ret) *ret = edje_object_part_text_cursor_is_visible_format_get (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN); } @@ -4242,7 +4243,7 @@ _cursor_content_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) char **ret = va_arg(*list, char **); Elm_Entry_Smart_Data *sd = _pd; - *ret = edje_object_part_text_cursor_content_get + if (ret) *ret = edje_object_part_text_cursor_content_get (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN); } @@ -4280,7 +4281,7 @@ _cursor_pos_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) int *ret = va_arg(*list, int *); Elm_Entry_Smart_Data *sd = _pd; - *ret = edje_object_part_text_cursor_pos_get + if (ret) *ret = edje_object_part_text_cursor_pos_get (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN); } @@ -4424,7 +4425,7 @@ _context_menu_disabled_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Entry_Smart_Data *sd = _pd; - *ret = !sd->context_menu; + if (ret) *ret = !sd->context_menu; } EAPI const char * @@ -4907,7 +4908,7 @@ _autosave_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->auto_save; + if (ret) *ret = sd->auto_save; } EINA_DEPRECATED EAPI void @@ -4976,7 +4977,7 @@ _cnp_mode_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Elm_Cnp_Mode *ret = va_arg(*list, Elm_Cnp_Mode *); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->cnp_mode; + if (ret) *ret = sd->cnp_mode; } EAPI void @@ -5068,7 +5069,7 @@ _scrollable_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->scroll; + if (ret) *ret = sd->scroll; } EAPI void @@ -5203,7 +5204,7 @@ _input_panel_layout_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Elm_Input_Panel_Layout *ret = va_arg(*list, Elm_Input_Panel_Layout *); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->input_panel_layout; + if (ret) *ret = sd->input_panel_layout; } EAPI void @@ -5242,7 +5243,7 @@ _input_panel_layout_variation_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) int *ret = va_arg(*list, int *); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->input_panel_layout_variation; + if (ret) *ret = sd->input_panel_layout_variation; } EAPI void @@ -5279,7 +5280,7 @@ _autocapital_type_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Elm_Autocapital_Type *ret = va_arg(*list, Elm_Autocapital_Type *); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->autocapital_type; + if (ret) *ret = sd->autocapital_type; } EAPI void @@ -5316,7 +5317,7 @@ _prediction_allow_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->prediction_allow; + if (ret) *ret = sd->prediction_allow; } EAPI void @@ -5368,7 +5369,7 @@ _input_panel_enabled_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->input_panel_enable; + if (ret) *ret = sd->input_panel_enable; } EAPI void @@ -5435,7 +5436,7 @@ _input_panel_language_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Elm_Input_Panel_Lang *ret = va_arg(*list, Elm_Input_Panel_Lang *); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->input_panel_lang; + if (ret) *ret = sd->input_panel_lang; } EAPI void @@ -5522,7 +5523,7 @@ _input_panel_return_key_type_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Elm_Input_Panel_Return_Key_Type *ret = va_arg(*list, Elm_Input_Panel_Return_Key_Type *); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->input_panel_return_key_type; + if (ret) *ret = sd->input_panel_return_key_type; } EAPI void @@ -5560,7 +5561,7 @@ _input_panel_return_key_disabled_get(Eo *obj EINA_UNUSED, void *_pd, va_list *li Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->input_panel_return_key_disabled; + if (ret) *ret = sd->input_panel_return_key_disabled; } EAPI void @@ -5594,6 +5595,8 @@ static void _imf_context_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) { void **ret = va_arg(*list, void **); + if (!ret) return; + *ret = NULL; Elm_Entry_Smart_Data *sd = _pd; if (!sd) return; @@ -5653,7 +5656,7 @@ _anchor_hover_parent_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) Evas_Object **ret = va_arg(*list, Evas_Object **); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->anchor_hover.hover_parent; + if (ret) *ret = sd->anchor_hover.hover_parent; } EAPI void @@ -5688,7 +5691,7 @@ _anchor_hover_style_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) const char **ret = va_arg(*list, const char **); Elm_Entry_Smart_Data *sd = _pd; - *ret = sd->anchor_hover.hover_style; + if (ret) *ret = sd->anchor_hover.hover_style; } EAPI void @@ -5712,14 +5715,14 @@ static void _elm_entry_smart_focus_next_manager_is(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) { Eina_Bool *ret = va_arg(*list, Eina_Bool *); - *ret = EINA_FALSE; + if (ret) *ret = EINA_FALSE; } static void _elm_entry_smart_focus_direction_manager_is(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) { Eina_Bool *ret = va_arg(*list, Eina_Bool *); - *ret = EINA_FALSE; + if (ret) *ret = EINA_FALSE; } static void --
