From 636356014ddc49530fc9a60f0748895a95364f18 Mon Sep 17 00:00:00 2001 From: discomfitor Date: Fri, 19 Nov 2010 05:43:28 +0000 Subject: [PATCH] more descriptive error message for inlist_remove when item is not an inlist git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/eina@54711 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/eina_inlist.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/lib/eina_inlist.c b/src/lib/eina_inlist.c index 9ebc623..6343907 100644 --- a/src/lib/eina_inlist.c +++ b/src/lib/eina_inlist.c @@ -436,8 +436,12 @@ eina_inlist_remove(Eina_Inlist *list, Eina_Inlist *item) /* checkme */ EINA_SAFETY_ON_NULL_RETURN_VAL(list, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(item, list); - EINA_SAFETY_ON_TRUE_RETURN_VAL - ((item != list) && (!item->prev) && (!item->next), list); + if (EINA_UNLIKELY((item != list) && (!item->prev) && (!item->next))) + { + eina_error_set(EINA_ERROR_SAFETY_FAILED); + EINA_LOG_ERR("safety check failed: item %p does not appear to be part of an inlist!", item); + return list; + } if (item->next) item->next->prev = item->prev; -- 2.7.4