fix svace issue.

Change-Id: I31c40c86ba1628f46fdd9acce8467298f59e3604
Signed-off-by: HyiHong Chae <hh.chae@samsung.com>

diff --git a/packaging/mtp-responder.spec b/packaging/mtp-responder.spec
index 4885f2d7de75e12c4c16c601ad31020ed3165c3b..7c79f6e865d188e696c8620d2184a3f3fa0e96cc 100755 (executable)
--- a/packaging/mtp-responder.spec
+++ b/packaging/mtp-responder.spec
@@ -5,7 +5,7 @@ ExcludeArch: %arm aarch64
 
 Name:       mtp-responder
 Summary:    Media Transfer Protocol daemon (responder)
-Version:    0.0.4
+Version:    0.0.5
 Release:    1
 Group:      Network & Connectivity/Other
 License:    Apache-2.0

diff --git a/src/mtp_init.c b/src/mtp_init.c
index ca2455c5d3424f26ff5401e18a67c396ea314463..8210d79a4e2da38ea15c177e75fbf0f2914d3d04 100755 (executable)
--- a/src/mtp_init.c
+++ b/src/mtp_init.c
@@ -252,6 +252,7 @@ static void __read_mtp_conf(void)
        FILE *fp;
        char buf[256];
        char *token;
+       char *saveptr = NULL;
 
        g_conf.mmap_threshold = MTP_MMAP_THRESHOLD;
 
@@ -298,73 +299,73 @@ static void __read_mtp_conf(void)
                }
                *token = '\0';
 
-               token = strtok(buf, "=");
+               token = strtok_r(buf, "=", &saveptr);
                if (token == NULL) {
                        continue;
                }
 
                if (strcasecmp(token, "mmap_threshold") == 0) {
-                       token = strtok(NULL, "=");
+                       token = strtok_r(NULL, "=", &saveptr);
                        g_conf.mmap_threshold = atoi(token);
 
                } else if (strcasecmp(token, "init_rx_ipc_size") == 0) {
-                       token = strtok(NULL, "=");
+                       token = strtok_r(NULL, "=", &saveptr);
                        g_conf.init_rx_ipc_size = atoi(token);
 
                } else if (strcasecmp(token, "init_tx_ipc_size") == 0) {
-                       token = strtok(NULL, "=");
+                       token = strtok_r(NULL, "=", &saveptr);
                        g_conf.init_tx_ipc_size = atoi(token);
 
                } else if (strcasecmp(token, "max_rx_ipc_size") == 0) {
-                       token = strtok(NULL, "=");
+                       token = strtok_r(NULL, "=", &saveptr);
                        g_conf.max_rx_ipc_size = atoi(token);
 
                } else if (strcasecmp(token, "max_tx_ipc_size") == 0) {
-                       token = strtok(NULL, "=");
+                       token = strtok_r(NULL, "=", &saveptr);
                        g_conf.max_tx_ipc_size = atoi(token);
 
                } else if (strcasecmp(token, "read_usb_size") == 0) {
-                       token = strtok(NULL, "=");
+                       token = strtok_r(NULL, "=", &saveptr);
                        g_conf.read_usb_size = atoi(token);
 
                } else if (strcasecmp(token, "write_usb_size") == 0) {
-                       token = strtok(NULL, "=");
+                       token = strtok_r(NULL, "=", &saveptr);
                        g_conf.write_usb_size = atoi(token);
 
                } else if (strcasecmp(token, "read_file_size") == 0) {
-                       token = strtok(NULL, "=");
+                       token = strtok_r(NULL, "=", &saveptr);
                        g_conf.read_file_size = atoi(token);
 
                } else if (strcasecmp(token, "write_file_size") == 0) {
-                       token = strtok(NULL, "=");
+                       token = strtok_r(NULL, "=", &saveptr);
                        g_conf.write_file_size = atoi(token);
 
                } else if (strcasecmp(token, "max_io_buf_size") == 0) {
-                       token = strtok(NULL, "=");
+                       token = strtok_r(NULL, "=", &saveptr);
                        g_conf.max_io_buf_size = atoi(token);
 
                } else if (strcasecmp(token, "read_file_delay") == 0) {
-                       token = strtok(NULL, "=");
+                       token = strtok_r(NULL, "=", &saveptr);
                        g_conf.read_file_delay = atoi(token);
 
                } else if (strcasecmp(token, "support_pthread_sched") == 0) {
-                       token = strtok(NULL, "=");
+                       token = strtok_r(NULL, "=", &saveptr);
                        g_conf.support_pthread_sched = atoi(token) ? true : false;
 
                } else if (strcasecmp(token, "inheritsched") == 0) {
-                       token = strtok(NULL, "=");
+                       token = strtok_r(NULL, "=", &saveptr);
                        g_conf.inheritsched = *token;
 
                } else if (strcasecmp(token, "schedpolicy") == 0) {
-                       token = strtok(NULL, "=");
+                       token = strtok_r(NULL, "=", &saveptr);
                        g_conf.schedpolicy = *token;
 
                } else if (strcasecmp(token, "file_schedparam") == 0) {
-                       token = strtok(NULL, "=");
+                       token = strtok_r(NULL, "=", &saveptr);
                        g_conf.file_schedparam = atoi(token);
 
                } else if (strcasecmp(token, "usb_schedparam") == 0) {
-                       token = strtok(NULL, "=");
+                       token = strtok_r(NULL, "=", &saveptr);
                        g_conf.usb_schedparam = atoi(token);
 
                } else {

diff --git a/src/mtp_inoti_handler.c b/src/mtp_inoti_handler.c
index 64aeafc749bfc36b6fdc73ed96c7c80fefd9c737..b4daf28729df5a9daa8d2cfae50ca57988e272cf 100755 (executable)
--- a/src/mtp_inoti_handler.c
+++ b/src/mtp_inoti_handler.c
@@ -579,7 +579,7 @@ static void __process_object_added_event(mtp_char *fullpath,
 
        g_strlcpy(dir_info.filename, fullpath, MTP_MAX_PATHNAME_SIZE + 1);
        dir_info.attrs.mtime = stat_buf.st_mtime;
-       dir_info.attrs.fsize = stat_buf.st_size;
+       dir_info.attrs.fsize = (mtp_uint64)stat_buf.st_size;
 
        /* Reset the attributes */
        dir_info.attrs.attribute = MTP_FILE_ATTR_MODE_NONE;

diff --git a/src/util/mtp_fs.c b/src/util/mtp_fs.c
index 4257446043614083fcbf2e7d5b9cc6e66645d722..ba9e3b2ca7154f74c69bcfe4b410e60b30787842 100755 (executable)
--- a/src/util/mtp_fs.c
+++ b/src/util/mtp_fs.c
@@ -588,7 +588,7 @@ mtp_bool _util_get_file_attrs(const mtp_char *filename, file_attr_t *attrs)
        }
 
        memset(attrs, 0, sizeof(file_attr_t));
-       attrs->fsize = fileinfo.st_size;
+       attrs->fsize = (mtp_uint64)fileinfo.st_size;
        attrs->ctime = fileinfo.st_ctime;
        attrs->mtime = fileinfo.st_mtime;
 
@@ -749,7 +749,7 @@ mtp_bool _util_ifind_next(mtp_char *dir_name, DIR *dirp, dir_entry_t *dir_info)
 
        /* Directory Information */
        dir_info->attrs.mtime = stat_buf.st_mtime;
-       dir_info->attrs.fsize = stat_buf.st_size;
+       dir_info->attrs.fsize = (mtp_uint64)stat_buf.st_size;
 
        return TRUE;
 }
@@ -766,7 +766,7 @@ mtp_bool _util_get_filesystem_info(mtp_char *storepath, fs_info_t *fs_info)
                return FALSE;
        }
 
-       capacity = used_size = avail_size = buf.f_bsize;
+       capacity = used_size = avail_size = (mtp_uint64)buf.f_bsize;
        DBG("Block size : %d\n", buf.f_bsize);
        capacity *= buf.f_blocks;
        used_size *= (buf.f_blocks - buf.f_bavail);