Fix minor issues

Change-Id: I9a02a8840542e319abcef63abbc2f8e61f113593
Signed-off-by: Kichan Kwon <k_c.kwon@samsung.com>

diff --git a/src/common/procfs.c b/src/common/procfs.c
index dcab9850af7b6fbf4cd2bf54d84624afad401a0a..b2e4b38990bc417d41fd9903104379277dbcaf59 100644 (file)
--- a/src/common/procfs.c
+++ b/src/common/procfs.c
@@ -324,7 +324,7 @@ int proc_get_zram_usage(pid_t pid, unsigned int *usage)
         * Calculate aproximated value of zram usage for selected process
         * by formula: proc_zram_usage = ( VmSwap x ZramMemoryUsage )/SwapTotal
         */
-       *usage = ((float)((proc_swap_usage*BYTE_TO_KBYTE(zram_usage))/swap_total));
+       *usage = (int)((float)proc_swap_usage * BYTE_TO_KBYTE(zram_usage) / swap_total);
 
        return RESOURCED_ERROR_NONE;
 }
@@ -451,13 +451,11 @@ unsigned int proc_get_swap_total(void)
 {
        struct meminfo mi;
        int ret;
-       char error_buf[256];
 
        ret = proc_get_meminfo(&mi, MEMINFO_MASK_SWAP_TOTAL);
        if (ret < 0) {
-               _E("Failed to get %s: %s",
-                  meminfo_id_to_string(MEMINFO_ID_SWAP_TOTAL),
-                  strerror_r(-ret, error_buf, sizeof(error_buf)));
+               _E("Failed to get %s: %m",
+                  meminfo_id_to_string(MEMINFO_ID_SWAP_TOTAL));
                return 0;
        }
 
@@ -678,7 +676,7 @@ int proc_get_meminfo(struct meminfo *mi, enum meminfo_mask mask)
 
                k = strndup(buf, l);
                if (!k)
-                       return -ENOMEM;
+                       return -errno;
 
                id = meminfo_string_to_id(k);
                if (id < 0 || id >= MEMINFO_ID_MAX)

diff --git a/src/common/resourced-helper-worker.c b/src/common/resourced-helper-worker.c
index b845cdb50bf6141e061dae3439dee416aa984a98..cb6926cc0d40979651b6f1fb6aba907c3b279720 100644 (file)
--- a/src/common/resourced-helper-worker.c
+++ b/src/common/resourced-helper-worker.c
@@ -117,7 +117,7 @@ static int pipe_init(void)
 static void pipe_exit(void)
 {
        if (phandler) {
-               remove_fd_read_handler(phandler);
+               remove_fd_read_handler(&phandler);
                phandler = NULL;
        }
 
@@ -224,7 +224,7 @@ static int resourced_worker_finalize(void *data)
        return RESOURCED_ERROR_NONE;
 }
 
-static const struct module_ops resourced_helper_worker_ops = {
+static struct module_ops resourced_helper_worker_ops = {
        .priority = MODULE_PRIORITY_HIGH,
        .name = "resourced-helper-worker",
        .init = resourced_worker_init,

diff --git a/src/heart/heart-cpu.c b/src/heart/heart-cpu.c
index 11a06f949ce29bf3bb8c1541de4403caf7db3d19..51da4b5b96eba3713a3d05d989d6bab6d8ad0f88 100644 (file)
--- a/src/heart/heart-cpu.c
+++ b/src/heart/heart-cpu.c
@@ -1541,6 +1541,8 @@ static int heart_cpu_init(void *data)
 
                userinfo_for_each(elem, user_list) {
                        cache = (struct heart_cpu_dat_cache*)malloc(sizeof(struct heart_cpu_dat_cache));
+                       assert(cache);
+
                        cache->path = strndup(elem->home_dir, strlen(elem->home_dir));
                        cache->list = g_hash_table_new_full(
                                        g_str_hash,

diff --git a/src/heart/logging.c b/src/heart/logging.c
index 2e97c22fad3f68b01f4c7c199d95f006e32232c7..80c3ea59a054f0dc39117e397dffef2a7b299b9d 100644 (file)
--- a/src/heart/logging.c
+++ b/src/heart/logging.c
@@ -78,6 +78,7 @@
                func(format, ##arg); \
                pthread_mutex_unlock(&(module->cache_mutex)); \
                sqlite3_finalize(db_elem->insert_stmt); \
+               db_elem->insert_stmt = NULL; \
                return; \
        } } while (0)
 
@@ -225,8 +226,10 @@ static void logging_free_db_key(gpointer data)
 static void logging_free_db_value(gpointer data)
 {
        struct logging_db *db_elem = (struct logging_db*)data;
-       if (db_elem->insert_stmt)
+       if (db_elem->insert_stmt) {
                sqlite3_finalize(db_elem->insert_stmt);
+               db_elem->insert_stmt = NULL;
+       }
        if (db_elem->file)
                sqlite3_close(db_elem->file);
        if (db_elem->path)
@@ -407,7 +410,11 @@ int logging_module_init(char *name, enum logging_period max_period,
                        goto error;
                }
                db_elem = (struct logging_db*)malloc(sizeof(struct logging_db));
+               assert(db_elem);
+
                db_elem->path = strndup(db_path, sizeof(db_path));
+               assert(db_elem->path);
+
                db_elem->file = db_file;
                db_elem->insert_stmt = NULL;
                g_hash_table_insert(module->db_list, GINT_TO_POINTER(UID_FOR_ROOT), (gpointer)db_elem);

diff --git a/src/memory/lowmem-limit.c b/src/memory/lowmem-limit.c
index 40c381aacd4f06315569cdd23f3e192a1a378aed..227a270699bc9b6656a61aceba9256c61b431f17 100644 (file)
--- a/src/memory/lowmem-limit.c
+++ b/src/memory/lowmem-limit.c
@@ -137,7 +137,7 @@ static void memory_limit_hash_destroy(gpointer data)
        struct memory_limit_event *mle = (struct memory_limit_event *)data;
        close(mle->fd);
        free(mle->path);
-       remove_fd_read_handler(mle->fdh);
+       remove_fd_read_handler(&(mle->fdh));
        free(mle);
 }