tbm_bufmgr, tbm_surface_internal: clean up LIST relevant codes

This patch cleans up LIST relevant codes.
- LIST_FOR_EACH_ENTRY is enough if there is no LIST_DEL routine inside.
- The user_data_lookup() checks LIST_IS_EMPTY() internally, so removes duplicated check routine.

Change-Id: Id4821fd22014cb5dfa32a77da8f5c26e0dc9569c
Signed-off-by: YoungJun Cho <yj44.cho@samsung.com>

diff --git a/src/tbm_bufmgr.c b/src/tbm_bufmgr.c
index d02dd417b0692c8ead13b43739858087b3f5d4f8..fcb7ead0789ab6234ae036b37f26a9aa5aba691e 100644 (file)
--- a/src/tbm_bufmgr.c
+++ b/src/tbm_bufmgr.c
@@ -251,10 +251,10 @@ tbm_user_data
 *user_data_lookup(struct list_head *user_data_list, unsigned long key)
 {
        tbm_user_data *user_data = NULL;
-       tbm_user_data *old_data = NULL, *tmp = NULL;
+       tbm_user_data *old_data = NULL;
 
        if (!LIST_IS_EMPTY(user_data_list)) {
-               LIST_FOR_EACH_ENTRY_SAFE(old_data, tmp, user_data_list, item_link) {
+               LIST_FOR_EACH_ENTRY(old_data, user_data_list, item_link) {
                        if (old_data->key == key) {
                                user_data = old_data;
                                return user_data;

diff --git a/src/tbm_surface_internal.c b/src/tbm_surface_internal.c
index cf7fb7352d2753ad48b13f3045634a3a5eeb5c9d..4dcba90885427b7dcded247055e88b0ed79739ef 100644 (file)
--- a/src/tbm_surface_internal.c
+++ b/src/tbm_surface_internal.c
@@ -1209,12 +1209,6 @@ tbm_surface_internal_set_user_data(tbm_surface_h surface, unsigned long key,
 
        TBM_SURFACE_RETURN_VAL_IF_FAIL(tbm_surface_internal_is_valid(surface), 0);
 
-       if (LIST_IS_EMPTY(&surface->user_data_list)) {
-               TBM_TRACE("error: tbm_surface(%p) key(%lu)\n", surface, key);
-               _tbm_surface_mutex_unlock();
-               return 0;
-       }
-
        old_data = user_data_lookup(&surface->user_data_list, key);
        if (!old_data) {
                TBM_TRACE("error: tbm_surface(%p) key(%lu)\n", surface, key);
@@ -1244,16 +1238,16 @@ tbm_surface_internal_get_user_data(tbm_surface_h surface, unsigned long key,
 
        TBM_SURFACE_RETURN_VAL_IF_FAIL(tbm_surface_internal_is_valid(surface), 0);
 
-       if (!data || LIST_IS_EMPTY(&surface->user_data_list)) {
+       if (!data) {
                TBM_TRACE("error: tbm_surface(%p) key(%lu)\n", surface, key);
                _tbm_surface_mutex_unlock();
                return 0;
        }
+       *data = NULL;
 
        old_data = user_data_lookup(&surface->user_data_list, key);
        if (!old_data) {
                TBM_TRACE("error: tbm_surface(%p) key(%lu)\n", surface, key);
-               *data = NULL;
                _tbm_surface_mutex_unlock();
                return 0;
        }
@@ -1277,12 +1271,6 @@ tbm_surface_internal_delete_user_data(tbm_surface_h surface,
 
        TBM_SURFACE_RETURN_VAL_IF_FAIL(tbm_surface_internal_is_valid(surface), 0);
 
-       if (LIST_IS_EMPTY(&surface->user_data_list)) {
-               TBM_TRACE("error: tbm_surface(%p) key(%lu)\n", surface, key);
-               _tbm_surface_mutex_unlock();
-               return 0;
-       }
-
        old_data = user_data_lookup(&surface->user_data_list, key);
        if (!old_data) {
                TBM_TRACE("error: tbm_surface(%p) key(%lu)\n", surface, key);
@@ -1352,7 +1340,7 @@ tbm_surface_internal_set_debug_data(tbm_surface_h surface, char *key, char *valu
        TBM_SURFACE_RETURN_VAL_IF_FAIL(bufmgr, 0);
 
        if (!LIST_IS_EMPTY(&surface->debug_data_list)) {
-               LIST_FOR_EACH_ENTRY_SAFE(old_data, tmp, &surface->debug_data_list, item_link) {
+               LIST_FOR_EACH_ENTRY(old_data, &surface->debug_data_list, item_link) {
                        if (!strcmp(old_data->key, key)) {
                                if (value)
                                        old_data->value = strdup(value);
@@ -1393,14 +1381,14 @@ tbm_surface_internal_set_debug_data(tbm_surface_h surface, char *key, char *valu
 char *
 _tbm_surface_internal_get_debug_data(tbm_surface_h surface, char *key)
 {
-       tbm_surface_debug_data *old_data = NULL, *tmp = NULL;
+       tbm_surface_debug_data *old_data = NULL;
 
        _tbm_surface_mutex_lock();
 
        TBM_SURFACE_RETURN_VAL_IF_FAIL(surface, NULL);
 
        if (!LIST_IS_EMPTY(&surface->debug_data_list)) {
-               LIST_FOR_EACH_ENTRY_SAFE(old_data, tmp, &surface->debug_data_list, item_link) {
+               LIST_FOR_EACH_ENTRY(old_data, &surface->debug_data_list, item_link) {
                        if (!strcmp(old_data->key, key)) {
                                _tbm_surface_mutex_unlock();
                                return old_data->value;