hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=925bc6f06e4141a613903e49f8336c56ce656f0f
commit 925bc6f06e4141a613903e49f8336c56ce656f0f Author: ChunEon Park <[email protected]> Date: Wed Aug 6 18:02:54 2014 +0900 fix shadow, unused build warnings. --- src/bin/auto_comp.c | 2 +- src/bin/edc_editor.c | 13 +++++++------ src/bin/goto.c | 3 ++- src/bin/menu.c | 4 +--- src/bin/newfile.c | 11 ++++++----- src/bin/search.c | 6 ++++-- src/bin/syntax_color.c | 28 ++++++++++++++-------------- 7 files changed, 35 insertions(+), 32 deletions(-) diff --git a/src/bin/auto_comp.c b/src/bin/auto_comp.c index a0345c6..56d4bf9 100644 --- a/src/bin/auto_comp.c +++ b/src/bin/auto_comp.c @@ -392,7 +392,7 @@ entry_changed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) } static void -entry_cursor_changed_manual_cb(void *data, Evas_Object *obj, +entry_cursor_changed_manual_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { autocomp_data *ad = data; diff --git a/src/bin/edc_editor.c b/src/bin/edc_editor.c index fefc0f5..9df4f25 100644 --- a/src/bin/edc_editor.c +++ b/src/bin/edc_editor.c @@ -93,9 +93,9 @@ entry_recover(edit_data *ed, int cursor_pos) if (ed->select_pos == -1) return; //recover selection region - const char *select = elm_entry_selection_get(ed->en_edit); - if (!select) return; - char *utf8 = evas_textblock_text_markup_to_utf8(NULL, select); + const char *selected = elm_entry_selection_get(ed->en_edit); + if (!selected) return; + char *utf8 = evas_textblock_text_markup_to_utf8(NULL, selected); ed->on_select_recover = EINA_TRUE; elm_entry_select_none(ed->en_edit); elm_entry_select_region_set(ed->en_edit, ed->select_pos, cursor_pos); @@ -144,7 +144,7 @@ syntax_color_timer_cb(void *data) } static void -syntax_color_partial_update(edit_data *ed, double time) +syntax_color_partial_update(edit_data *ed, double interval) { /* If the syntax_color_full_update is requested forcely, lock would be -1 in this case, it should avoid partial updation by entry changed. */ @@ -152,7 +152,7 @@ syntax_color_partial_update(edit_data *ed, double time) ecore_thread_cancel(ed->syntax_color_thread); ed->syntax_color_thread = NULL; ecore_timer_del(ed->syntax_color_timer); - ed->syntax_color_timer = ecore_timer_add(time, syntax_color_timer_cb, ed); + ed->syntax_color_timer = ecore_timer_add(interval, syntax_color_timer_cb, ed); } static void @@ -949,7 +949,8 @@ scroller_scroll_cb(void *data, Evas_Object *obj EINA_UNUSED, } static void -scroller_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) +scroller_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, + void *event_info EINA_UNUSED) { edit_data *ed = data; Evas_Coord h; diff --git a/src/bin/goto.c b/src/bin/goto.c index edc844b..13772ce 100644 --- a/src/bin/goto.c +++ b/src/bin/goto.c @@ -43,7 +43,8 @@ goto_line(goto_data *gd) } static void -entry_activated_cb(void *data, Evas_Object *obj, void* event_info EINA_UNUSED) +entry_activated_cb(void *data, Evas_Object *obj EINA_UNUSED, + void* event_info EINA_UNUSED) { goto_data *gd = data; if (elm_object_disabled_get(gd->btn)) return; diff --git a/src/bin/menu.c b/src/bin/menu.c index e7296e5..c0aa656 100644 --- a/src/bin/menu.c +++ b/src/bin/menu.c @@ -280,10 +280,9 @@ about_btn_cb(void *data, Evas_Object *obj EINA_UNUSED, } static void -setting_btn_cb(void *data, Evas_Object *obj EINA_UNUSED, +setting_btn_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { - menu_data *md = data; setting_open(); } @@ -691,7 +690,6 @@ menu_about(void) void menu_setting(void) { - menu_data *md = g_md; setting_open(); } diff --git a/src/bin/newfile.c b/src/bin/newfile.c index 485c2da..abdb2db 100644 --- a/src/bin/newfile.c +++ b/src/bin/newfile.c @@ -9,10 +9,10 @@ typedef struct new_data_s { static new_data *g_nd = NULL; static void -list_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, +list_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { - new_data *nd = g_nd; + new_data *nd = data; free(nd); g_nd = NULL; } @@ -61,7 +61,7 @@ newfile_default_set(void) } static void -file_dir_list_cb(const char *name, const char *path, void *data) +file_dir_list_cb(const char *name, const char *path EINA_UNUSED, void *data) { new_data *nd = data; @@ -75,7 +75,8 @@ file_dir_list_cb(const char *name, const char *path, void *data) } static void -list_item_selected_cb(void *data, Evas_Object *obj, void *event_info) +list_item_selected_cb(void *data, Evas_Object *obj EINA_UNUSED, + void *event_info) { Evas_Object *layout = data; Elm_Object_Item *it = event_info; @@ -157,7 +158,7 @@ newfile_create(Evas_Object *parent, Evas_Smart_Cb selected_cb, void *data) first_item = EINA_FALSE; } } - evas_object_event_callback_add(list, EVAS_CALLBACK_DEL, list_del_cb, NULL); + evas_object_event_callback_add(list, EVAS_CALLBACK_DEL, list_del_cb, nd); evas_object_show(list); elm_object_focus_set(list, EINA_TRUE); diff --git a/src/bin/search.c b/src/bin/search.c index 3a5abe4..bf652eb 100644 --- a/src/bin/search.c +++ b/src/bin/search.c @@ -280,7 +280,8 @@ replace_activated_cb(void *data, Evas_Object *obj EINA_UNUSED, } static void -win_focused_cb(void *data, Evas_Object *obj, void *event_info) +win_focused_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { search_data *sd = g_sd; edit_syntax_color_full_apply(sd->ed, EINA_FALSE); @@ -293,7 +294,8 @@ win_focused_cb(void *data, Evas_Object *obj, void *event_info) } static void -win_unfocused_cb(void *data, Evas_Object *obj, void *event_info) +win_unfocused_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { search_data *sd = g_sd; edit_syntax_color_partial_apply(sd->ed); diff --git a/src/bin/syntax_color.c b/src/bin/syntax_color.c index 2f0a54f..2164a89 100644 --- a/src/bin/syntax_color.c +++ b/src/bin/syntax_color.c @@ -87,7 +87,7 @@ eddc_term(void) } static void -color_load(color_data *cd) +color_load() { char buf[PATH_MAX]; snprintf(buf, sizeof(buf), "%s/color/color.eet", elm_app_data_dir_get()); @@ -159,7 +159,7 @@ color_table_init(color_data *cd) } static void -macro_key_push(color_data *cd, char *str, int len) +macro_key_push(color_data *cd, char *str) { char *key = str; @@ -200,7 +200,7 @@ init_thread_blocking(void *data, Ecore_Thread *thread EINA_UNUSED) color_data *cd = data; eddc_init(); - color_load(cd); + color_load(); eddc_term(); color_table_init(cd); @@ -250,12 +250,12 @@ color_term(color_data *cd) static Eina_Bool color_markup_insert_internal(Eina_Strbuf *strbuf, const char **src, int length, char **cur, char **prev, const char *cmp, - Eina_Stringshare *color) + Eina_Stringshare *col) { char buf[128]; eina_strbuf_append_length(strbuf, *prev, *cur - *prev); - snprintf(buf, sizeof(buf), "<color=#%s>%s</color>", color, cmp); + snprintf(buf, sizeof(buf), "<color=#%s>%s</color>", col, cmp); eina_strbuf_append(strbuf, buf); *cur += strlen(cmp); if (*cur > (*src + length)) return EINA_FALSE; @@ -293,7 +293,7 @@ markup_skip(Eina_Strbuf *strbuf, const char **src, int length, char **cur, static int comment_apply(Eina_Strbuf *strbuf, const char **src, int length, char **cur, - char **prev, const Eina_Stringshare *color, + char **prev, const Eina_Stringshare *col, Eina_Bool *inside_comment) { if (!(*inside_comment)) @@ -305,7 +305,7 @@ comment_apply(Eina_Strbuf *strbuf, const char **src, int length, char **cur, eina_strbuf_append_length(strbuf, *prev, (*cur - *prev)); char buf[128]; - snprintf(buf, sizeof(buf), "<color=#%s>/*", color); + snprintf(buf, sizeof(buf), "<color=#%s>/*", col); eina_strbuf_append(strbuf, buf); int cmp_size = 2; //strlen("/*"); @@ -361,7 +361,7 @@ comment_apply(Eina_Strbuf *strbuf, const char **src, int length, char **cur, static int comment2_apply(Eina_Strbuf *strbuf, const char **src, int length, char **cur, - char **prev, const Eina_Stringshare *color, + char **prev, const Eina_Stringshare *col, Eina_Bool *inside_comment) { if (*inside_comment) return 0; @@ -372,7 +372,7 @@ comment2_apply(Eina_Strbuf *strbuf, const char **src, int length, char **cur, eina_strbuf_append_length(strbuf, *prev, (*cur - *prev)); char buf[128]; - snprintf(buf, sizeof(buf), "<color=#%s>//", color); + snprintf(buf, sizeof(buf), "<color=#%s>//", col); eina_strbuf_append(strbuf, buf); int cmp_size = 2; //strlen("//"); @@ -406,7 +406,7 @@ comment2_apply(Eina_Strbuf *strbuf, const char **src, int length, char **cur, static int string_apply(Eina_Strbuf *strbuf, char **cur, char **prev, - const Eina_Stringshare *color, Eina_Bool inside_string) + const Eina_Stringshare *col, Eina_Bool inside_string) { //escape string: " ~ " if ((*cur)[0] != QUOT_C) return 0; @@ -415,7 +415,7 @@ string_apply(Eina_Strbuf *strbuf, char **cur, char **prev, if (!inside_string) { - snprintf(buf, sizeof(buf), "<color=#%s>", color); + snprintf(buf, sizeof(buf), "<color=#%s>", col); eina_strbuf_append(strbuf, buf); } @@ -435,7 +435,7 @@ string_apply(Eina_Strbuf *strbuf, char **cur, char **prev, static int macro_apply(Eina_Strbuf *strbuf, const char **src, int length, char **cur, - char **prev, const Eina_Stringshare *color, color_data *cd) + char **prev, const Eina_Stringshare *col, color_data *cd) { if ((*cur)[0] != '#') return 0; @@ -486,7 +486,7 @@ macro_apply(Eina_Strbuf *strbuf, const char **src, int length, char **cur, eina_strbuf_append_length(strbuf, *prev, (*cur - *prev)); char buf[128]; - snprintf(buf, sizeof(buf), "<color=#%s>#", color); + snprintf(buf, sizeof(buf), "<color=#%s>#", col); eina_strbuf_append(strbuf, buf); int cmp_size = 1; //strlen("#"); @@ -503,7 +503,7 @@ macro_apply(Eina_Strbuf *strbuf, const char **src, int length, char **cur, ((macro_begin[0] < '0') || (macro_begin[0] > '9'))) { char *macro = strndup(macro_begin, (macro_end - macro_begin)); - macro_key_push(cd, macro, (macro_end - macro_begin)); + macro_key_push(cd, macro); free(macro); } --
