Update to set module to NULL in cleanup

Change-Id: I626b7dcf19f645658cfbc488c237f72596b1688a

diff --git a/src/muse_core.c b/src/muse_core.c
index 29de50b..78e7b86 100644 (file)
--- a/src/muse_core.c
+++ b/src/muse_core.c
@@ -699,6 +699,8 @@ void muse_core_worker_exit(muse_module_h module)
        if (module->ch[MUSE_CHANNEL_MSG].p_gthread)
                g_thread_unref(module->ch[MUSE_CHANNEL_MSG].p_gthread);
 
+       memset(module, 0, sizeof(muse_module_t));
+
        MUSE_FREE(module);
 
        muse_core_tool_recursive_rmdir(MUSE_DATA_ROOT_PATH);

diff --git a/src/muse_core_config.c b/src/muse_core_config.c
index 9351d81..ce95812 100644 (file)
--- a/src/muse_core_config.c
+++ b/src/muse_core_config.c
@@ -267,7 +267,7 @@ static void _muse_core_config_init_instance(void(*free)(void), char *(*get_path)
        g_return_if_fail(get_path);
        g_return_if_fail(g_muse_core_conf == NULL);
 
-       g_muse_core_conf = calloc(1, sizeof(*g_muse_core_conf));
+       g_muse_core_conf = calloc(1, sizeof(muse_core_config_t));
        g_return_if_fail(g_muse_core_conf);
 
        g_muse_core_conf->free = free;

diff --git a/src/muse_core_ipc.c b/src/muse_core_ipc.c
index 0430ac4..d16e9fa 100644 (file)
--- a/src/muse_core_ipc.c
+++ b/src/muse_core_ipc.c
@@ -512,7 +512,7 @@ static void _muse_core_ipc_push_data(gpointer data)
 
        g_queue_push_tail(g_muse_core_ipc->module_queue, data);
 
-       LOGD("g_queue_get_length : %d [%p]", g_queue_get_length(g_muse_core_ipc->module_queue), data);
+       LOGW("g_queue_get_length : %d [%p]", g_queue_get_length(g_muse_core_ipc->module_queue), data);
 
        g_mutex_unlock(&g_muse_core_ipc->g_muse_ipc_queue_lock);
 
@@ -550,7 +550,7 @@ static void _muse_core_ipc_init_instance(void(*push_data) (gpointer), void(*free
        g_return_if_fail(free);
        g_return_if_fail(g_muse_core_ipc == NULL);
 
-       g_muse_core_ipc = calloc(1, sizeof(*g_muse_core_ipc));
+       g_muse_core_ipc = calloc(1, sizeof(muse_core_ipc_t));
        g_return_if_fail(g_muse_core_ipc);
 
        g_muse_core_ipc->table = g_hash_table_new(g_direct_hash, g_direct_equal);
@@ -878,7 +878,6 @@ intptr_t muse_core_ipc_get_handle(muse_module_h module)
 int muse_core_ipc_set_handle(muse_module_h module, intptr_t handle)
 {
        g_return_val_if_fail(module, MM_ERROR_INVALID_ARGUMENT);
-       g_return_val_if_fail(handle, MM_ERROR_INVALID_HANDLE);
 
        module->handle = handle;
        return MM_ERROR_NONE;

diff --git a/src/muse_core_log.c b/src/muse_core_log.c
index 5a33882..9a6ae75 100644 (file)
--- a/src/muse_core_log.c
+++ b/src/muse_core_log.c
@@ -476,7 +476,7 @@ static void _muse_core_log_init_instance(void(*log)(char *), void(*log_attr)(con
        g_return_if_fail(fatal);
        g_return_if_fail(g_muse_core_log == NULL);
 
-       g_muse_core_log = calloc(1, sizeof(*g_muse_core_log));
+       g_muse_core_log = calloc(1, sizeof(muse_core_log_t));
        g_return_if_fail(g_muse_core_log);
 
        g_muse_core_log->log = log;

diff --git a/src/muse_core_module.c b/src/muse_core_module.c
index 3dabd96..2454b87 100644 (file)
--- a/src/muse_core_module.c
+++ b/src/muse_core_module.c
@@ -266,7 +266,7 @@ static void _muse_core_module_init_instance(GModule *(*load)(int), int(*dispatch
 
        g_return_if_fail(g_muse_core_module == NULL);
 
-       g_muse_core_module = calloc(1, sizeof(*g_muse_core_module));
+       g_muse_core_module = calloc(1, sizeof(muse_core_module_t));
        g_return_if_fail(g_muse_core_module);
 
        g_muse_core_module->load = load;

diff --git a/src/muse_core_msg_json.c b/src/muse_core_msg_json.c
index 11dfd39..58c68c3 100644 (file)
--- a/src/muse_core_msg_json.c
+++ b/src/muse_core_msg_json.c
@@ -265,7 +265,7 @@ static void _muse_core_msg_init_instance(void *(*jobj_new)(char *, int *, muse_c
 {
        g_return_if_fail(g_muse_core_msg == NULL);
 
-       g_muse_core_msg = calloc(1, sizeof(*g_muse_core_msg));
+       g_muse_core_msg = calloc(1, sizeof(muse_core_msg_t));
        g_return_if_fail(g_muse_core_msg);
 
        g_muse_core_msg->jobj_new = jobj_new;

diff --git a/src/muse_core_security.c b/src/muse_core_security.c
index 928b874..b71b7af 100644 (file)
--- a/src/muse_core_security.c
+++ b/src/muse_core_security.c
@@ -157,7 +157,7 @@ static void _muse_core_security_init_instance(int(*new)(void), void(*free)(void)
        g_return_if_fail(new);
        g_return_if_fail(free);
 
-       g_muse_core_security = calloc(1, sizeof(*g_muse_core_security));
+       g_muse_core_security = calloc(1, sizeof(muse_core_security_t));
        g_return_if_fail(g_muse_core_security);
 
        g_muse_core_security->new = new;

diff --git a/src/muse_core_system.c b/src/muse_core_system.c
index e7afb26..e11eb4d 100644 (file)
--- a/src/muse_core_system.c
+++ b/src/muse_core_system.c
@@ -240,7 +240,7 @@ static void _muse_core_system_init_instance(gboolean(*get_gdbus)(GDBusConnection
 {
        GError *error = NULL;
 
-       g_muse_core_system = calloc(1, sizeof(*g_muse_core_system));
+       g_muse_core_system = calloc(1, sizeof(muse_core_system_t));
        g_return_if_fail(g_muse_core_system);
        g_return_if_fail(get_gdbus);
        g_return_if_fail(subscribe_poweroff_state_change);

diff --git a/src/muse_core_workqueue.c b/src/muse_core_workqueue.c
index d5bf935..a19082e 100644 (file)
--- a/src/muse_core_workqueue.c
+++ b/src/muse_core_workqueue.c
@@ -130,14 +130,14 @@ int muse_core_workqueue_init(int numWorkers)
 
        if (numWorkers < 1)
                numWorkers = 1;
-       memset(g_workqueue, 0, sizeof(*g_workqueue));
+       memset(g_workqueue, 0, sizeof(muse_core_workqueue_workqueue_t));
        memcpy(&g_workqueue->jobs_mutex, &blank_mutex, sizeof(g_workqueue->jobs_mutex));
        memcpy(&g_workqueue->jobs_cond, &blank_cond, sizeof(g_workqueue->jobs_cond));
 
        for (i = 0; i < numWorkers; i++) {
                worker = malloc(sizeof(muse_core_workqueue_worker_t));
                g_return_val_if_fail(worker, MM_ERROR_INVALID_ARGUMENT);
-               memset(worker, 0, sizeof(*worker));
+               memset(worker, 0, sizeof(muse_core_workqueue_worker_t));
                worker->workqueue = g_workqueue;
                if (pthread_create(&worker->thread, NULL, _muse_core_workqueue_worker_function, (void *)worker)) {
                        LOGE("Failed to start all worker threads");