From 3af6ede5e558c7e6d352bdccf381fd662b7fa5a5 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Andre <jp.andre@samsung.com>
Date: Wed, 10 Aug 2016 15:05:13 +0900
Subject: [PATCH] clang: Fix warnings and compilation errors

enventor wouldn't compile with clang. Also, it would print
a lot of warnings.
---
 src/bin/console.c        |  2 +-
 src/bin/file_browser.c   |  6 +++---
 src/bin/file_mgr.c       |  2 +-
 src/bin/help.c           |  4 ++--
 src/bin/live_edit.c      |  1 -
 src/bin/main.c           |  6 +++---
 src/include/console.h    |  2 +-
 src/lib/auto_comp.c      |  1 +
 src/lib/ctxpopup.c       |  2 +-
 src/lib/dummy_obj.c      |  4 ++--
 src/lib/edc_editor.c     |  2 +-
 src/lib/edc_parser.c     |  6 ++++--
 src/lib/enventor_smart.c |  5 ++++-
 src/lib/reference.c      |  3 +--
 src/lib/syntax_color.c   | 14 +++++++-------
 src/lib/syntax_indent.c  |  2 +-
 src/lib/wireframes_obj.c |  7 ++++---
 17 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/src/bin/console.c b/src/bin/console.c
index 7ba99d1..1eabfae 100644
--- a/src/bin/console.c
+++ b/src/bin/console.c
@@ -85,7 +85,7 @@ set_console_error_msg(Evas_Object *console, const char *src)
    free(color_msg);
 }
 
-static char*
+char*
 error_msg_syntax_color_set(char *text)
 {
    char *color_error_msg;
diff --git a/src/bin/file_browser.c b/src/bin/file_browser.c
index 0522bf3..9dbbb84 100644
--- a/src/bin/file_browser.c
+++ b/src/bin/file_browser.c
@@ -132,7 +132,7 @@ file_genlist_item_append(brows_file *file, Elm_Object_Item *parent_it,
    //Keep Main Item
    if (file->main)
      {
-        brows_data *bd = g_bd;
+        bd = g_bd;
         bd->main_it = file->it;
      }
 
@@ -261,7 +261,7 @@ gl_contract_request_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, voi
 }
 
 static void
-gl_expanded_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info)
+gl_expanded_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
 {
    brows_data *bd = g_bd;
    if (!bd) return;
@@ -300,7 +300,7 @@ gl_expanded_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info)
 }
 
 static void
-gl_contracted_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info)
+gl_contracted_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
 {
    brows_data *bd = g_bd;
    if (!bd) return;
diff --git a/src/bin/file_mgr.c b/src/bin/file_mgr.c
index 597b75a..ba9d6f3 100644
--- a/src/bin/file_mgr.c
+++ b/src/bin/file_mgr.c
@@ -289,7 +289,6 @@ file_mgr_main_file_set(const char *path)
           }
      }
 
-   Eina_List *list;
    Enventor_Item *it;
 
    //If this file is already openend with sub file, remove it.
@@ -457,4 +456,5 @@ file_mgr_file_open(const char *file_path)
 
    //This selected file hasn't been opened yet, so let's open this file newly.
    file_mgr_sub_file_add(file_path, EINA_TRUE);
+   return EINA_TRUE;
 }
diff --git a/src/bin/help.c b/src/bin/help.c
index 6be9d2f..1c63bca 100644
--- a/src/bin/help.c
+++ b/src/bin/help.c
@@ -41,7 +41,7 @@ win_moved_cb(void *data EINA_UNUSED, Evas_Object *obj,
 }
 
 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 EINA_UNUSED)
 {
    Evas_Object *layout;
    Evas_Object *label;
@@ -100,7 +100,7 @@ list_item_selected_cb(void *data, Evas_Object *obj, void *event_info)
 }
 
 static void
-button_clicked_cb(void *data, Evas_Object *obj, void *event_info)
+button_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Evas_Object *layout = g_layout;
    Evas_Object *list = elm_object_part_content_get(layout, "swallow_list");
diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index d3e9a20..535372f 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -1957,7 +1957,6 @@ info_text_init(live_data *ld)
    int i;
    Evas *e = evas_object_evas_get(ld->layout);
    double scale = elm_config_scale_get();
-   Evas_Object *view_obj = view_obj_get(ld);
    for (i = 0; i < Info_Text_Cnt; i++)
      {
         Evas_Object *text = evas_object_text_add(e);
diff --git a/src/bin/main.c b/src/bin/main.c
index 1d58782..ead19bc 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -473,7 +473,7 @@ enventor_live_view_resized_cb(void *data EINA_UNUSED,
 }
 
 static void
-enventor_live_view_loaded_cb(void *data EINA_UNUSED, Enventor_Object *obj,
+enventor_live_view_loaded_cb(void *data EINA_UNUSED, Enventor_Object *obj EINA_UNUSED,
                              void *event_info EINA_UNUSED)
 {
    base_edc_navigator_group_update();
@@ -556,8 +556,8 @@ enventor_ctxpopup_dismissed_cb(void *data EINA_UNUSED, Enventor_Object *obj,
 }
 
 static void
-enventor_file_open_requested_cb(void *data EINA_UNUSED, Enventor_Object *obj,
-                                void *event_info EINA_UNUSED)
+enventor_file_open_requested_cb(void *data EINA_UNUSED, Enventor_Object *obj EINA_UNUSED,
+                                void *event_info)
 {
    const char *file_name = event_info;
    file_mgr_file_open(file_name);
diff --git a/src/include/console.h b/src/include/console.h
index 8bf340d..eef7f49 100644
--- a/src/include/console.h
+++ b/src/include/console.h
@@ -2,4 +2,4 @@
 
 Evas_Object *console_create(Evas_Object *parent);
 void console_text_set(Evas_Object *console, const char *text);
-static char *error_msg_syntax_color_set(char *text);
+char *error_msg_syntax_color_set(char *text);
diff --git a/src/lib/auto_comp.c b/src/lib/auto_comp.c
index d757ced..c7a030c 100644
--- a/src/lib/auto_comp.c
+++ b/src/lib/auto_comp.c
@@ -738,6 +738,7 @@ entry_changed_cb(void *data, Evas_Object *obj EINA_UNUSED,
         if (info->change.del.content[0] != ' ')
           {
              entry_anchor_off(ad);
+             /* FIXME: abs() shouldn't be used here (size_t is unsigned) */
              int cnt = abs(info->change.del.end - info->change.del.start);
              pop_char(ad, cnt);
           }
diff --git a/src/lib/ctxpopup.c b/src/lib/ctxpopup.c
index 6b234ca..44a7aeb 100644
--- a/src/lib/ctxpopup.c
+++ b/src/lib/ctxpopup.c
@@ -721,7 +721,7 @@ candidate_reset(ctxpopup_data *ctxdata)
         colorselector_changed_cb(ctxdata, ctxdata->colorselector, NULL);
      }
    //Toggle Candidate
-   else if ((attr->type == ATTR_VALUE_BOOLEAN))
+   else if (attr->type == ATTR_VALUE_BOOLEAN)
      {
         Eina_List *l;
         Evas_Object *toggle;
diff --git a/src/lib/dummy_obj.c b/src/lib/dummy_obj.c
index 874e00c..c30685b 100644
--- a/src/lib/dummy_obj.c
+++ b/src/lib/dummy_obj.c
@@ -61,7 +61,7 @@ dummy_objs_update(dummy_obj *dummy)
              if (!strcmp(po->name, part_name))
                {
                   type = edje_edit_part_type_get(dummy->layout, part_name);
-                  if ((type == EDJE_PART_TYPE_SWALLOW))
+                  if (type == EDJE_PART_TYPE_SWALLOW)
                     removed = EINA_FALSE;
                   break;
                }
@@ -87,7 +87,7 @@ dummy_objs_update(dummy_obj *dummy)
              if (!strcmp(po->name, part_name))
                {
                   type = edje_edit_part_type_get(dummy->layout, part_name);
-                  if ((type == EDJE_PART_TYPE_SPACER))
+                  if (type == EDJE_PART_TYPE_SPACER)
                     removed = EINA_FALSE;
                   break;
                }
diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c
index 4d3f3b3..985123a 100644
--- a/src/lib/edc_editor.c
+++ b/src/lib/edc_editor.c
@@ -984,7 +984,7 @@ edit_link_activate(edit_data *ed)
 
    //Case 1. File Link?
    char *file_link = utf8;
-   if (file_link = strstr(utf8, "#include "))
+   if ((file_link = strstr(utf8, "#include ")) != NULL)
      {
         file_link += 9; //strlen("#include "))
         char *name_begin = strstr(utf8, "\"");
diff --git a/src/lib/edc_parser.c b/src/lib/edc_parser.c
index fc247f4..3533231 100644
--- a/src/lib/edc_parser.c
+++ b/src/lib/edc_parser.c
@@ -1855,7 +1855,7 @@ parser_styles_pos_get(const Evas_Object *entry, int *ret)
 Eina_Bool
 parser_is_image_name(const Evas_Object *entry, const char *str)
 {
-   int start_pos, end_pos, i;
+   int start_pos, end_pos = -1, i;
    if (!parser_collections_block_pos_get(entry, "images", &start_pos))
      return EINA_FALSE;
 
@@ -1870,6 +1870,8 @@ parser_is_image_name(const Evas_Object *entry, const char *str)
            break;
         }
 
+   if (end_pos < 0) return EINA_FALSE;
+
    char *candidate_str = alloca(end_pos - start_pos + 1);
    const char *src_str = elm_entry_markup_to_utf8(str);
    strncpy(candidate_str, utf8 + start_pos, end_pos - start_pos);
@@ -1921,7 +1923,7 @@ parser_bracket_find(parser_data *pd, Evas_Object *entry,
 }
 
 Eina_List *
-parser_group_list_get(parser_data *pd, Evas_Object *entry)
+parser_group_list_get(parser_data *pd EINA_UNUSED, Evas_Object *entry)
 {
    const char *markup = elm_entry_entry_get(entry);
    char *utf8 = elm_entry_markup_to_utf8(markup);
diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c
index 5dd5f6b..e20a9ac 100644
--- a/src/lib/enventor_smart.c
+++ b/src/lib/enventor_smart.c
@@ -3,6 +3,7 @@
 #endif
 
 #define ELM_INTERNAL_API_ARGESFSDFEFC 1
+#define EFL_CANVAS_OBJECT_PROTECTED 1
 
 #include <Enventor.h>
 #include <Eio.h>
@@ -598,7 +599,7 @@ EOLIAN static Eina_Bool
 _enventor_object_ctxpopup_visible_get(Eo *obj EINA_UNUSED,
                                       Enventor_Object_Data *pd)
 {
-   if (!pd->focused_it) return;
+   if (!pd->focused_it) return EINA_FALSE;
    return edit_ctxpopup_visible_get(pd->focused_it->ed);
 }
 
@@ -1156,6 +1157,8 @@ enventor_item_del(Enventor_Item *it)
         pd->sub_its = eina_list_remove(pd->sub_its, it);
         free(it);
      }
+
+   return EINA_TRUE;
 }
 
 EAPI Eina_Bool
diff --git a/src/lib/reference.c b/src/lib/reference.c
index 937ef0a..510dd9b 100644
--- a/src/lib/reference.c
+++ b/src/lib/reference.c
@@ -166,8 +166,7 @@ keyword_hierarchy_find(const char *text, const char *keyword_name)
    if (!text) return NULL;
    if (!keyword_name) return NULL;
 
-   Eina_List *keyword_hierarchy = eina_list_append(keyword_hierarchy,
-                                                   strdup(keyword_name));
+   Eina_List *keyword_hierarchy = eina_list_append(NULL, strdup(keyword_name));
 
    //Check from the end of the text.
    char *ptr = (char *)(text + ((strlen(text) - 1) * sizeof(char)));
diff --git a/src/lib/syntax_color.c b/src/lib/syntax_color.c
index 74c62f7..d56bacd 100644
--- a/src/lib/syntax_color.c
+++ b/src/lib/syntax_color.c
@@ -510,19 +510,19 @@ macro_apply(Eina_Strbuf *strbuf, const char **src, int length, char **cur,
    while (macro_end < (*src + length))
      {
         char *slash = strstr(macro_end, "\\");
-        char *eol = strstr(macro_end, EOL);
+        char *endeol = strstr(macro_end, EOL);
 
-        if ((!slash && eol) ||
-            ((slash && eol) && (slash > eol)))
+        if ((!slash && endeol) ||
+            ((slash && endeol) && (slash > endeol)))
           {
-             macro_end = eol;
+             macro_end = endeol;
              break;
           }
 
-        if (!slash || !eol) break;
-        if (eol < slash) break;
+        if (!slash || !endeol) break;
+        if (endeol < slash) break;
 
-        macro_end = eol + 1;
+        macro_end = endeol + 1;
      }
 
    *cur = macro_end;
diff --git a/src/lib/syntax_indent.c b/src/lib/syntax_indent.c
index b255600..f040c43 100644
--- a/src/lib/syntax_indent.c
+++ b/src/lib/syntax_indent.c
@@ -642,7 +642,7 @@ indent_delete_apply(indent_data *id, const char *del, int cur_line)
 
    while (len > 0)
      {
-        if ((utf8[(len - 1)] == ' '))
+        if (utf8[(len - 1)] == ' ')
           {
              eina_strbuf_append(diff, evas_textblock_cursor_content_get(cur));
              evas_textblock_cursor_char_delete(cur);
diff --git a/src/lib/wireframes_obj.c b/src/lib/wireframes_obj.c
index 38dfaf4..218e821 100644
--- a/src/lib/wireframes_obj.c
+++ b/src/lib/wireframes_obj.c
@@ -70,7 +70,6 @@ wireframes_objs_update(wireframes_obj *wireframes)
    Evas_Object *o2 =
       elm_object_part_content_get(o, "elm.swallow.content");
    if (!o2) goto end;
-   Evas *evas = evas_object_evas_get(scroller);
 
    Evas_Coord part_lx = 0, part_ly = 0;
    evas_object_geometry_get(wireframes->layout, &part_lx, &part_ly,
@@ -115,6 +114,7 @@ end:
    edje_edit_string_list_free(parts);
 }
 
+#if 0
 static void
 layout_geom_changed_cb(void *data, Evas *evas EINA_UNUSED,
                        Evas_Object *obj, void *ei EINA_UNUSED)
@@ -135,6 +135,8 @@ layout_geom_changed_cb(void *data, Evas *evas EINA_UNUSED,
           evas_object_move(po->obj, lx + x, ly + y);
        }
 }
+#endif
+
 static Eina_Bool
 animator_cb(void *data)
 {
@@ -174,7 +176,6 @@ update_wireframe_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
    //Update the wireframe of the part name.
    if (pobj)
      {
-        Evas_Coord part_lx = 0, part_ly = 0;
         Evas_Coord part_x = 0, part_y = 0, part_w = 0, part_h = 0;
 
         Evas_Object *part_obj = (Evas_Object *)
@@ -215,7 +216,7 @@ wireframes_callbacks_set(wireframes_obj *wireframes, Evas_Object *layout)
 }
 
 static void
-wireframes_callbacks_del(wireframes_obj *wireframes, Evas_Object *layout)
+wireframes_callbacks_del(wireframes_obj *wireframes EINA_UNUSED, Evas_Object *layout)
 {
    Eina_List *l = NULL;
    Eina_Stringshare *part_name = NULL;