Replace free to g_free for g_strdup_xxx

Change-Id: Ia59c7ffade7ebb0f5c2b7d1029a8460aa9ecf0e7
Signed-off-by: Jiyong Min <jiyong.min@samsung.com>

diff --git a/include/media_controller_private.h b/include/media_controller_private.h
index 99d8438..38bc3cd 100755 (executable)
--- a/include/media_controller_private.h
+++ b/include/media_controller_private.h
@@ -88,6 +88,7 @@ extern "C" {
        } while (0)
 
 #define MC_SAFE_FREE(src)                      { if (src) {free(src); src = NULL; } }
+#define MC_SAFE_G_FREE(src)                    { if (src) {g_free(src); src = NULL; } }
 #define MC_STRING_VALID(str)                           ((str != NULL && strlen(str) > 0) ? TRUE : FALSE)
 #define MC_STRING_DELIMITER                    "VAL_SEP"
 

diff --git a/packaging/capi-media-controller.spec b/packaging/capi-media-controller.spec
index dcbdc05..261da8a 100755 (executable)
--- a/packaging/capi-media-controller.spec
+++ b/packaging/capi-media-controller.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-controller
 Summary:    A media controller library in Tizen Native API
-Version:    0.1.29
+Version:    0.1.30
 Release:    1
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/media_controller_client.c b/src/media_controller_client.c
index 817a774..12fee98 100755 (executable)
--- a/src/media_controller_client.c
+++ b/src/media_controller_client.c
@@ -964,8 +964,8 @@ int mc_client_send_playback_state_command(mc_client_h client, const char *server
        if (ret != MEDIA_CONTROLLER_ERROR_NONE)
                mc_error("Error mc_ipc_send_message [%d]", ret);
 
-       MC_SAFE_FREE(message);
-       MC_SAFE_FREE(interface_name);
+       MC_SAFE_G_FREE(message);
+       MC_SAFE_G_FREE(interface_name);
 
        return ret;
 }
@@ -1015,8 +1015,8 @@ int mc_client_send_custom_command(mc_client_h client, const char *server_name, c
        if (ret != MEDIA_CONTROLLER_ERROR_NONE)
                mc_error("Error mc_ipc_send_message [%d]", ret);
 
-       MC_SAFE_FREE(message);
-       MC_SAFE_FREE(interface_name);
+       MC_SAFE_G_FREE(message);
+       MC_SAFE_G_FREE(interface_name);
 
        return ret;
 }

diff --git a/src/media_controller_ipc.c b/src/media_controller_ipc.c
old mode 100644 (file)
new mode 100755 (executable)
index ebb8cb1..16ad6b1
--- a/src/media_controller_ipc.c
+++ b/src/media_controller_ipc.c
@@ -170,22 +170,22 @@ int mc_ipc_register_listener(GList *listener_list, GDBusConnection *connection,
        if (_mc_ipc_is_listener_duplicated(listener_list, key)) {
                mc_error("listener is duplicated");
 
-               MC_SAFE_FREE(key);
+               MC_SAFE_G_FREE(key);
                return MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER;
        }
 
        mc_ipc_listener_s *listener = (mc_ipc_listener_s *)g_malloc(sizeof(mc_ipc_listener_s));
        if (listener == NULL) {
                mc_error("Error memroy allocation");
-               MC_SAFE_FREE(key);
+               MC_SAFE_G_FREE(key);
                return MEDIA_CONTROLLER_ERROR_OUT_OF_MEMORY;
        }
 
        handler = _mc_ipc_signal_subscribe(connection, interface_name, signal_name, listener_list);
 
        listener->dbus_conn = connection;
-       listener->interface_name = g_strdup(interface_name);
-       listener->signal_name = g_strdup(signal_name);
+       listener->interface_name = strdup(interface_name);
+       listener->signal_name = strdup(signal_name);
        listener->callback = callback;
        listener->user_data = user_data;
        listener->handler = handler;
@@ -220,14 +220,14 @@ int mc_ipc_unregister_listener(GList *listener_list, GDBusConnection *connection
                        _mc_ipc_signal_unsubscribe(connection, listener->handler);
                        MC_SAFE_FREE(listener->interface_name);
                        MC_SAFE_FREE(listener->signal_name);
-                       MC_SAFE_FREE(listener->key);
+                       MC_SAFE_G_FREE(listener->key);
                        (listener_list) = g_list_remove(listener_list, listener);
                        MC_SAFE_FREE(listener);
                        mc_debug("listener[%s.%s] is unregistered", interface_name, signal_name);
                }
        }
 
-       MC_SAFE_FREE(key);
+       MC_SAFE_G_FREE(key);
 
        return MEDIA_CONTROLLER_ERROR_NONE;
 }
@@ -245,7 +245,7 @@ int mc_ipc_unregister_all_listener(GList *listener_list, GDBusConnection *connec
                        _mc_ipc_signal_unsubscribe(connection, listener->handler);
                        MC_SAFE_FREE(listener->interface_name);
                        MC_SAFE_FREE(listener->signal_name);
-                       MC_SAFE_FREE(listener->key);
+                       MC_SAFE_G_FREE(listener->key);
                        (listener_list) = g_list_remove(listener_list, listener);
                        MC_SAFE_FREE(listener);
                }

diff --git a/src/media_controller_server.c b/src/media_controller_server.c
index ae244d6..916c202 100755 (executable)
--- a/src/media_controller_server.c
+++ b/src/media_controller_server.c
@@ -247,8 +247,8 @@ static int __mc_server_send_message(media_controller_server_s *mc_server, const
                        mc_error("Error mc_ipc_send_message [%d]", ret);
        }
 
-       MC_SAFE_FREE(filter_interface_name);
-       MC_SAFE_FREE(message);
+       MC_SAFE_G_FREE(filter_interface_name);
+       MC_SAFE_G_FREE(message);
 
        return ret;
 }
@@ -547,8 +547,8 @@ int mc_server_send_command_reply(mc_server_h server, const char *client_name, in
        if (ret != MEDIA_CONTROLLER_ERROR_NONE)
                mc_error("fail mc_ipc_send_message [%d]", ret);
 
-       MC_SAFE_FREE(message);
-       MC_SAFE_FREE(interface_name);
+       MC_SAFE_G_FREE(message);
+       MC_SAFE_G_FREE(interface_name);
 
        return ret;
 }

diff --git a/src/media_controller_util.c b/src/media_controller_util.c
index fd72fc0..f6c6762 100755 (executable)
--- a/src/media_controller_util.c
+++ b/src/media_controller_util.c
@@ -86,7 +86,7 @@ char *mc_util_get_interface_name(const char *type, const char *name)
        temp = g_strdup_printf("%s.%s.%s", MC_DBUS_INTERFACE_PREFIX, type, name);
 
        _mc_util_check_valid_name(temp, &interface_name);
-       MC_SAFE_FREE(temp);
+       MC_SAFE_G_FREE(temp);
        return interface_name;
 }
 
@@ -106,7 +106,7 @@ int mc_util_make_filter_interface_name(const char *prefix, const char *filter, c
 
        _mc_util_check_valid_name(temp, interface_name);
 
-       MC_SAFE_FREE(temp);
+       MC_SAFE_G_FREE(temp);
 
        return MEDIA_CONTROLLER_ERROR_NONE;
 }
@@ -128,7 +128,7 @@ int mc_util_set_command_availabe(const char *name, const char *command_type, con
 
        ret = mc_ipc_send_message_to_server(MC_MSG_CLIENT_SET, message);
 
-       MC_SAFE_FREE(message);
+       MC_SAFE_G_FREE(message);
 
        return ret;
 }
@@ -150,7 +150,7 @@ int mc_util_get_command_availabe(const char *name, const char *command_type, con
 
        ret = mc_ipc_send_message_to_server(MC_MSG_CLIENT_GET, message);
 
-       MC_SAFE_FREE(message);
+       MC_SAFE_G_FREE(message);
 
        return ret;
 }