Update to change strerror_r to guaranteee of thread safety

Change-Id: Ic64eb3db5f9784b2ef5ef00ed8c066d42faa1c2c

diff --git a/packaging/mused.spec b/packaging/mused.spec
index 8e3077e..b8a533b 100644 (file)
--- a/packaging/mused.spec
+++ b/packaging/mused.spec
@@ -1,6 +1,6 @@
 Name:       mused
 Summary:    A multimedia daemon
-Version:    0.3.12
+Version:    0.3.13
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0

diff --git a/server/src/muse_server_tool.c b/server/src/muse_server_tool.c
index 443d3ad..90907ef 100644 (file)
--- a/server/src/muse_server_tool.c
+++ b/server/src/muse_server_tool.c
@@ -192,10 +192,11 @@ static int _ms_connection_register(int fd, gpointer user_data)
        event.data.ptr = GINT_TO_POINTER(connection->fd);
 
        if (epoll_ctl(ms_tool->event_h->epfd, EPOLL_CTL_ADD, connection->fd, &event) == MUSE_ERR) {
-               snprintf(err_msg, MUSE_MAX_MSG_LEN, "epoll_ctl in activate failed %s", strerror(errno));
+               strerror_r(errno, err_msg, MUSE_MAX_MSG_LEN);
+               LOGE("%s", err_msg);
+
                g_mutex_unlock(&ms_tool->diag_lock);
                free(connection);
-               LOGE("%s", err_msg);
                return MM_ERROR_UNKNOWN;
        }
 
@@ -221,9 +222,9 @@ static int _ms_connection_unregister(int fd)
 
        connection = (ms_connection_t *)g_hash_table_lookup(ms_tool->event_h->fd_table, GINT_TO_POINTER(fd));
        if (connection && epoll_ctl(ms_tool->event_h->epfd, EPOLL_CTL_DEL, connection->fd, NULL) == MUSE_ERR) {
-               snprintf(err_msg, MUSE_MAX_MSG_LEN, "epoll_ctl in deactivate failed %s", strerror(errno));
-               MUSE_FREE(connection);
+               strerror_r(errno, err_msg, MUSE_MAX_MSG_LEN);
                LOGE("%s", err_msg);
+               MUSE_FREE(connection);
                return MM_ERROR_UNKNOWN;
        }
 
@@ -251,7 +252,7 @@ static ms_event_e _ms_connection_handle_event(int *value)
 
        if (fd_count < 0) {
                if (errno != EINTR) {
-                       snprintf(err_msg, MUSE_MAX_MSG_LEN, "epoll_wait() failed %s", strerror(errno));
+                       strerror_r(errno, err_msg, MUSE_MAX_MSG_LEN);
                        LOGE("%s", err_msg);
                }
                return MUSE_EVENT_UNKNOWN;