From bfc76668f4d2e9c27173af31b989e2443a83acc8 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 1 Feb 2013 11:02:53 +0000 Subject: [PATCH] finally addressing complaints regarding eina_list_last_data_get() not being a function. well now it is SVN revision: 83547 --- src/lib/eina/eina_inline_list.x | 17 +++++++++++++++++ src/lib/eina/eina_list.h | 13 ------------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/lib/eina/eina_inline_list.x b/src/lib/eina/eina_inline_list.x index 3397a1b521..9faac2de2f 100644 --- a/src/lib/eina/eina_inline_list.x +++ b/src/lib/eina/eina_inline_list.x @@ -64,4 +64,21 @@ eina_list_count(const Eina_List *list) return list->accounting->count; } + +/** + * @brief Returns the last list node's data + * + * @param list The list + * @return The node's data, or @c NULL on being passed a @c NULL pointer + * + * This macro is a shortcut for typing eina_list_data_get(eina_list_last()) + * @since 1.8 + */ +static inline void * +eina_list_last_data_get(const Eina_List *list) +{ + if (!list) return NULL; + return eina_list_data_get(eina_list_last(list)); +} + #endif /* EINA_LIST_INLINE_H_ */ diff --git a/src/lib/eina/eina_list.h b/src/lib/eina/eina_list.h index 23098cabe4..a81f57b801 100644 --- a/src/lib/eina/eina_list.h +++ b/src/lib/eina/eina_list.h @@ -1612,19 +1612,6 @@ EAPI Eina_Accessor *eina_list_accessor_new(const Eina_List *list) EINA_MA list = eina_list_remove_list(list, list), \ data = eina_list_data_get(list)) -/** - * @def EINA_LIST_LAST_DATA_GET - * @brief Macro to return the last list node's data - * - * @param list The list - * @return The node's data, or @c NULL on being passed a @c NULL pointer - * - * This macro is a shortcut for typing eina_list_data_get(eina_list_last()) - * @since 1.8 - */ -#define eina_list_last_data_get(list) \ - eina_list_data_get(eina_list_last(list)) - #include "eina_inline_list.x" /**