Use g_strlcpy, g_strlcat directly

Change-Id: I9e4ee7d1460f3139a0667669cda5963a23f9dbcc
Signed-off-by: minje.ahn <minje.ahn@samsung.com>

diff --git a/lib/include/media-util.h b/lib/include/media-util.h
index 741d40e..d37c15e 100644 (file)
--- a/lib/include/media-util.h
+++ b/lib/include/media-util.h
@@ -41,7 +41,5 @@
 
 #define MS_SAFE_FREE(src)              { if (src) {free(src); src = NULL; } }
 #define MS_STRING_VALID(str)   (str && strlen(str) > 0)
-#define SAFE_STRLCPY(dst, src, n)      g_strlcpy(dst, src, n);
-#define SAFE_STRLCAT(dst, src, n)      g_strlcat(dst, src, n);
 
 #endif /*_MEDIA_UTIL_H_*/

diff --git a/lib/media-util-db.c b/lib/media-util-db.c
index 2ca52dc..8a06018 100644 (file)
--- a/lib/media-util-db.c
+++ b/lib/media-util-db.c
@@ -78,7 +78,7 @@ static void __media_db_collation_cb(void* pArg, sqlite3* handle, int charset, co
                /* get current locale */
                if (lang) {
                        uloc_setDefault(lang, &status);
-                       MS_SAFE_FREE(lang);
+                       free(lang);
                } else {
                        MSAPI_DBG_ERR("Fail to get current language vconf");
                        return;
@@ -197,7 +197,7 @@ static int __media_db_request_update_tcp(ms_msg_type_e msg_type, const char *req
        memset((void *)&send_msg, 0, sizeof(ms_comm_msg_s));
 
        send_msg.msg_type = msg_type;
-       SAFE_STRLCPY(send_msg.msg, request_msg, sizeof(send_msg.msg));
+       g_strlcpy(send_msg.msg, request_msg, sizeof(send_msg.msg));
        send_msg.uid = uid;
 
        /*Create Socket*/
@@ -207,7 +207,7 @@ static int __media_db_request_update_tcp(ms_msg_type_e msg_type, const char *req
        /*Set server Address*/
        memset(&serv_addr, 0, sizeof(serv_addr));
        serv_addr.sun_family = AF_UNIX;
-       SAFE_STRLCPY(serv_addr.sun_path, tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[MS_DB_UPDATE_PORT]), sizeof(serv_addr.sun_path));
+       g_strlcpy(serv_addr.sun_path, tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[MS_DB_UPDATE_PORT]), sizeof(serv_addr.sun_path));
 
        /* Connecting to the media db server */
        if (connect(sockfd, (struct sockaddr*)&serv_addr, sizeof(serv_addr)) < 0) {
@@ -414,7 +414,7 @@ static int __media_db_request_recovery(uid_t uid)
        memset((void *)&send_msg, 0, sizeof(ms_comm_msg_s));
 
        send_msg.msg_type = MS_MSG_MEDIA_DB_MALFORMED;
-       SAFE_STRLCPY(send_msg.msg, db_path, sizeof(send_msg.msg));
+       g_strlcpy(send_msg.msg, db_path, sizeof(send_msg.msg));
        g_free(db_path);
        send_msg.uid = uid;
 
@@ -426,7 +426,7 @@ static int __media_db_request_recovery(uid_t uid)
        memset(&serv_addr, 0, sizeof(serv_addr));
        serv_addr.sun_family = AF_UNIX;
        /*      MSAPI_DBG_SLOG("%s", MEDIA_IPC_PATH[port]); */
-       SAFE_STRLCPY(serv_addr.sun_path, MEDIA_IPC_PATH[MS_SCANNER_PORT], sizeof(serv_addr.sun_path));
+       g_strlcpy(serv_addr.sun_path, MEDIA_IPC_PATH[MS_SCANNER_PORT], sizeof(serv_addr.sun_path));
 
        /* Connecting to the media db server */
        if (connect(sockfd, (struct sockaddr*)&serv_addr, sizeof(serv_addr)) < 0) {

diff --git a/lib/media-util-ipc.c b/lib/media-util-ipc.c
index 3df9848..27c634f 100644 (file)
--- a/lib/media-util-ipc.c
+++ b/lib/media-util-ipc.c
@@ -71,7 +71,7 @@ int ms_ipc_create_server_socket(ms_msg_port_type_e port, int *sock_fd)
        memset(&serv_addr, 0, sizeof(serv_addr));
        serv_addr.sun_family = AF_UNIX;
        unlink(tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[serv_port]));
-       SAFE_STRLCPY(serv_addr.sun_path, tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[serv_port]), sizeof(serv_addr.sun_path));
+       g_strlcpy(serv_addr.sun_path, tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[serv_port]), sizeof(serv_addr.sun_path));
 
        /* Bind to the local address */
        for (i = 0; i < 100; i++) {
@@ -115,7 +115,7 @@ int ms_ipc_send_msg_to_server_tcp(int sockfd, ms_msg_port_type_e port, ms_comm_m
        memset(&addr, 0, sizeof(addr));
 
        addr.sun_family = AF_UNIX;
-       SAFE_STRLCPY(addr.sun_path, tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[port]), sizeof(addr.sun_path));
+       g_strlcpy(addr.sun_path, tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[port]), sizeof(addr.sun_path));
 
        /* Connecting to the media db server */
        if (connect(sockfd, (struct sockaddr*)&addr, sizeof(addr)) < 0) {

diff --git a/lib/media-util-noti.c b/lib/media-util-noti.c
index 6dd8d29..3bcbc82 100644 (file)
--- a/lib/media-util-noti.c
+++ b/lib/media-util-noti.c
@@ -137,9 +137,9 @@ static void __get_message(GVariant *message, db_updated_cb user_cb, void *userda
        /* getting data complete */
        user_cb(pid, item, update_type, update_path, uuid, content_type, mime_type, userdata);
 
-       MS_SAFE_FREE(update_path);
-       MS_SAFE_FREE(uuid);
-       MS_SAFE_FREE(mime_type);
+       g_free(update_path);
+       g_free(uuid);
+       g_free(mime_type);
 }
 
 static void __message_filter(GDBusConnection *connection,

diff --git a/lib/media-util-register.c b/lib/media-util-register.c
index 80ef340..6d7d82a 100644 (file)
--- a/lib/media-util-register.c
+++ b/lib/media-util-register.c
@@ -246,9 +246,9 @@ static int __media_db_request_update_async(ms_msg_type_e msg_type,
        send_msg.msg_type = msg_type;
        send_msg.pid = syscall(__NR_getpid);
        send_msg.uid = uid;
-       SAFE_STRLCPY(send_msg.msg, request_path, sizeof(send_msg.msg));
+       g_strlcpy(send_msg.msg, request_path, sizeof(send_msg.msg));
        if (MS_STRING_VALID(storage_id))
-               SAFE_STRLCPY(send_msg.storage_id, storage_id, sizeof(send_msg.storage_id));
+               g_strlcpy(send_msg.storage_id, storage_id, sizeof(send_msg.storage_id));
 
        /*Create Socket*/
        ret = ms_ipc_create_client_socket(0, &sockfd);
@@ -295,7 +295,7 @@ static int __media_db_request_update_cancel(ms_msg_type_e msg_type, const char *
        memset((void *)&send_msg, 0, sizeof(ms_comm_msg_s));
        send_msg.msg_type = msg_type;
        send_msg.pid = syscall(__NR_getpid);
-       SAFE_STRLCPY(send_msg.msg, request_path, sizeof(send_msg.msg));
+       g_strlcpy(send_msg.msg, request_path, sizeof(send_msg.msg));
 
        /*Create Socket*/
        ret = ms_ipc_create_client_socket(0, &sockfd);

diff --git a/lib/media-util-user.c b/lib/media-util-user.c
index 849dc3f..3177427 100644 (file)
--- a/lib/media-util-user.c
+++ b/lib/media-util-user.c
@@ -84,7 +84,7 @@ static int __ms_user_get_path(ms_user_path_type_e type, uid_t uid, char **path)
        tzplatform_context_destroy(context[idx]);
 
        MSAPI_RETVM_IF(ret != MS_MEDIA_ERR_NONE, ret, "Invalid type");
-       MSAPI_RETVM_IF(!MS_STRING_VALID(result), MS_MEDIA_ERR_INTERNAL, "Fail to get the path");
+       MSAPI_RETVM_IF(!result, MS_MEDIA_ERR_INTERNAL, "Fail to get the path");
 
        *path = g_strdup(result);
 

diff --git a/src/common/media-common-utils-tv.c b/src/common/media-common-utils-tv.c
index 9451c81..e2b8026 100644 (file)
--- a/src/common/media-common-utils-tv.c
+++ b/src/common/media-common-utils-tv.c
@@ -213,7 +213,7 @@ static int __ms_get_cmdline_from_proc(pid_t pid, char *cmdline)
        else
                filename = filename + 1;
 
-       SAFE_STRLCPY(cmdline, filename, PROC_NAME_MAX);
+       g_strlcpy(cmdline, filename, PROC_NAME_MAX);
 
        return MS_MEDIA_ERR_NONE;
 }

diff --git a/src/scanner-v2/media-scanner-extract-v2.c b/src/scanner-v2/media-scanner-extract-v2.c
index a1b56e1..6828825 100644 (file)
--- a/src/scanner-v2/media-scanner-extract-v2.c
+++ b/src/scanner-v2/media-scanner-extract-v2.c
@@ -411,8 +411,8 @@ void msc_insert_exactor_request(ms_msg_type_e msg_type, bool ins_status, const c
        extract_data->uid = uid;
        extract_data->result = ins_status;
        extract_data->noti_type = noti_type;
-       SAFE_STRLCPY(extract_data->msg, path, sizeof(extract_data->msg));
-       SAFE_STRLCPY(extract_data->storage_id, storage_id, sizeof(extract_data->storage_id));
+       g_strlcpy(extract_data->msg, path, sizeof(extract_data->msg));
+       g_strlcpy(extract_data->storage_id, storage_id, sizeof(extract_data->storage_id));
 
        MS_DBG("msg_type [%d] ins_status[%d]", msg_type, ins_status);
        if (msg_type == MS_MSG_STORAGE_ALL || msg_type == MS_MSG_STORAGE_PARTIAL || msg_type == MS_MSG_STORAGE_INVALID) {

diff --git a/src/scanner-v2/media-scanner-socket-v2.c b/src/scanner-v2/media-scanner-socket-v2.c
index b8bcdb2..923f193 100644 (file)
--- a/src/scanner-v2/media-scanner-socket-v2.c
+++ b/src/scanner-v2/media-scanner-socket-v2.c
@@ -143,7 +143,7 @@ int msc_send_result(int result, ms_comm_msg_s *res_data)
                send_msg.msg_type = MS_MSG_SCANNER_BULK_RESULT;
        send_msg.pid = res_data->pid;
        send_msg.result = result;
-       SAFE_STRLCPY(send_msg.msg, res_data->msg, sizeof(send_msg.msg));
+       g_strlcpy(send_msg.msg, res_data->msg, sizeof(send_msg.msg));
 
        /* send result message */
        if (write(fd, &send_msg, sizeof(send_msg)) < 0) {
@@ -183,7 +183,7 @@ int msc_send_result_partial(int result, ms_msg_type_e msg_type, int pid, const c
        send_msg.msg_type = msg_type;
        send_msg.pid = pid;
        send_msg.result = result;
-       SAFE_STRLCPY(send_msg.msg, msg, sizeof(send_msg.msg));
+       g_strlcpy(send_msg.msg, msg, sizeof(send_msg.msg));
 
        /* send ready message */
        err = write(fd, &send_msg, sizeof(send_msg));

diff --git a/src/scanner/media-scanner-socket.c b/src/scanner/media-scanner-socket.c
index 6d3173d..5c94262 100644 (file)
--- a/src/scanner/media-scanner-socket.c
+++ b/src/scanner/media-scanner-socket.c
@@ -129,7 +129,7 @@ int msc_send_result(int result, ms_comm_msg_s *res_data)
        send_msg.pid = res_data->pid;
        send_msg.result = result;
        send_msg.uid = res_data->uid;
-       SAFE_STRLCPY(send_msg.msg, res_data->msg, sizeof(send_msg.msg));
+       g_strlcpy(send_msg.msg, res_data->msg, sizeof(send_msg.msg));
 
        /* send result message */
        if (write(fd, &send_msg, sizeof(send_msg)) < 0) {

diff --git a/src/server/media-server-socket.c b/src/server/media-server-socket.c
index c52c289..46f6cac 100644 (file)
--- a/src/server/media-server-socket.c
+++ b/src/server/media-server-socket.c
@@ -116,7 +116,7 @@ void ms_reset_ownerlist(void)
                send_msg.pid = data->pid;
                send_msg.result = MS_MEDIA_ERR_DB_RESET;
                send_msg.msg_type = MS_MSG_MEDIA_DB_RESET;
-               SAFE_STRLCPY(send_msg.msg, data->req_path, sizeof(send_msg.msg));
+               g_strlcpy(send_msg.msg, data->req_path, sizeof(send_msg.msg));
 
                /* owner data exists */
                /* send result to the owner of request */
@@ -131,7 +131,7 @@ static int __ms_send_result_to_client(int pid, ms_comm_msg_s *recv_msg)
        ms_req_owner_data *data = NULL;
 
        MS_DBG_RETVM_IF(!recv_msg, MS_MEDIA_ERR_INVALID_PARAMETER, "recv_msg is NULL");
-       MS_DBG_RETVM_IF(!MS_STRING_VALID(recv_msg->msg), MS_MEDIA_ERR_INVALID_PARAMETER, "msg is NULL");
+       MS_DBG_RETVM_IF(strlen(recv_msg->msg) == 0, MS_MEDIA_ERR_INVALID_PARAMETER, "msg is empty");
        MS_DBG_RETVM_IF(!owner_list, MS_MEDIA_ERR_INTERNAL, "owner_list is NULL");
 
        if (recv_msg->msg_type == MS_MSG_SCANNER_PARTIAL) {
@@ -353,10 +353,10 @@ int ms_send_storage_scan_request(const char *root_path, const char *storage_id,
        }
 
        if (root_path != NULL)
-               SAFE_STRLCPY(scan_msg.msg, root_path, sizeof(scan_msg.msg));
+               g_strlcpy(scan_msg.msg, root_path, sizeof(scan_msg.msg));
 
        if (storage_id != NULL)
-               SAFE_STRLCPY(scan_msg.storage_id, storage_id, sizeof(scan_msg.storage_id));
+               g_strlcpy(scan_msg.storage_id, storage_id, sizeof(scan_msg.storage_id));
 
        scan_msg.uid = uid;
 
@@ -486,8 +486,8 @@ int ms_send_storage_otg_scan_request(const char *path, const char *device_uuid,
                return MS_MEDIA_ERR_INVALID_PARAMETER;
        }
 
-       SAFE_STRLCPY(scan_msg.msg, path, sizeof(scan_msg.msg));
-       SAFE_STRLCPY(scan_msg.storage_id, device_uuid, sizeof(scan_msg.storage_id));
+       g_strlcpy(scan_msg.msg, path, sizeof(scan_msg.msg));
+       g_strlcpy(scan_msg.storage_id, device_uuid, sizeof(scan_msg.storage_id));
        scan_msg.uid = uid;
 
        return ms_send_scan_request(&scan_msg, -1);