From 9b3ba69399a92ee3c999959fa75a582879550ad4 Mon Sep 17 00:00:00 2001 From: "LUONG HONG DUY KHANH(RBVH/ENG42)" Date: Tue, 5 May 2020 18:26:08 +0700 Subject: libdlt: Relocate dltFifoBaseDir setting Relocate the setting of dltFifoBaseDir variable from dlt_init() to dlt_check_envvar() Signed-off-by: LUONG HONG DUY KHANH(RBVH/ENG42) --- src/lib/dlt_user.c | 3 --- src/shared/dlt_common.c | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c index 901dc21..0224378 100644 --- a/src/lib/dlt_user.c +++ b/src/lib/dlt_user.c @@ -350,9 +350,6 @@ static DltReturnValue dlt_initialize_fifo_connection(void) DltReturnValue dlt_init(void) { - strncpy(dltFifoBaseDir, DLT_USER_IPC_PATH, DLT_PATH_MAX); - dltFifoBaseDir[DLT_PATH_MAX - 1] = 0; - /* check environment variables */ dlt_check_envvar(); diff --git a/src/shared/dlt_common.c b/src/shared/dlt_common.c index 5697163..cd71044 100644 --- a/src/shared/dlt_common.c +++ b/src/shared/dlt_common.c @@ -3799,6 +3799,9 @@ void dlt_check_envvar() if (env_pipe_dir != NULL) dlt_log_set_fifo_basedir(env_pipe_dir); + else + dlt_log_set_fifo_basedir(DLT_USER_IPC_PATH); + #ifdef DLT_SHM_ENABLE char* env_shm_name = getenv("DLT_SHM_NAME"); -- cgit v1.2.1