From df7381bc4111c24cbe7363dd039572332270230b Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Thu, 14 May 2020 17:27:54 +0900 Subject: [PATCH] remove getenv() function. The getenv() function does not support multithread. Therefore libtbm does not use getenv() from now. Change-Id: Ic0a6cb46bbf60da0d65ceafffccbc1b2ea0f5d4e --- src/tbm_backend.c | 7 +------ src/tbm_bufmgr.c | 11 +---------- src/tbm_bufmgr_backend.c | 7 +------ 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/src/tbm_backend.c b/src/tbm_backend.c index 4c9ce19..cd241b2 100644 --- a/src/tbm_backend.c +++ b/src/tbm_backend.c @@ -38,18 +38,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. int tbm_backend_bufmgr_query_display_server(tbm_bufmgr bufmgr, tbm_error_e *error) { - const char *value; - if (!bufmgr) { if (error) *error = TBM_ERROR_INVALID_PARAMETER; return 0; } - /* TODO: TBM_DISPLAY_SERVER will be removed */ - value = (const char*)getenv("TBM_DISPLAY_SERVER"); - - if (value || gBufMgr->display_server) { + if (gBufMgr->display_server) { if (error) *error = TBM_ERROR_NONE; return 1; diff --git a/src/tbm_bufmgr.c b/src/tbm_bufmgr.c index eefe8e8..d80f7ec 100644 --- a/src/tbm_bufmgr.c +++ b/src/tbm_bufmgr.c @@ -480,16 +480,7 @@ _tbm_bufmgr_init(int fd, int server) #endif bDlog = 1; - - /* LCOV_EXCL_START */ -#ifdef TRACE - env = getenv("TBM_TRACE"); - if (env) { - trace_mask = atoi(env); - TBM_DBG("TBM_TRACE=%s\n", env); - } else - trace_mask = 0; -#endif + trace_mask = 0; pthread_mutex_lock(&gLock); diff --git a/src/tbm_bufmgr_backend.c b/src/tbm_bufmgr_backend.c index 87d3c78..11aa5eb 100644 --- a/src/tbm_bufmgr_backend.c +++ b/src/tbm_bufmgr_backend.c @@ -110,17 +110,12 @@ void *tbm_backend_get_bo_priv(tbm_bo bo) int tbm_backend_is_display_server(void) { - const char *value; - if (gBufMgr == NULL) { TBM_ERR("error: no gBufMgr.\n"); return 0; } - /* TODO: TBM_DISPLAY_SERVER will be removed */ - value = (const char*)getenv("TBM_DISPLAY_SERVER"); - - if (value || gBufMgr->display_server) + if (gBufMgr->display_server) return 1; return 0; -- 2.7.4