tasn pushed a commit to branch master.
commit 269e3a779753cd964ef53c7161a438f841b87d47
Author: Tom Hacohen <[email protected]>
Date: Fri Apr 12 17:17:30 2013 +0100
Eo: Fixed an error in in _eo_callback_remove and a few minor things.
The other things are not really issues but more about silencing clang.
Thanks to clang-analyzer.
---
src/lib/eo/eo.c | 6 +++---
src/lib/eo/eo_base_class.c | 5 ++++-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index 0b02c08..d149cee 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -366,13 +366,13 @@ _eo_dov_internal(Eo *obj, Eo_Op_Type op_type, va_list
*p_list)
op = va_arg(*p_list, Eo_Op);
}
- _eo_unref(obj);
-
if (obj->do_error)
ret = EINA_FALSE;
obj->do_error = prev_error;
+ _eo_unref(obj);
+
return ret;
}
@@ -1495,8 +1495,8 @@ eo_composite_attach(Eo *comp_obj, Eo *parent)
EO_MAGIC_RETURN(parent, EO_EINA_MAGIC);
comp_obj->composite = EINA_TRUE;
- eo_parent_set(comp_obj, parent);
parent->composite_objects = eina_list_prepend(parent->composite_objects,
comp_obj);
+ eo_parent_set(comp_obj, parent);
}
EAPI void
diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index 389fae9..2b5b69c 100644
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -281,7 +281,10 @@ _eo_callback_remove(Private_Data *pd,
Eo_Callback_Description *cb)
}
free(titr);
}
- pitr = titr;
+ else
+ {
+ pitr = titr;
+ }
}
}
--
------------------------------------------------------------------------------
Precog is a next-generation analytics platform capable of advanced
analytics on semi-structured data. The platform includes APIs for building
apps and a phenomenal toolset for data science. Developers can use
our toolset for easy data analysis & visualization. Get a free account!
http://www2.precog.com/precogplatform/slashdotnewsletter
