tbm_surface_internal: clean up tbm_surface_internal_query_supported_formats()

This patch cleans up tbm_surface_internal_query_supported_formats().
There are some missed error routines.

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

diff --git a/src/tbm_surface_internal.c b/src/tbm_surface_internal.c
index bf02f73..e5f3243 100644 (file)
--- a/src/tbm_surface_internal.c
+++ b/src/tbm_surface_internal.c
@@ -369,29 +369,39 @@ tbm_surface_internal_query_supported_formats(uint32_t **formats,
 {
        struct _tbm_bufmgr *mgr;
        int ret = 0;
+       bool bufmgr_initialized = false;
 
        _tbm_surface_mutex_lock();
 
        if (!g_surface_bufmgr) {
                _init_surface_bufmgr();
                LIST_INITHEAD(&g_surface_bufmgr->surf_list);
+               bufmgr_initialized = true;
        }
 
        mgr = g_surface_bufmgr;
 
-       if (!mgr->backend->surface_supported_format) {
-               TBM_TRACE("error: tbm_bufmgr(%p)\n", g_surface_bufmgr);
-               _tbm_surface_mutex_unlock();
-               return 0;
-       }
+       if (!mgr->backend->surface_supported_format)
+               goto fail;
 
        ret = mgr->backend->surface_supported_format(formats, num);
+       if (!ret)
+               goto fail;
 
-       TBM_TRACE("tbm_bufmgr(%p) format num(%d)\n", g_surface_bufmgr, *num);
+       TBM_TRACE("tbm_bufmgr(%p) format num(%u)\n", g_surface_bufmgr, *num);
 
        _tbm_surface_mutex_unlock();
 
        return ret;
+
+fail:
+       if (bufmgr_initialized) {
+               LIST_DELINIT(&g_surface_bufmgr->surf_list);
+               _deinit_surface_bufmgr();
+       }
+       _tbm_surface_mutex_unlock();
+       TBM_TRACE("error: tbm_bufmgr(%p)\n", g_surface_bufmgr);
+       return 0;
 }
 
 int