diff options
author | Saya Sugiura <ssugiura@jp.adit-jv.com> | 2019-05-29 17:58:37 +0900 |
---|---|---|
committer | Saya Sugiura <ssugiura@jp.adit-jv.com> | 2019-06-19 11:00:37 +0900 |
commit | 9cf8c10a22542ce784c383d7e371797c4b9910ac (patch) | |
tree | b43fb9e5692e8354dc203fc382c3263d7876ad40 /src/lib | |
parent | 6088448cdfe3cd152c53136544acc4ee7a508a84 (diff) | |
download | DLT-daemon-9cf8c10a22542ce784c383d7e371797c4b9910ac.tar.gz |
cleanup: Use dlt_vlog()
There were a couple of places which used snprintf-dlt_log. It is
now replaced with dlt_vlog().
Signed-off-by: Saya Sugiura <ssugiura@jp.adit-jv.com>
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/dlt_client.c | 13 | ||||
-rw-r--r-- | src/lib/dlt_user.c | 30 |
2 files changed, 13 insertions, 30 deletions
diff --git a/src/lib/dlt_client.c b/src/lib/dlt_client.c index af7e118..62389c2 100644 --- a/src/lib/dlt_client.c +++ b/src/lib/dlt_client.c @@ -100,8 +100,6 @@ static int (*message_callback_function)(DltMessage *message, void *data) = NULL; -static char str[DLT_CLIENT_TEXTBUFSIZE]; - void dlt_client_register_message_callback(int (*registerd_callback)(DltMessage *message, void *data)) { message_callback_function = registerd_callback; @@ -184,19 +182,14 @@ DltReturnValue dlt_client_connect(DltClient *client, int verbose) for (p = servinfo; p != NULL; p = p->ai_next) { if ((client->sock = socket(p->ai_family, p->ai_socktype, p->ai_protocol)) < 0) { - snprintf(str, DLT_CLIENT_TEXTBUFSIZE, - "socket() failed! %s\n", - strerror(errno)); - dlt_log(LOG_WARNING, str); + dlt_vlog(LOG_WARNING, "socket() failed! %s\n", strerror(errno)); continue; } if (connect(client->sock, p->ai_addr, p->ai_addrlen) < 0) { - snprintf(str, DLT_CLIENT_TEXTBUFSIZE, - "connect() failed! %s\n", - strerror(errno)); close(client->sock); - dlt_log(LOG_WARNING, str); + dlt_vlog(LOG_WARNING, "connect() failed! %s\n", + strerror(errno)); continue; } diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c index dbaf7f1..c5be77c 100644 --- a/src/lib/dlt_user.c +++ b/src/lib/dlt_user.c @@ -87,8 +87,6 @@ static char dlt_user_dir[NAME_MAX + 1]; static char dlt_daemon_fifo[NAME_MAX + 1]; #endif -static char str[DLT_USER_BUFFER_LENGTH]; - static sem_t dlt_mutex; static pthread_t dlt_receiverthread_handle; @@ -118,12 +116,9 @@ void dlt_lock_mutex(pthread_mutex_t *mutex) if ( lock_mutex_result != 0 ) { - snprintf(str, - DLT_USER_BUFFER_LENGTH, + dlt_vlog(LOG_ERR, "Mutex lock failed unexpected pid=%i with result %i!\n", - getpid(), - lock_mutex_result); - dlt_log(LOG_ERR, str); + getpid(), lock_mutex_result); } } @@ -371,8 +366,9 @@ DltReturnValue dlt_init(void) /* init shared memory */ if (dlt_shm_init_client(&(dlt_user.dlt_shm), DLT_SHM_KEY) < 0) { - snprintf(str, DLT_USER_BUFFER_LENGTH, "Logging disabled, Shared memory %d cannot be created!\n", DLT_SHM_KEY); - dlt_log(LOG_WARNING, str); + dlt_vlog(LOG_WARNING, + "Logging disabled, Shared memory %d cannot be created!\n", + DLT_SHM_KEY); /*return 0; */ } #endif @@ -574,11 +570,9 @@ DltReturnValue dlt_init_common(void) if (env_initial_log_level != NULL) { if (dlt_env_extract_ll_set(&env_initial_log_level, &dlt_user.initial_ll_set) != 0) { - snprintf(str, - DLT_USER_BUFFER_LENGTH, + dlt_vlog(LOG_WARNING, "Unable to parse initial set of log-levels from environment! Env:\n%s\n", getenv("DLT_INITIAL_LOG_LEVEL")); - dlt_log(LOG_WARNING, str); } } @@ -4571,10 +4565,9 @@ void dlt_stop_threads() dlt_receiverthread_result = pthread_cancel(dlt_receiverthread_handle); if (dlt_receiverthread_result != 0) { - snprintf(str, DLT_USER_BUFFER_LENGTH, + dlt_vlog(LOG_ERR, "ERROR pthread_cancel(dlt_receiverthread_handle): %s\n", strerror(errno)); - dlt_log(LOG_ERR, str); } } @@ -4586,10 +4579,9 @@ void dlt_stop_threads() dlt_segmented_nwt_result = pthread_cancel(dlt_user.dlt_segmented_nwt_handle); if (dlt_segmented_nwt_result != 0) { - snprintf(str, DLT_USER_BUFFER_LENGTH, + dlt_vlog(LOG_ERR, "ERROR pthread_cancel(dlt_user.dlt_segmented_nwt_handle): %s\n", strerror(errno)); - dlt_log(LOG_ERR, str); } } @@ -4598,10 +4590,9 @@ void dlt_stop_threads() int joined = pthread_join(dlt_receiverthread_handle, NULL); if (joined < 0) { - snprintf(str, DLT_USER_BUFFER_LENGTH, + dlt_vlog(LOG_ERR, "ERROR pthread_join(dlt_receiverthread_handle, NULL): %s\n", strerror(errno)); - dlt_log(LOG_ERR, str); } dlt_receiverthread_handle = 0; /* set to invalid */ @@ -4611,10 +4602,9 @@ void dlt_stop_threads() int joined = pthread_join(dlt_user.dlt_segmented_nwt_handle, NULL); if (joined < 0) { - snprintf(str, DLT_USER_BUFFER_LENGTH, + dlt_vlog(LOG_ERR, "ERROR pthread_join(dlt_user.dlt_segmented_nwt_handle, NULL): %s\n", strerror(errno)); - dlt_log(LOG_ERR, str); } dlt_user.dlt_segmented_nwt_handle = 0; /* set to invalid */ |