Fix build error due to toolchain upgrade (gcc6->gcc9)

 - Werror=format-truncation, -Werror=cast-function-type

Change-Id: Ieaa02eca90e455610bfea45cfb88ec436faefaec

diff --git a/core/include/muse_core_internal.h b/core/include/muse_core_internal.h
index 2a52e88..bbfb87c 100644 (file)
--- a/core/include/muse_core_internal.h
+++ b/core/include/muse_core_internal.h
@@ -48,42 +48,44 @@ extern "C" {
 #include <unistd.h>
 #include <iniparser.h>
 
-#define CONFFILE                                       SYSCONFDIR"/multimedia/mused.conf"
-#define MUSE_HOST                                      "muse:hosts"
+#define CONFFILE                               SYSCONFDIR"/multimedia/mused.conf"
+#define MUSE_HOST                              "muse:hosts"
 #define INI_PARSER_COMMA                       ","
 #define MUSE_DATA_ROOT_PATH                    TZ_SYS_DATA_PATH"/mused/"
-#define MUSE_DEFAULT_PIDFILE           "/tmp/.muse-server.pid"
+#define MUSE_DEFAULT_PIDFILE                   "/tmp/.muse-server.pid"
 #define MUSE_SOCK_FILE0                                "/tmp/.muse_server_socket"
 #define MUSE_SOCK_FILE1                                "/tmp/.muse_server_data_socket"
 #define MUSE_LOG_PATH                          "/var/log/mused"
 #define MUSE_LOG_FILE                          MUSE_LOG_PATH"/muselog"
 #define MUSE_USE_LOG                           "yes"
 
-#define READ                                           0x02
-#define PERSIST                                                0x10
+#define READ                                   0x02
+#define PERSIST                                        0x10
 
-#define MUSE_ERR                                       -1
-#define SEND_FAIL                                      -1
-#define RECV_FAIL                                      -1
+#define MUSE_ERR                               -1
+#define SEND_FAIL                              -1
+#define RECV_FAIL                              -1
 #define MUSE_PARAM_MAX                         10
+#define MUSE_LOG_MSG_NUM                       10
 
-#define PARSE_ERROR                                    -1
+#define PARSE_ERROR                            -1
 
 /* message */
 #define MUSE_MSG_LEN                           32
+#define MUSE_MSG_TIME_LEN                      64
 #define MUSE_MSG_LEN_MAX                       128
 
 /* dispatcher */
 #define MUSE_DISPATCHER_MAX                    512
 
-#define MSG_KEY_API                                    "api"
-#define MSG_KEY_MODULE_INDEX           "module"
+#define MSG_KEY_API                            "api"
+#define MSG_KEY_MODULE_INDEX                   "module"
 #define MSG_KEY_MODULE_ADDR                    "module_addr"
 
-#define DISPATCHER                                     "dispatcher"
+#define DISPATCHER                             "dispatcher"
 #define DISPATCHER_PTR                         "dispatcher_pointer"
 #define CMD_DISPATCHER                         "cmd_dispatcher"
-#define END_DELIM                                      '}'
+#define END_DELIM                              '}'
 #define END_DELIM_STR                          " }"
 
 #define muse_return_if_fail(expr) \

diff --git a/core/src/muse_core.c b/core/src/muse_core.c
index 09a8a7f..cf843e2 100644 (file)
--- a/core/src/muse_core.c
+++ b/core/src/muse_core.c
@@ -684,7 +684,7 @@ void muse_core_dump_fd_state(int fd)
 
 void muse_core_update_fd_state(int fd)
 {
-       char atime[MUSE_MSG_LEN_MAX] = {'\0',};
+       char atime[MUSE_MSG_TIME_LEN] = {'\0',};
 
        g_mutex_lock(&fd_state_lock);
 
@@ -739,7 +739,7 @@ void muse_core_get_cur_time(char *time_buf)
        gettimeofday(&tv, NULL);
        strftime(cur_time, MUSE_MSG_LEN, "%m-%d %H:%M:%S", localtime_r(&(tv.tv_sec), &newtime));
 
-       snprintf(time_buf, MUSE_MSG_LEN_MAX, "%s.%03ld", cur_time, tv.tv_usec / 1000);
+       snprintf(time_buf, MUSE_MSG_TIME_LEN, "%s.%03ld", cur_time, tv.tv_usec / 1000);
 }
 
 void muse_core_log_process_thread_info(int pid)

diff --git a/packaging/mused.spec b/packaging/mused.spec
index 81bdd4c..85d6b76 100644 (file)
--- a/packaging/mused.spec
+++ b/packaging/mused.spec
@@ -1,6 +1,6 @@
 Name:       mused
 Summary:    A multimedia daemon
-Version:    0.3.95
+Version:    0.3.96
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0

diff --git a/server/include/muse_server_log.h b/server/include/muse_server_log.h
index a1f9e67..3bf4501 100644 (file)
--- a/server/include/muse_server_log.h
+++ b/server/include/muse_server_log.h
@@ -28,15 +28,12 @@ extern "C" {
 
 #include "muse_core_internal.h"
 
-#define MUSE_LOG_LEN                   32
-#define MUSE_LOG_MSG_LEN               128
-#define MUSE_LOG_MSG_NUM               10
 
 typedef struct ms_log {
        size_t size;
        int fd;
        GMutex lock;
-       char latest_msgs[MUSE_LOG_MSG_NUM][MUSE_LOG_MSG_LEN];
+       char latest_msgs[MUSE_LOG_MSG_NUM][MUSE_MSG_LEN_MAX];
        int cur_idx;
 } ms_log_t;
 

diff --git a/server/src/muse_server_config.c b/server/src/muse_server_config.c
index fa2fc72..ce93fc7 100644 (file)
--- a/server/src/muse_server_config.c
+++ b/server/src/muse_server_config.c
@@ -105,7 +105,7 @@ static int _ms_config_parser(ms_config_t *conf)
 
        for (conf->gst_param_cnt = 0; conf->gst_param_cnt < MUSE_PARAM_MAX; conf->gst_param_cnt++) {
                memset(gst_param_key, 0, MUSE_MSG_LEN_MAX);
-               snprintf(gst_param_key, strlen(MUSE_GST) + 3, "%s%d", MUSE_GST, conf->gst_param_cnt + 1);
+               snprintf(gst_param_key, MUSE_MSG_LEN_MAX, "%s%d", MUSE_GST, conf->gst_param_cnt + 1);
 
                conf->gst_param_str[conf->gst_param_cnt] = _ms_config_get_str(conf->muse_dict, gst_param_key, NULL);
 

diff --git a/server/src/muse_server_log.c b/server/src/muse_server_log.c
index 1eba098..e1bf704 100644 (file)
--- a/server/src/muse_server_log.c
+++ b/server/src/muse_server_log.c
@@ -81,7 +81,7 @@ static void _ms_log_latest_msgs(ms_log_t *log)
 static void _ms_log_pid_time(ms_log_t *log, int pid)
 {
        char log_buf[MUSE_MSG_LEN_MAX];
-       char time_buf[MUSE_LOG_MSG_LEN];
+       char time_buf[MUSE_MSG_TIME_LEN];
 
        muse_return_if_fail(ms_is_log_enabled());
        muse_return_if_fail(log);
@@ -89,7 +89,7 @@ static void _ms_log_pid_time(ms_log_t *log, int pid)
        muse_return_if_fail(_ms_log_pid_is_valid(pid));
 
        muse_core_get_cur_time(time_buf);
-       snprintf(log_buf, sizeof(log_buf), "[PID] %d %s", pid, time_buf);
+       snprintf(log_buf, MUSE_MSG_LEN_MAX, "[PID] %d %s", pid, time_buf);
 
        ms_log_write(log_buf);
 }
@@ -280,14 +280,14 @@ static void _ms_log_set_fd(ms_log_t *log)
 
 static void _ms_log_cache_latest_msg(ms_log_t *log, int pid, char *msg)
 {
-       char time_buf[MUSE_LOG_MSG_LEN];
+       char time_buf[MUSE_MSG_TIME_LEN];
        muse_return_if_fail(msg);
        muse_return_if_fail(log);
 
        g_mutex_lock(&log->lock);
 
        muse_core_get_cur_time(time_buf);
-       snprintf(log->latest_msgs[log->cur_idx], MUSE_LOG_MSG_LEN, "[P%5d] %s %s", pid, time_buf, msg);
+       snprintf(log->latest_msgs[log->cur_idx], MUSE_MSG_LEN_MAX, "[P%5d] %s %s", pid, time_buf, msg);
 
        log->cur_idx = (log->cur_idx + 1) % MUSE_LOG_MSG_NUM;
 

diff --git a/server/src/muse_server_private.c b/server/src/muse_server_private.c
index 276ca19..aba37b0 100644 (file)
--- a/server/src/muse_server_private.c
+++ b/server/src/muse_server_private.c
@@ -25,6 +25,10 @@
 #include <gst/gst.h>
 #include <syslog.h>
 
+#if !GLIB_CHECK_VERSION(2, 58, 0)
+#define G_SOURCE_FUNC(f) ((GSourceFunc) (void (*)(void)) (f))
+#endif
+
 #ifdef MUSE_REGISTER_VIP
 #include <proc_stat.h>
 #endif
@@ -99,7 +103,7 @@ static bool _ms_attach(int fd, muse_module_callback connection_handler, gpointer
                return false;
        }
 
-       g_source_set_callback(src, (GSourceFunc)connection_handler, module_idx, NULL);
+       g_source_set_callback(src, G_SOURCE_FUNC(connection_handler), module_idx, NULL);
 
        if (g_source_attach(src, g_main_loop_get_context(muse_server->main_loop)) == 0) {
                LOGE("g_source_attach() is failed");