From a1d5eba45374da9a3a38b4ac8ba240f01ceb93db Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Thu, 12 Sep 2013 22:14:16 +0900 Subject: [PATCH] enventor - fixed all warnings. cool! --- src/bin/ctxpopup.c | 11 +++++++---- src/bin/dummy_obj.c | 2 +- src/bin/edc_editor.c | 36 ++++++++++++++++++------------------ src/bin/edc_parser.c | 10 +++++----- src/bin/edj_viewer.c | 14 +++++++------- src/bin/indent.c | 3 ++- src/bin/main.c | 3 ++- 7 files changed, 42 insertions(+), 37 deletions(-) diff --git a/src/bin/ctxpopup.c b/src/bin/ctxpopup.c index 15174c2..f3abf2d 100644 --- a/src/bin/ctxpopup.c +++ b/src/bin/ctxpopup.c @@ -35,7 +35,7 @@ btn_minus_cb(void *data, Evas_Object *obj EINA_UNUSED, } static void -ctxpopup_it_cb(void *data, Evas_Object *obj, void *event_info) +ctxpopup_it_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info) { Elm_Object_Item *it = event_info; ctxpopup_data *ctxdata = evas_object_data_get(obj, "ctxpopup_data"); @@ -44,7 +44,8 @@ ctxpopup_it_cb(void *data, Evas_Object *obj, void *event_info) } static void -slider_dismiss_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) +slider_dismiss_cb(void *data EINA_UNUSED, Evas_Object *obj, + void *event_info EINA_UNUSED) { Evas_Object *layout = elm_object_content_get(obj); Evas_Object *slider = elm_object_part_content_get(layout, @@ -75,7 +76,8 @@ slider_dismiss_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) } static void -ctxpopup_del_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) +ctxpopup_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { free(data); } @@ -175,7 +177,8 @@ ctxpopup_candidate_list_create(Evas_Object *parent, attr_value *attr, } static void -ctxpopup_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) +ctxpopup_key_down_cb(void *data, Evas *e EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Key_Down *ev = event_info; ctxpopup_data *ctxdata = data; diff --git a/src/bin/dummy_obj.c b/src/bin/dummy_obj.c index 1441b07..d807c3f 100644 --- a/src/bin/dummy_obj.c +++ b/src/bin/dummy_obj.c @@ -73,7 +73,7 @@ dummy_objs_update(dummy_obj *dummy) if (edje_object_part_swallow_get(dummy->layout, part_name)) continue; - part_obj *po = malloc(sizeof(part_obj)); + po = malloc(sizeof(part_obj)); if (!po) continue; //New part. Add fake object. diff --git a/src/bin/edc_editor.c b/src/bin/edc_editor.c index 4f322ed..40ae850 100644 --- a/src/bin/edc_editor.c +++ b/src/bin/edc_editor.c @@ -140,7 +140,7 @@ indent_apply(edit_data *ed) int space = indent_space_get(ed); //Alloc Empty spaces - char *p = alloca(space) + 1; + char *p = alloca(space + 1); memset(p, ' ', space); p[space] = '\0'; @@ -148,7 +148,7 @@ indent_apply(edit_data *ed) } static void -edit_changed_cb(void *data, Evas_Object *obj, void *event_info) +edit_changed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) { Elm_Entry_Change_Info *info = event_info; edit_data *ed = data; @@ -230,7 +230,8 @@ edit_save(edit_data *ed) } static void -ctxpopup_candidate_dismiss_cb(void *data, Evas_Object *obj, void *event_info) +ctxpopup_candidate_dismiss_cb(void *data, Evas_Object *obj, + void *event_info EINA_UNUSED) { edit_data *ed = data; evas_object_del(obj); @@ -250,7 +251,8 @@ ctxpopup_candidate_selected_cb(void *data, Evas_Object *obj, void *event_info) } static void -ctxpopup_preview_dismiss_cb(void *data, Evas_Object *obj, void *event_info) +ctxpopup_preview_dismiss_cb(void *data, Evas_Object *obj, + void *event_info EINA_UNUSED) { edit_data *ed = data; int skip_focus = (int) evas_object_data_get(obj, "continue"); @@ -262,13 +264,6 @@ ctxpopup_preview_dismiss_cb(void *data, Evas_Object *obj, void *event_info) elm_object_focus_set(ed->en_edit, EINA_TRUE); } -static void -ctxpopup_preview_selected_cb(void *data, Evas_Object *obj, void *event_info) -{ - edit_data *ed = data; - elm_ctxpopup_dismiss(obj); -} - void edit_template_insert(edit_data *ed) { @@ -317,7 +312,7 @@ edit_template_insert(edit_data *ed) int space = indent_space_get(ed); //Alloc Empty spaces - char *p = alloca(space) + 1; + char *p = alloca(space + 1); memset(p, ' ', space); p[space] = '\0'; @@ -349,7 +344,7 @@ edit_template_part_insert(edit_data *ed, Edje_Part_Type type) int space = indent_space_get(ed); //Alloc Empty spaces - char *p = alloca(space) + 1; + char *p = alloca(space + 1); memset(p, ' ', space); p[space] = '\0'; @@ -386,7 +381,14 @@ edit_template_part_insert(edit_data *ed, Edje_Part_Type type) strcpy(part, "Spacer"); break; case EDJE_PART_TYPE_IMAGE: - defaut: + case EDJE_PART_TYPE_NONE: + case EDJE_PART_TYPE_GRADIENT: + case EDJE_PART_TYPE_GROUP: + case EDJE_PART_TYPE_BOX: + case EDJE_PART_TYPE_TABLE: + case EDJE_PART_TYPE_EXTERNAL: + case EDJE_PART_TYPE_PROXY: + case EDJE_PART_TYPE_LAST: line_cnt = TEMPLATE_PART_IMAGE_LINE_CNT; t = (char **) &TEMPLATE_PART_IMAGE; strcpy(part, "Image"); @@ -599,10 +601,8 @@ edit_cursor_double_clicked_cb(void *data, Evas_Object *obj, image_preview_show(ed, cur, x, y); } else - { - candidate_list_show(ed, text, cur, selected); - } -end: + candidate_list_show(ed, text, cur, selected); + if (selected) free(selected); if (text) free(text); } diff --git a/src/bin/edc_parser.c b/src/bin/edc_parser.c index 8aed35f..26b41c6 100644 --- a/src/bin/edc_parser.c +++ b/src/bin/edc_parser.c @@ -176,7 +176,7 @@ parser_type_init(parser_data *pd) char *parser_name_get(parser_data *pd EINA_UNUSED, const char *cur) { - if (!cur) return; + if (!cur) return NULL; char *p = (char *) cur; char *end; @@ -382,7 +382,7 @@ part_name_thread_cancel(void *data, Ecore_Thread *thread EINA_UNUSED) } const char * -parser_paragh_name_get(parser_data *pd, Evas_Object *entry) +parser_paragh_name_get(parser_data *pd EINA_UNUSED, Evas_Object *entry) { //FIXME: list up groups #define GROUP_CNT 13 @@ -411,13 +411,13 @@ parser_paragh_name_get(parser_data *pd, Evas_Object *entry) Evas_Object *tb = elm_entry_textblock_get(entry); char *text = (char *) evas_object_textblock_text_markup_get(tb); - if (!text) return; + if (!text) return NULL; char *utf8 = elm_entry_markup_to_utf8(text); - if (!utf8) return; + if (!utf8) return NULL; int cur_pos = elm_entry_cursor_pos_get(entry); - if (cur_pos < 1) return 0; + if (cur_pos < 1) return NULL; const char *quot = QUOT; int quot_len = QUOT_LEN; diff --git a/src/bin/edj_viewer.c b/src/bin/edj_viewer.c index f42e73a..dec32ae 100644 --- a/src/bin/edj_viewer.c +++ b/src/bin/edj_viewer.c @@ -20,7 +20,7 @@ struct viewer_s Eina_Stringshare *part_name; Eina_Bool view_reload; - Eina_Bool dummy_obj; + Eina_Bool dummy_on; }; static void @@ -173,7 +173,7 @@ view_obj_idler_cb(void *data) event_layer_set(vd); elm_object_content_set(vd->scroller, vd->layout); - if (vd->dummy_obj) + if (vd->dummy_on) dummy_obj_new(vd->layout); return ECORE_CALLBACK_CANCEL; @@ -182,9 +182,9 @@ view_obj_idler_cb(void *data) void view_dummy_toggle(view_data *vd, Eina_Bool msg) { - Eina_Bool dummy_obj = config_dummy_swallow_get(vd->cd); - if (dummy_obj == vd->dummy_obj) return; - if (dummy_obj) + Eina_Bool dummy_on = config_dummy_swallow_get(vd->cd); + if (dummy_on == vd->dummy_on) return; + if (dummy_on) { if (msg) stats_info_msg_update(vd->sd, "Dummy Swallow Enabled."); dummy_obj_new(vd->layout); @@ -195,7 +195,7 @@ view_dummy_toggle(view_data *vd, Eina_Bool msg) dummy_obj_del(vd->layout); } - vd->dummy_obj = dummy_obj; + vd->dummy_on = dummy_on; } void @@ -226,7 +226,7 @@ view_init(Evas_Object *parent, const char *group, stats_data *sd, vd->sd = sd; vd->cd = cd; vd->scroller = view_scroller_create(parent); - vd->dummy_obj = config_dummy_swallow_get(cd); + vd->dummy_on = config_dummy_swallow_get(cd); view_new(vd, group); diff --git a/src/bin/indent.c b/src/bin/indent.c index 02e0698..8bab01c 100644 --- a/src/bin/indent.c +++ b/src/bin/indent.c @@ -11,6 +11,7 @@ indent_data * indent_init(Eina_Strbuf *strbuf) { indent_data *id = malloc(sizeof(indent_data)); + id->strbuf = strbuf; return id; } @@ -21,7 +22,7 @@ indent_term(indent_data *id) } int -indent_depth_get(indent_data *id, char *src, int pos) +indent_depth_get(indent_data *id EINA_UNUSED, char *src, int pos) { if (!src || (pos < 1)) return 0; diff --git a/src/bin/main.c b/src/bin/main.c index b33f5f2..07e851c 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -627,7 +627,8 @@ term(app_data *ad) int main(int argc, char **argv) { - app_data ad = { 0 }; + app_data ad; + memset(&ad, 0x00, sizeof(ad)); if (!init(&ad, argc, argv)) {