Moved tpl_getenv init to tpl_init

Change-Id: I825862911ca1fe4054908cc678d9e960aa5e75c7
Signed-off-by: Joonbum Ko <joonbum.ko@samsung.com>

diff --git a/src/tpl.c b/src/tpl.c
index e6d90f0..50e19af 100644 (file)
--- a/src/tpl.c
+++ b/src/tpl.c
@@ -31,6 +31,16 @@ __tpl_runtime_init()
 static void __attribute__((constructor))
 __tpl_init(void)
 {
+       if (!tpl_getenv_initialized)
+       {
+               int ret = access("/opt/usr/tpl_env", F_OK);
+               if (ret == 0)
+                       tpl_getenv_enabled = 1;
+               else
+                       tpl_getenv_enabled = 0;
+               tpl_getenv_initialized = 1;
+       }
+
        TPL_DEBUG("[libtpl-egl] loaded");
 #ifdef OBJECT_HASH_CHECK
        __tpl_object_hash_init();

diff --git a/src/tpl_utils.h b/src/tpl_utils.h
index 92cb6a0..89854a1 100644 (file)
--- a/src/tpl_utils.h
+++ b/src/tpl_utils.h
@@ -54,26 +54,11 @@
 /* 0:uninitialized, 1:initialized,no log, 2:user log */
 extern unsigned int tpl_log_lvl;
 extern unsigned int tpl_log_initialized;
-extern unsigned int tpl_getenv_initialized;
 extern unsigned int tpl_getenv_enabled;
 extern unsigned int tpl_dump_lvl;
 
-#define TPL_GETENV_INIT()                                                              \
-       {                                                                                                       \
-               if (!tpl_getenv_initialized)                                    \
-               {                                                                                               \
-                       int ret = access("/opt/usr/tpl_env", F_OK);     \
-                       if (ret == 0)                                                           \
-                               tpl_getenv_enabled = 1;                                 \
-                       else                                                                            \
-                               tpl_getenv_enabled = 0;                                 \
-                       tpl_getenv_initialized = 1;                                     \
-               }                                                                                               \
-       }
-
 inline char *tpl_getenv(const char *name)
 {
-       TPL_GETENV_INIT();
        if (tpl_getenv_enabled)
                return getenv(name);
        else