From e442ae2aaa3787cf694885f91e03fb49dec566e3 Mon Sep 17 00:00:00 2001 From: Junkyeong Kim Date: Sun, 7 Feb 2021 15:00:00 +0900 Subject: [PATCH] tbm_bo: do not use error log parameter Change-Id: I2884953db2effa50dba896973c7110523944e832 Signed-off-by: Junkyeong Kim --- src/tbm_bo.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/src/tbm_bo.c b/src/tbm_bo.c index 35deb2c..db05ef7 100644 --- a/src/tbm_bo.c +++ b/src/tbm_bo.c @@ -431,8 +431,7 @@ tbm_bo_alloc_with_format(tbm_bufmgr bufmgr, int format, int bo_idx, int width, TBM_ERR("error: fail to tbm_bo_alloc_with_format fmt(%s) idx(%d) w(%d) h(%d) mem_types(%s)\n", FOURCC_STR(format), bo_idx, width, height, _tbm_flag_to_str(flags)); _tbm_set_last_result(TBM_ERROR_OUT_OF_MEMORY); - _tbm_bufmgr_mutex_unlock(); - return NULL; + goto calloc_fail; } _tbm_util_check_bo_cnt(bufmgr); @@ -443,26 +442,28 @@ tbm_bo_alloc_with_format(tbm_bufmgr bufmgr, int format, int bo_idx, int width, TBM_ERR("error: not supported tbm_bo_alloc_with_format\n"); _tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED); - free(bo); - _tbm_bufmgr_mutex_unlock(); - return NULL; + goto bo_alloc_fail; } } /* LCOV_EXCL_STOP */ - if (bufmgr->use_hal_tbm) + if (bufmgr->use_hal_tbm) { bo_data = (tbm_backend_bo_data *)hal_tbm_bufmgr_alloc_bo_with_format(bufmgr->hal_bufmgr, format, bo_idx, width, height, (hal_tbm_bo_memory_type)flags, (hal_tbm_error *)error); - else + if (!bo_data) { + TBM_ERR("error: fail to tbm_bo_alloc_with_format\n"); + _tbm_set_last_result(*error); + goto bo_alloc_fail; + } + } else { bo_data = bufmgr->bufmgr_func->bufmgr_alloc_bo_with_format(bufmgr->bufmgr_data, format, bo_idx, width, height, flags, error); - if (!bo_data) { - TBM_ERR("error: fail to tbm_bo_alloc_with_format fmt(%s) idx(%d) w(%d) h(%d) mem_types(%s)\n", - FOURCC_STR(format), bo_idx, width, height, _tbm_flag_to_str(flags)); - _tbm_set_last_result(*error); - free(bo); - _tbm_bufmgr_mutex_unlock(); - return NULL; + if (!bo_data) { + TBM_ERR("error: fail to tbm_bo_alloc_with_format fmt(%s) idx(%d) w(%d) h(%d) mem_types(%s)\n", + FOURCC_STR(format), bo_idx, width, height, _tbm_flag_to_str(flags)); + _tbm_set_last_result(*error); + goto bo_alloc_fail; + } } bo->bo_data = bo_data; @@ -471,6 +472,12 @@ tbm_bo_alloc_with_format(tbm_bufmgr bufmgr, int format, int bo_idx, int width, _tbm_bufmgr_mutex_unlock(); return bo; + +bo_alloc_fail: + free(bo); +calloc_fail: + _tbm_bufmgr_mutex_unlock(); + return NULL; } tbm_bo -- 2.7.4