[EGIT] [core/efl] master 02/04: elm: Partially revert "elementary: avoid random memory access."

[Jean-Philippe ANDRÉ]

jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=a4701ea9696d3e6aab9d5b14895cee903ea5f048

commit a4701ea9696d3e6aab9d5b14895cee903ea5f048
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date:   Fri Jun 3 12:01:35 2016 +0900

    elm: Partially revert "elementary: avoid random memory access."
    
    This reverts commit ac5a0b7e79d6b32285bd7b794f050826f38cc7c2.
    
    I added assert(pd == sd) in the modified code and couldn't find
    anything suspicious. The proper class is used in eo_data_scope_get().
    I also can't find a crash or a bug currently in hover. I know there
    was a problem earlier, but that was fixed in 3092e08a83f754ba8d49c.
    
    Now, if there is still a problem, we should check it carefully.
    Pinging @cedric
---
 src/lib/elementary/elm_dayselector.c | 3 +--
 src/lib/elementary/elm_hover.c       | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/lib/elementary/elm_dayselector.c 
b/src/lib/elementary/elm_dayselector.c
index a65ca94..bc03214 100644
--- a/src/lib/elementary/elm_dayselector.c
+++ b/src/lib/elementary/elm_dayselector.c
@@ -220,10 +220,9 @@ _item_find(const Evas_Object *obj,
 }
 
 static Eina_Bool
-_elm_dayselector_content_set(Eo *obj, Elm_Dayselector_Data *pd, const char 
*item, Evas_Object *content)
+_elm_dayselector_content_set(Eo *obj, Elm_Dayselector_Data *sd, const char 
*item, Evas_Object *content)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   Elm_Dayselector_Data *sd = eo_data_scope_get(obj, MY_CLASS);
 
    int day;
    char buf[1024];
diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c
index 5d05458..5246986 100644
--- a/src/lib/elementary/elm_hover.c
+++ b/src/lib/elementary/elm_hover.c
@@ -400,10 +400,9 @@ _elm_hover_subs_del(Elm_Hover_Data *sd)
 }
 
 static Eina_Bool
-_elm_hover_content_set(Eo *obj, Elm_Hover_Data *pd, const char *swallow, 
Evas_Object *content)
+_elm_hover_content_set(Eo *obj, Elm_Hover_Data *sd, const char *swallow, 
Evas_Object *content)
 {
    Eina_Bool int_ret;
-   Elm_Hover_Data *sd = eo_data_scope_get(obj, MY_CLASS);
 
    if (!swallow) return EINA_FALSE;
 

--