Prevent defects are corrected in edje_externals of elm_icon, elm_list, elm_nocontents...

Change-Id: If84e5807525a9b5c20eb461066e48be8d27f68ea

diff --git a/src/edje_externals/elm_icon.c b/src/edje_externals/elm_icon.c
index 2590475..61548e8 100644 (file)
--- a/src/edje_externals/elm_icon.c
+++ b/src/edje_externals/elm_icon.c
@@ -287,7 +287,6 @@ external_icon_params_free(void *params)
 
    if (mem->file)
      eina_stringshare_del(mem->file);
-   free(mem);
 
    if (param_icon->file)
      eina_stringshare_del(param_icon->file);
@@ -295,7 +294,7 @@ external_icon_params_free(void *params)
 
    if (mem->icon)
      eina_stringshare_del(mem->icon);
-   external_common_params_free(params);
+   free(mem);
 }
 
 static Edje_External_Param_Info external_icon_params[] = {

diff --git a/src/edje_externals/elm_list.c b/src/edje_externals/elm_list.c
index 1d81349..83a7ce7 100644 (file)
--- a/src/edje_externals/elm_list.c
+++ b/src/edje_externals/elm_list.c
@@ -18,7 +18,7 @@ typedef struct _Elm_Params_List
 
 #define CHOICE_GET(CHOICES, STR)                \
   unsigned int i;                               \
-  for (i = 0; i < sizeof(CHOICES); i++)         \
+  for (i = 0; i < (sizeof(CHOICES)/sizeof(CHOICES[0])); i++)         \
     if (strcmp(STR, CHOICES[i]) == 0)           \
       return i
 

diff --git a/src/edje_externals/elm_nocontents.c b/src/edje_externals/elm_nocontents.c
index fd2903e..262c4c7 100644 (file)
--- a/src/edje_externals/elm_nocontents.c
+++ b/src/edje_externals/elm_nocontents.c
@@ -60,9 +60,9 @@ external_nocontents_params_parse(void *data __UNUSED__,
                            Evas_Object *obj __UNUSED__,
                            const Eina_List *params __UNUSED__)
 {
-   Elm_Params_Nocontents *mem = NULL;
+   Elm_Params_Nocontents *mem;
 
-   //mem = external_common_params_parse(Elm_Params_Nocontents, data, obj, params);
+   mem = ELM_NEW(Elm_Params_Nocontents);
    if (!mem)
      return NULL;
 
@@ -80,7 +80,7 @@ static Evas_Object *external_nocontents_content_get(void *data __UNUSED__,
 static void
 external_nocontents_params_free(void *params)
 {
-   external_common_params_free(params);
+   free(params);
 }
 
 static Edje_External_Param_Info external_nocontents_params[] = {