From: Ji Yong Min <jiyong.min@samsung.com>
Date: Thu, 10 Dec 2015 04:30:23 +0000 (+0900)
Subject: Remove unused source code & remove static analyzer dereferenced warning
X-Git-Tag: submit/tizen/20151214.044322^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=770ed48b4199b08deaa91ccdc7bfeb3364ccfe1c;p=platform%2Fcore%2Fapi%2Fmedia-controller.git

Remove unused source code & remove static analyzer dereferenced warning

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

diff --git a/packaging/capi-media-controller.spec b/packaging/capi-media-controller.spec
index 6ff94fc..ad5d0cb 100755
--- a/packaging/capi-media-controller.spec
+++ b/packaging/capi-media-controller.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-controller
 Summary:    Multimedia Controller for player application
-Version:    0.0.12
+Version:    0.0.13
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0
diff --git a/src/media_controller_client.c b/src/media_controller_client.c
index ebf8826..8db65bd 100755
--- a/src/media_controller_client.c
+++ b/src/media_controller_client.c
@@ -63,7 +63,7 @@ static void __client_playback_cb(const char *interface_name, const char *signal_
 	}
 
 	playback->state = atoi(params[1]);
-	playback->position = atol(params[2]);
+	playback->position = strtoull(params[2], NULL, 10);
 
 	callback(params[0], (mc_playback_h) playback, reciever->user_data);
 
diff --git a/svc/media_controller_db_util.c b/svc/media_controller_db_util.c
index 0842ef5..b4e8b22 100755
--- a/svc/media_controller_db_util.c
+++ b/svc/media_controller_db_util.c
@@ -161,17 +161,6 @@ static char* __mc_get_db_name(uid_t uid)
 	if (!dir)
 		return strdup(result_psswd);
 
-	/* Control if db exist create otherwise */
-	if (access(dir + 1, F_OK)) {
-		int ret;
-		mkdir(dir + 1, S_IRWXU | S_IRGRP | S_IXGRP | S_IXOTH);
-		ret = chown(dir + 1, uid, grpinfo->gr_gid);
-		if (ret == -1) {
-			mc_debug("FAIL : chown %s %d.%d ", dir + 1, uid, grpinfo->gr_gid);
-			mc_stderror("FAIL : chown");
-		}
-	}
-
 	result_psswd_rtn = strdup(result_psswd);
 
 	return result_psswd_rtn;
diff --git a/svc/media_controller_svc.c b/svc/media_controller_svc.c
index a84a7e6..1206b93 100755
--- a/svc/media_controller_svc.c
+++ b/svc/media_controller_svc.c
@@ -121,6 +121,17 @@ static int __create_socket_activation(void)
 	}
 }
 
+static void _mc_svc_destroy_data(gpointer data)
+{
+	mc_svc_list_t *svc_data = (mc_svc_list_t *)data;
+
+	if (svc_data != NULL) {
+		MC_SAFE_FREE(svc_data->data);
+		MC_SAFE_FREE(svc_data);
+		svc_data = NULL;
+	}
+}
+
 gboolean _mc_read_service_request_tcp_socket(GIOChannel *src, GIOCondition condition, gpointer data)
 {
 	int sock = -1;
@@ -207,7 +218,7 @@ gboolean _mc_read_service_request_tcp_socket(GIOChannel *src, GIOCondition condi
 			}
 		}
 	} else if (recv_msg.msg_type == MC_MSG_SERVER_CONNECTION) {
-		if ((recv_msg.msg_size > 0) && (recv_msg.msg != NULL)) {
+		if (recv_msg.msg_size > 0) {
 			if (strncmp(recv_msg.msg, MC_SERVER_CONNECTION_MSG, recv_msg.msg_size) == 0) {
 				if (g_connection_cnt == -1)
 					g_connection_cnt = 1;
@@ -226,7 +237,7 @@ gboolean _mc_read_service_request_tcp_socket(GIOChannel *src, GIOCondition condi
 			send_msg = MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
 		}
 	} else if (recv_msg.msg_type == MC_MSG_SERVER_DISCONNECTION) {
-		if ((recv_msg.msg_size > 0) && (recv_msg.msg != NULL)) {
+		if (recv_msg.msg_size > 0) {
 			if (strncmp(recv_msg.msg, MC_SERVER_DISCONNECTION_MSG, recv_msg.msg_size) == 0) {
 				g_connection_cnt--;
 				mc_error("[No-error] decreased connection count [%d]", g_connection_cnt);
@@ -367,27 +378,16 @@ gboolean mc_svc_thread(void *data)
 	g_io_channel_shutdown(channel,  FALSE, NULL);
 	g_io_channel_unref(channel);
 
-
-	if (mc_svc_data->mc_svc_list != NULL) {
-		unsigned int idx = 0;
-
-		for (idx = 0; idx < g_list_length(mc_svc_data->mc_svc_list); idx++) {
-			mc_svc_list_t *set_data = NULL;
-			set_data = (mc_svc_list_t *)g_list_nth_data(mc_svc_data->mc_svc_list, idx);
-			MC_SAFE_FREE(set_data->data);
-			MC_SAFE_FREE(set_data);
-		}
-
-		g_list_free(mc_svc_data->mc_svc_list);
-	}
-
-	MC_SAFE_FREE(mc_svc_data);
+	if (mc_svc_data->mc_svc_list != NULL)
+		g_list_free_full(mc_svc_data->mc_svc_list, _mc_svc_destroy_data);
 
 	/* Disconnect media controller DB*/
 	if (mc_db_util_disconnect(mc_svc_data->db_handle) != MEDIA_CONTROLLER_ERROR_NONE) {
 		mc_error("Failed to connect DB");
 	}
 
+	MC_SAFE_FREE(mc_svc_data);
+
 	/*close socket*/
 	close(sockfd);
 
diff --git a/test/server_test/media_controller_server_test.c b/test/server_test/media_controller_server_test.c
index fe0d6a9..d4d4379 100755
--- a/test/server_test/media_controller_server_test.c
+++ b/test/server_test/media_controller_server_test.c
@@ -172,7 +172,7 @@ static gboolean _set_info(int type, char *cmd)
 			g_print("set state: %d", playback_state);
 			break;
 		case CURRENT_STATE_SET_PLAYBACK_POSITION:
-			playback_position = atoi(cmd);
+			playback_position = strtoull(cmd, NULL, 10);
 			ret = mc_server_set_playback_position(g_mc_server, playback_position);
 			if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
 				g_print("Fail to set playback position");