Adjust coding rules

Change-Id: I75154b9752e50f583194a8f02c447ee14286b48d
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>

10 files changed, 201 insertions, 250 deletions

diff --git a/include/minicontrol-log.h b/include/minicontrol-log.h
index 1fabb1f..0a8d4b5 100755
--- a/include/minicontrol-log.h
+++ b/include/minicontrol-log.h
@@ -28,46 +28,30 @@
 #endif
 
 #define LOG_TAG "MINICONTROL"
-#define DBG(fmt , args...) \
-	do { \
-		SECURE_LOGD("[%s : %d] "fmt"\n", __func__, __LINE__, ##args); \
-	} while (0)
+#define DBG(fmt, args...) \
+	SECURE_LOGD("[%s : %d] "fmt"\n", __func__, __LINE__, ##args)
 
-#define INFO(fmt , args...) \
-	do { \
-		SECURE_LOGI("[%s : %d] "fmt"\n", __func__, __LINE__, ##args); \
-	} while (0)
+#define INFO(fmt, args...) \
+	SECURE_LOGI("[%s : %d] "fmt"\n", __func__, __LINE__, ##args)
 
-#define WARN(fmt , args...) \
-	do { \
-		SECURE_LOGW("[%s : %d] "fmt"\n", __func__, __LINE__, ##args); \
-	} while (0)
+#define WARN(fmt, args...) \
+	SECURE_LOGW("[%s : %d] "fmt"\n", __func__, __LINE__, ##args)
 
-#define ERR(fmt , args...) \
-	do { \
-		SECURE_LOGE("[%s : %d] "fmt"\n", __func__, __LINE__, ##args); \
-	} while (0)
+#define ERR(fmt, args...) \
+	SECURE_LOGE("[%s : %d] "fmt"\n", __func__, __LINE__, ##args)
 
 #else /* MINICTRL_USE_DLOG */
-#define DBG(fmt , args...) \
-	do { \
-		printf("[D][%s : %d] "fmt"\n", __func__, __LINE__, ##args); \
-	} while (0)
+#define DBG(fmt, args...) \
+	printf("[D][%s : %d] "fmt"\n", __func__, __LINE__, ##args)
 
-#define INFO(fmt , args...) \
-	do { \
-		printf("[I][%s : %d] "fmt"\n", __func__, __LINE__, ##args); \
-	} while (0)
+#define INFO(fmt, args...) \
+	printf("[I][%s : %d] "fmt"\n", __func__, __LINE__, ##args)
 
-#define WARN(fmt , args...) \
-	do { \
-		printf("[W][%s : %d] "fmt"\n", __func__, __LINE__, ##args); \
-	} while (0)
+#define WARN(fmt, args...) \
+	printf("[W][%s : %d] "fmt"\n", __func__, __LINE__, ##args)
 
-#define ERR(fmt , args...) \
-	do { \
-		printf("[E][%s : %d] "fmt"\n", __func__, __LINE__, ##args); \
-	} while (0)
+#define ERR(fmt, args...) \
+	printf("[E][%s : %d] "fmt"\n", __func__, __LINE__, ##args)
 
 #endif /* MINICTRL_USE_DLOG */
 
diff --git a/include/minicontrol-monitor.h b/include/minicontrol-monitor.h
index 7283b47..77f4894 100755
--- a/include/minicontrol-monitor.h
+++ b/include/minicontrol-monitor.h
@@ -25,12 +25,9 @@
 extern "C" {
 #endif
 
-typedef void (*minicontrol_monitor_cb) (minicontrol_action_e action,
-					const char *name,
-					unsigned int width,
-					unsigned int height,
-					minicontrol_priority_e priority,
-					void *data);
+typedef void (*minicontrol_monitor_cb)(minicontrol_action_e action,
+		const char *name, unsigned int width, unsigned int height,
+		minicontrol_priority_e priority, void *data);
 
 int minicontrol_monitor_start(minicontrol_monitor_cb callback, void *data) DEPRECATED;
 
diff --git a/include/minicontrol-provider-internal.h b/include/minicontrol-provider-internal.h
index 6330324..9275437 100644
--- a/include/minicontrol-provider-internal.h
+++ b/include/minicontrol-provider-internal.h
@@ -33,3 +33,4 @@ int minicontrol_request(Evas_Object *mincontrol, minicontrol_request_e request)
 }
 #endif
 #endif /* _MINICONTROL_PROVIDER_INTERNAL_H_ */
+
diff --git a/include/minicontrol-provider.h b/include/minicontrol-provider.h
index b95b133..bffe17b 100755
--- a/include/minicontrol-provider.h
+++ b/include/minicontrol-provider.h
@@ -48,7 +48,7 @@ extern "C" {
  * @see #minicontrol_create_window
  * @see #minicontrol_viewer_event_e
  */
-typedef void (*minicontrol_event_cb) (minicontrol_viewer_event_e event_type, bundle *event_arg);
+typedef void (*minicontrol_event_cb)(minicontrol_viewer_event_e event_type, bundle *event_arg);
 
 /**
  * @brief Creates a window for minicontrol.
diff --git a/include/minicontrol-viewer-internal.h b/include/minicontrol-viewer-internal.h
index b02698d..ec84e2a 100644
--- a/include/minicontrol-viewer-internal.h
+++ b/include/minicontrol-viewer-internal.h
@@ -22,3 +22,4 @@ int minicontrol_viewer_request(const char *appid, minicontrol_request_e request,
 Evas_Object *minicontrol_viewer_image_object_get(const Evas_Object *obj) DEPRECATED;
 
 #endif /* _MINICONTROL_VIEWER_INTERNAL_H_ */
+
diff --git a/include/minicontrol-viewer.h b/include/minicontrol-viewer.h
index 66b72ba..439428e 100755
--- a/include/minicontrol-viewer.h
+++ b/include/minicontrol-viewer.h
@@ -69,7 +69,7 @@ int minicontrol_viewer_send_event(const char *minicontrol_name, minicontrol_view
  * @param[in] data User data
  * @see #minicontrol_viewer_set_event_cb
  */
-typedef void (*minicontrol_viewer_event_cb) (minicontrol_event_e event, const char *minicontrol_name, bundle *event_arg, void *data);
+typedef void (*minicontrol_viewer_event_cb)(minicontrol_event_e event, const char *minicontrol_name, bundle *event_arg, void *data);
 
 /**
  * @brief Registers a callback for events originated by minicontrol provider.
diff --git a/src/minicontrol-internal.c b/src/minicontrol-internal.c
index 9568933..1c31840 100755
--- a/src/minicontrol-internal.c
+++ b/src/minicontrol-internal.c
@@ -85,20 +85,11 @@ int _minictrl_provider_proc_send(int type)
 {
 	int ret;
 	GVariant *param;
-	const char *type_str;
+	const char *type_str = PROC_DBUS_INCLUDE;
 	int pid = getpid();
 
-	switch (type) {
-	case MINICONTROL_DBUS_PROC_EXCLUDE:
+	if (type == MINICONTROL_DBUS_PROC_EXCLUDE)
 		type_str = PROC_DBUS_EXCLUDE;
-		break;
-	case MINICONTROL_DBUS_PROC_INCLUDE:
-		type_str = PROC_DBUS_INCLUDE;
-		break;
-	default:
-		ERR("Check unsupported type : %d", type);
-		return -1;
-	}
 
 	DBG("pid: %d, type: %d(%s)", pid, type, type_str);
 
diff --git a/src/minicontrol-monitor.c b/src/minicontrol-monitor.c
index f26388e..67df885 100755
--- a/src/minicontrol-monitor.c
+++ b/src/minicontrol-monitor.c
@@ -28,11 +28,12 @@ struct _minicontrol_monitor {
 	void *user_data;
 };
 
-static struct _minicontrol_monitor *g_monitor_h = NULL;
+static struct _minicontrol_monitor *g_monitor_h;
 
 static minicontrol_priority_e _int_to_priority(unsigned int value)
 {
-	minicontrol_priority_e priority = MINICONTROL_PRIORITY_LOW;
+	minicontrol_priority_e priority;
+
 	switch (value) {
 	case MINICONTROL_PRIORITY_TOP:
 		priority = MINICONTROL_PRIORITY_TOP;
@@ -40,60 +41,62 @@ static minicontrol_priority_e _int_to_priority(unsigned int value)
 	case MINICONTROL_PRIORITY_MIDDLE:
 		priority = MINICONTROL_PRIORITY_MIDDLE;
 		break;
-	case MINICONTROL_PRIORITY_LOW:
 	default:
 		priority = MINICONTROL_PRIORITY_LOW;
 		break;
 	}
+
 	return priority;
 }
 
-static void _sig_to_viewer_handler_cb(minicontrol_event_e event, const char *minicontrol_name, bundle *event_arg, void *data)
+static void _sig_to_viewer_handler_cb(minicontrol_event_e event,
+		const char *minicontrol_name, bundle *event_arg, void *data)
 {
 	minicontrol_action_e action;
 	int width = 0;
 	int height = 0;
 	int priority_from_signal = 0;
-	minicontrol_priority_e priority = 0;
+	minicontrol_priority_e priority;
 	size_t n_size;
 
 	switch (event) {
 	case MINICONTROL_EVENT_START:
 		action = MINICONTROL_ACTION_START;
 		break;
-
 	case MINICONTROL_EVENT_STOP:
 		action = MINICONTROL_ACTION_STOP;
 		break;
-
 	case MINICONTROL_EVENT_RESIZE:
 		action = MINICONTROL_ACTION_RESIZE;
 		break;
-
 	case MINICONTROL_EVENT_REQUEST_HIDE:
 	case MINICONTROL_EVENT_REQUEST_ANGLE:
 		action = MINICONTROL_ACTION_REQUEST;
 		break;
-
 	default:
 		WARN("Not supported event [%d]", event);
 		action = event;
 		break;
 	}
 
-	if (action == MINICONTROL_ACTION_START || action == MINICONTROL_ACTION_RESIZE || action == MINICONTROL_ACTION_REQUEST) {
+	if (action == MINICONTROL_ACTION_START ||
+			action == MINICONTROL_ACTION_RESIZE ||
+			action == MINICONTROL_ACTION_REQUEST) {
 		bundle_get_byte(event_arg, "width", (void *)&width, &n_size);
 		bundle_get_byte(event_arg, "height", (void *)&height, &n_size);
-		bundle_get_byte(event_arg, "priority", (void *)&priority_from_signal, &n_size);
+		bundle_get_byte(event_arg, "priority",
+				(void *)&priority_from_signal, &n_size);
 		priority = _int_to_priority(priority_from_signal);
 	} else {
 		priority = MINICONTROL_PRIORITY_LOW;
 	}
 
-	g_monitor_h->callback(action, minicontrol_name, width, height, priority, g_monitor_h->user_data);
+	g_monitor_h->callback(action, minicontrol_name, width, height,
+			priority, g_monitor_h->user_data);
 }
 
-EXPORT_API minicontrol_error_e minicontrol_monitor_start(minicontrol_monitor_cb callback, void *data)
+EXPORT_API minicontrol_error_e minicontrol_monitor_start(
+		minicontrol_monitor_cb callback, void *data)
 {
 	if (!callback)
 		return MINICONTROL_ERROR_INVALID_PARAMETER;
diff --git a/src/minicontrol-provider.c b/src/minicontrol-provider.c
index 1cee113..886e38c 100755
--- a/src/minicontrol-provider.c
+++ b/src/minicontrol-provider.c
@@ -42,48 +42,53 @@ struct _minicontrol_provider {
 	minicontrol_event_cb event_callback;
 };
 
-static void _minictrl_win_del_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
-static void _minictrl_win_hide_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
-static void _minictrl_win_show_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
-static void _minictrl_win_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
+static void _minictrl_win_del_cb(void *data, Evas *e, Evas_Object *obj,
+		void *event_info);
+static void _minictrl_win_hide_cb(void *data, Evas *e, Evas_Object *obj,
+		void *event_info);
+static void _minictrl_win_show_cb(void *data, Evas *e, Evas_Object *obj,
+		void *event_info);
+static void _minictrl_win_resize_cb(void *data, Evas *e, Evas_Object *obj,
+		void *event_info);
 
 static void __minicontrol_provider_free(struct _minicontrol_provider *pd)
 {
-	if (pd) {
-		if (pd->name)
-			free(pd->name);
+	if (pd == NULL)
+		return;
 
-		if (pd->running_sh)
-			_minictrl_dbus_sig_handle_dettach(pd->running_sh);
+	if (pd->name)
+		free(pd->name);
 
-		if (pd->event_sh)
-			_minictrl_dbus_sig_handle_dettach(pd->event_sh);
+	if (pd->running_sh)
+		_minictrl_dbus_sig_handle_dettach(pd->running_sh);
 
-		free(pd);
-	}
+	if (pd->event_sh)
+		_minictrl_dbus_sig_handle_dettach(pd->event_sh);
+
+	free(pd);
 }
 
 static void _running_req_cb(void *data, GVariant *parameters)
 {
-	struct _minicontrol_provider *pd;
+	struct _minicontrol_provider *pd = data;
+	Evas_Coord w = 0;
+	Evas_Coord h = 0;
 
-	if (!data) {
-		ERR("data is NULL");
+	if (!pd) {
+		ERR("provider is NULL");
 		return;
 	}
-	pd = data;
 
 	if (pd->state == MINICTRL_STATE_RUNNING) {
-		Evas_Coord w = 0;
-		Evas_Coord h = 0;
 		evas_object_geometry_get(pd->obj, NULL, NULL, &w, &h);
-		_minictrl_provider_message_send(MINICONTROL_EVENT_START, pd->name, w, h, 0);
+		_minictrl_provider_message_send(MINICONTROL_EVENT_START,
+				pd->name, w, h, 0);
 	}
 }
 
 static void _sig_to_provider_handler_cb(void *data, GVariant *parameters)
 {
-	struct _minicontrol_provider *pd;
+	struct _minicontrol_provider *pd = data;
 	char *minicontrol_name = NULL;
 	minicontrol_viewer_event_e event;
 	bundle *event_arg_bundle;
@@ -92,11 +97,10 @@ static void _sig_to_provider_handler_cb(void *data, GVariant *parameters)
 	Evas_Coord width;
 	Evas_Coord height;
 
-	if (!data) {
-		ERR("data is NULL");
+	if (!pd) {
+		ERR("provider is NULL");
 		return;
 	}
-	pd = data;
 
 	g_variant_get(parameters, "(&si&su)", &minicontrol_name, &event,
 			&serialized_arg, &serialized_arg_length);
@@ -127,50 +131,28 @@ static void _sig_to_provider_handler_cb(void *data, GVariant *parameters)
 
 static char *_minictrl_create_name(const char *name)
 {
-	char *buf;
-	int size = 0;
+	char *minictrl_name;
+	int size;
 
-	if (!name) {
-		ERR("name is NULL, invaild parameter");
-		set_last_result(MINICONTROL_ERROR_INVALID_PARAMETER);
+	size = strlen(name) + 3;
+	minictrl_name = malloc(sizeof(char) * size);
+	if (minictrl_name == NULL) {
+		ERR("out of memory");
 		return NULL;
 	}
 
-	size = snprintf(NULL, 0, "[%s]", name) + 1;
-	buf = (char *)malloc(sizeof(char) * size);
-	if (!buf) {
-		ERR("fail to alloc buf");
-		set_last_result(MINICONTROL_ERROR_OUT_OF_MEMORY);
-		return NULL;
-	}
-
-	snprintf(buf, size, "[%s]", name);
-
-	return buf;
-}
+	snprintf(minictrl_name, size, "[%s]", name);
 
-static void _access_changed_cb(void *data, Evas_Object *obj, void *event_info)
-{
-	Ecore_Evas *ee = ecore_evas_ecore_evas_get(evas_object_evas_get(obj));
-	if (ee != NULL) {
-		if (elm_config_access_get()) {
-			/* TODO : Check this API is supported
-			ecore_evas_extn_socket_events_block_set(ee, EINA_TRUE);
-			 */
-		} else {
-			/* TODO : Check this API is supported
-			ecore_evas_extn_socket_events_block_set(ee, EINA_FALSE);
-			 */
-		}
-	}
+	return minictrl_name;
 }
 
-
-EXPORT_API Evas_Object *minicontrol_create_window(const char *name, minicontrol_target_viewer_e target_viewer, minicontrol_event_cb event_callback)
+EXPORT_API Evas_Object *minicontrol_create_window(const char *name,
+		minicontrol_target_viewer_e target_viewer,
+		minicontrol_event_cb event_callback)
 {
 	int err_from_elm;
-	Evas_Object *win = NULL;
-	char *name_inter = NULL;
+	Evas_Object *win;
+	char *name_inter;
 	struct _minicontrol_provider *pd;
 
 	if (!name) {
@@ -186,21 +168,10 @@ EXPORT_API Evas_Object *minicontrol_create_window(const char *name, minicontrol_
 		return NULL;
 	}
 
-	if (elm_config_access_get()) {
-		Ecore_Evas *ee = ecore_evas_ecore_evas_get(evas_object_evas_get(win));
-
-		if (ee != NULL) {
-			/* TODO : Check this API is supported
-			ecore_evas_extn_socket_events_block_set(ee, EINA_TRUE);
-			 */
-		}
-
-	}
-	evas_object_smart_callback_add(win, "access,changed", _access_changed_cb, NULL);
-
 	name_inter = _minictrl_create_name(name);
 	if (!name_inter) {
 		ERR("Fail to create name_inter for : %s", name);
+		set_last_result(MINICONTROL_ERROR_OUT_OF_MEMORY);
 		evas_object_del(win);
 		return NULL;
 	}
@@ -224,28 +195,36 @@ EXPORT_API Evas_Object *minicontrol_create_window(const char *name, minicontrol_
 
 	}
 	memset(pd, 0x00, sizeof(struct _minicontrol_provider));
+
 	pd->name = name_inter;
 	pd->state = MINICTRL_STATE_READY;
 	pd->obj = win;
 
 	evas_object_data_set(win, MINICTRL_DATA_KEY, pd);
-
 	elm_win_autodel_set(win, EINA_TRUE);
 
-	evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _minictrl_win_del_cb, pd);
-	evas_object_event_callback_add(win, EVAS_CALLBACK_SHOW, _minictrl_win_show_cb, pd);
-	evas_object_event_callback_add(win, EVAS_CALLBACK_HIDE,	_minictrl_win_hide_cb, pd);
-	evas_object_event_callback_add(win, EVAS_CALLBACK_RESIZE, _minictrl_win_resize_cb, pd);
-
-	pd->running_sh = _minictrl_dbus_sig_handle_attach(MINICTRL_DBUS_SIG_RUNNING_REQ, _running_req_cb, pd);
-	pd->event_sh   = _minictrl_dbus_sig_handle_attach(MINICTRL_DBUS_SIG_TO_PROVIDER, _sig_to_provider_handler_cb, pd);
+	evas_object_event_callback_add(win, EVAS_CALLBACK_DEL,
+			_minictrl_win_del_cb, pd);
+	evas_object_event_callback_add(win, EVAS_CALLBACK_SHOW,
+			_minictrl_win_show_cb, pd);
+	evas_object_event_callback_add(win, EVAS_CALLBACK_HIDE,
+			_minictrl_win_hide_cb, pd);
+	evas_object_event_callback_add(win, EVAS_CALLBACK_RESIZE,
+			_minictrl_win_resize_cb, pd);
+
+	pd->running_sh = _minictrl_dbus_sig_handle_attach(
+			MINICTRL_DBUS_SIG_RUNNING_REQ, _running_req_cb, pd);
+	pd->event_sh = _minictrl_dbus_sig_handle_attach(
+			MINICTRL_DBUS_SIG_TO_PROVIDER,
+			_sig_to_provider_handler_cb, pd);
 	pd->event_callback = event_callback;
-
 	INFO("new minicontrol created - %s", pd->name);
+
 	return win;
 }
 
-EXPORT_API int minicontrol_send_event(Evas_Object *mincontrol, minicontrol_provider_event_e event, bundle *event_arg)
+EXPORT_API int minicontrol_send_event(Evas_Object *mincontrol,
+		minicontrol_provider_event_e event, bundle *event_arg)
 {
 	struct _minicontrol_provider *pd;
 	int ret = MINICONTROL_ERROR_NONE;
@@ -266,8 +245,10 @@ EXPORT_API int minicontrol_send_event(Evas_Object *mincontrol, minicontrol_provi
 		return MINICONTROL_ERROR_INVALID_PARAMETER;
 	}
 
-	if (pd->state == MINICTRL_STATE_RUNNING)
-		ret = _minictrl_send_event(MINICTRL_DBUS_SIG_TO_VIEWER, pd->name, event, event_arg);
+	if (pd->state == MINICTRL_STATE_RUNNING) {
+		ret = _minictrl_send_event(MINICTRL_DBUS_SIG_TO_VIEWER,
+				pd->name, event, event_arg);
+	}
 
 	return ret;
 }
@@ -276,6 +257,8 @@ static int minicontrol_win_start(Evas_Object *mincontrol)
 {
 	struct _minicontrol_provider *pd;
 	int ret = MINICONTROL_ERROR_NONE;
+	Evas_Coord w = 0;
+	Evas_Coord h = 0;
 
 	if (!mincontrol) {
 		ERR("mincontrol is NULL, invaild parameter");
@@ -294,13 +277,11 @@ static int minicontrol_win_start(Evas_Object *mincontrol)
 	}
 
 	if (pd->state != MINICTRL_STATE_RUNNING) {
-		Evas_Coord w = 0;
-		Evas_Coord h = 0;
 		pd->state = MINICTRL_STATE_RUNNING;
-
 		evas_object_geometry_get(mincontrol, NULL, NULL, &w, &h);
 		_minictrl_provider_proc_send(MINICONTROL_DBUS_PROC_EXCLUDE);
-		ret = _minictrl_provider_message_send(MINICONTROL_EVENT_START, pd->name, w, h, 0);
+		ret = _minictrl_provider_message_send(MINICONTROL_EVENT_START,
+				pd->name, w, h, 0);
 	}
 
 	return ret;
@@ -326,18 +307,21 @@ static int minicontrol_win_stop(Evas_Object *mincontrol)
 		ERR("pd name is NULL, invaild parameter");
 		return MINICONTROL_ERROR_INVALID_PARAMETER;
 	}
+
 	if (pd->state != MINICTRL_STATE_READY) {
 		pd->state = MINICTRL_STATE_READY;
 		_minictrl_provider_proc_send(MINICONTROL_DBUS_PROC_INCLUDE);
-		ret = _minictrl_provider_message_send(MINICONTROL_EVENT_STOP, pd->name, 0, 0, 0);
+		ret = _minictrl_provider_message_send(MINICONTROL_EVENT_STOP,
+				pd->name, 0, 0, 0);
 	}
 
 	return ret;
 }
 
-static void _minictrl_win_del_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+static void _minictrl_win_del_cb(void *data, Evas *e, Evas_Object *obj,
+		void *event_info)
 {
-	struct _minicontrol_provider *pd = NULL;
+	struct _minicontrol_provider *pd;
 
 	minicontrol_win_stop(obj);
 
@@ -362,20 +346,19 @@ static void _minictrl_win_show_cb(void *data, Evas *e,
 static void _minictrl_win_resize_cb(void *data, Evas *e,
 		Evas_Object *obj, void *event_info)
 {
-	struct _minicontrol_provider *pd;
+	struct _minicontrol_provider *pd = data;
+	Evas_Coord w = 0;
+	Evas_Coord h = 0;
 
-	if (!data) {
-		ERR("data is NULL, invaild parameter");
+	if (!pd) {
+		ERR("Invalid parameter");
 		return;
 	}
-	pd = data;
 
 	if (pd->state == MINICTRL_STATE_RUNNING) {
-		Evas_Coord w = 0;
-		Evas_Coord h = 0;
-
 		evas_object_geometry_get(obj, NULL, NULL, &w, &h);
-		_minictrl_provider_message_send(MINICONTROL_EVENT_RESIZE, pd->name, w, h, 0);
+		_minictrl_provider_message_send(MINICONTROL_EVENT_RESIZE,
+				pd->name, w, h, 0);
 	}
 }
 
@@ -398,18 +381,6 @@ EXPORT_API Evas_Object *minicontrol_win_add(const char *name)
 		return NULL;
 	}
 
-	if (elm_config_access_get()) {
-		Ecore_Evas *ee = ecore_evas_ecore_evas_get(evas_object_evas_get(win));
-
-		if (ee != NULL) {
-			/* TODO : Check this API is supported
-			ecore_evas_extn_socket_events_block_set(ee, EINA_TRUE);
-			 */
-		}
-
-	}
-	evas_object_smart_callback_add(win, "access,changed", _access_changed_cb, NULL);
-
 	name_inter = _minictrl_create_name(name);
 	if (!name_inter) {
 
@@ -434,6 +405,7 @@ EXPORT_API Evas_Object *minicontrol_win_add(const char *name)
 
 	}
 	memset(pd, 0x00, sizeof(struct _minicontrol_provider));
+
 	pd->name = name_inter;
 	pd->state = MINICTRL_STATE_READY;
 	pd->obj = win;
@@ -442,21 +414,26 @@ EXPORT_API Evas_Object *minicontrol_win_add(const char *name)
 
 	elm_win_autodel_set(win, EINA_TRUE);
 
-	evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _minictrl_win_del_cb, pd);
-	evas_object_event_callback_add(win, EVAS_CALLBACK_SHOW, _minictrl_win_show_cb, pd);
-	evas_object_event_callback_add(win, EVAS_CALLBACK_HIDE,	_minictrl_win_hide_cb, pd);
-	evas_object_event_callback_add(win, EVAS_CALLBACK_RESIZE, _minictrl_win_resize_cb, pd);
-
-	pd->running_sh = _minictrl_dbus_sig_handle_attach(MINICTRL_DBUS_SIG_RUNNING_REQ, _running_req_cb, pd);
-
+	evas_object_event_callback_add(win, EVAS_CALLBACK_DEL,
+			_minictrl_win_del_cb, pd);
+	evas_object_event_callback_add(win, EVAS_CALLBACK_SHOW,
+			_minictrl_win_show_cb, pd);
+	evas_object_event_callback_add(win, EVAS_CALLBACK_HIDE,
+			_minictrl_win_hide_cb, pd);
+	evas_object_event_callback_add(win, EVAS_CALLBACK_RESIZE,
+			_minictrl_win_resize_cb, pd);
+
+	pd->running_sh = _minictrl_dbus_sig_handle_attach(
+			MINICTRL_DBUS_SIG_RUNNING_REQ, _running_req_cb, pd);
 	INFO("new minicontrol created - %s", pd->name);
+
 	return win;
 }
 
-EXPORT_API int minicontrol_request(Evas_Object *mincontrol, minicontrol_request_e request)
+EXPORT_API int minicontrol_request(Evas_Object *mincontrol,
+		minicontrol_request_e request)
 {
 	struct _minicontrol_provider *pd;
-	int ret = MINICONTROL_ERROR_NONE;
 	minicontrol_event_e event;
 
 	if (!mincontrol) {
@@ -480,28 +457,24 @@ EXPORT_API int minicontrol_request(Evas_Object *mincontrol, minicontrol_request_
 		case MINICONTROL_REQ_HIDE_VIEWER:
 			event = MINICONTROL_EVENT_REQUEST_HIDE;
 			break;
-
 		case MINICONTROL_REQ_REPORT_VIEWER_ANGLE:
 			event = MINICONTROL_EVENT_REQUEST_ANGLE;
 			break;
-
 		case MINICONTROL_REQ_FREEZE_SCROLL_VIEWER:
 		case MINICONTROL_REQ_UNFREEZE_SCROLL_VIEWER:
 		case MINICONTROL_REQ_ROTATE_PROVIDER:
 			WARN("Could be not supported [%d]", request);
 			event = request;
 			break;
-
-		case MINICONTROL_REQ_NONE:
 		default:
 			ERR("Not supported request[%d]", request);
-			ret = MINICONTROL_ERROR_NOT_SUPPORTED;
-			goto out;
+			return MINICONTROL_ERROR_NOT_SUPPORTED;
 		}
 
-		_minictrl_send_event(MINICTRL_DBUS_SIG_TO_VIEWER, pd->name, event, NULL);
+		_minictrl_send_event(MINICTRL_DBUS_SIG_TO_VIEWER, pd->name,
+				event, NULL);
 	}
-out:
-	return ret;
+
+	return MINICONTROL_ERROR_NONE;
 }
 
diff --git a/src/minicontrol-viewer.c b/src/minicontrol-viewer.c
index f8ab37b..47200c3 100755
--- a/src/minicontrol-viewer.c
+++ b/src/minicontrol-viewer.c
@@ -31,9 +31,10 @@ struct _minicontrol_viewer {
 	void *user_data;
 };
 
-static struct _minicontrol_viewer *g_minicontrol_viewer_h = NULL;
+static struct _minicontrol_viewer *g_minicontrol_viewer_h;
 
-EXPORT_API int minicontrol_viewer_send_event(const char *minicontrol_name, minicontrol_viewer_event_e event, bundle *event_arg)
+EXPORT_API int minicontrol_viewer_send_event(const char *minicontrol_name,
+		minicontrol_viewer_event_e event, bundle *event_arg)
 {
 	int ret = MINICONTROL_ERROR_NONE;
 
@@ -42,12 +43,12 @@ EXPORT_API int minicontrol_viewer_send_event(const char *minicontrol_name, minic
 		return MINICONTROL_ERROR_INVALID_PARAMETER;
 	}
 
-	ret = _minictrl_send_event(MINICTRL_DBUS_SIG_TO_PROVIDER, minicontrol_name, event, event_arg);
+	ret = _minictrl_send_event(MINICTRL_DBUS_SIG_TO_PROVIDER,
+			minicontrol_name, event, event_arg);
 
 	return ret;
 }
 
-
 static void _sig_to_viewer_handler_cb(void *data, GVariant *parameters)
 {
 	char *minicontrol_name = NULL;
@@ -78,8 +79,12 @@ static void _sig_to_viewer_handler_cb(void *data, GVariant *parameters)
 }
 
 
-EXPORT_API int minicontrol_viewer_set_event_cb(minicontrol_viewer_event_cb callback, void *data)
+EXPORT_API int minicontrol_viewer_set_event_cb(
+		minicontrol_viewer_event_cb callback, void *data)
 {
+	minictrl_sig_handle *event_sh;
+	struct _minicontrol_viewer *minicontrol_viewer_h;
+
 	if (!callback) {
 		ERR("MINICONTROL_ERROR_INVALID_PARAMETER");
 		return MINICONTROL_ERROR_INVALID_PARAMETER;
@@ -88,16 +93,17 @@ EXPORT_API int minicontrol_viewer_set_event_cb(minicontrol_viewer_event_cb callb
 	INFO("g_minicontrol_viewer_h [%p]", g_minicontrol_viewer_h);
 
 	if (g_minicontrol_viewer_h == NULL) {
-		minictrl_sig_handle *event_sh;
-		struct _minicontrol_viewer *minicontrol_viewer_h;
-
-		event_sh = _minictrl_dbus_sig_handle_attach(MINICTRL_DBUS_SIG_TO_VIEWER, _sig_to_viewer_handler_cb, NULL);
+		event_sh = _minictrl_dbus_sig_handle_attach(
+				MINICTRL_DBUS_SIG_TO_VIEWER,
+				_sig_to_viewer_handler_cb, NULL);
 		if (!event_sh) {
-			ERR("fail to _minictrl_dbus_sig_handle_attach - %s", MINICTRL_DBUS_SIG_TO_VIEWER);
+			ERR("fail to _minictrl_dbus_sig_handle_attach - %s",
+					MINICTRL_DBUS_SIG_TO_VIEWER);
 			return MINICONTROL_ERROR_IPC_FAILURE;
 		}
 
-		minicontrol_viewer_h = malloc(sizeof(struct _minicontrol_viewer));
+		minicontrol_viewer_h =
+			malloc(sizeof(struct _minicontrol_viewer));
 		if (!minicontrol_viewer_h) {
 			ERR("fail to alloc minicontrol_viewer_h");
 			_minictrl_dbus_sig_handle_dettach(event_sh);
@@ -120,8 +126,10 @@ EXPORT_API int minicontrol_viewer_unset_event_cb(void)
 	if (!g_minicontrol_viewer_h)
 		return MINICONTROL_ERROR_NONE;
 
-	if (g_minicontrol_viewer_h->event_sh)
-		_minictrl_dbus_sig_handle_dettach(g_minicontrol_viewer_h->event_sh);
+	if (g_minicontrol_viewer_h->event_sh) {
+		_minictrl_dbus_sig_handle_dettach(
+				g_minicontrol_viewer_h->event_sh);
+	}
 
 	free(g_minicontrol_viewer_h);
 	g_minicontrol_viewer_h = NULL;
@@ -141,33 +149,41 @@ static void _minictrl_plug_server_del(Ecore_Evas *ee)
 
 	INFO("server - %s is deleted", minicontrol_name);
 
-	/* To avoid retrying to free minicontrol_name again, set MINICTRL_PLUG_DATA_KEY as NULL */
+	/*
+	 * To avoid retrying to free minicontrol_name again,
+	 * set MINICTRL_PLUG_DATA_KEY as NULL
+	 */
 	ecore_evas_data_set(ee, MINICTRL_PLUG_DATA_KEY, NULL);
 
 	/* send message to remove plug */
-	_minictrl_provider_message_send(MINICONTROL_EVENT_STOP, minicontrol_name, 0, 0, MINICONTROL_PRIORITY_LOW);
+	_minictrl_provider_message_send(MINICONTROL_EVENT_STOP,
+			minicontrol_name, 0, 0, MINICONTROL_PRIORITY_LOW);
 	_minictrl_provider_proc_send(MINICONTROL_DBUS_PROC_INCLUDE);
 	free(minicontrol_name);
 }
 
-static void _minictrl_plug_del(void *data, Evas *e, Evas_Object *obj, void *event_info)
+static void _minictrl_plug_del(void *data, Evas *e, Evas_Object *obj,
+		void *event_info)
 {
 	Ecore_Evas *ee = data;
-	char *minicontrol_name = NULL;
+	char *minicontrol_name;
 
 	if (!ee)
 		return;
 
 	minicontrol_name = ecore_evas_data_get(ee, MINICTRL_PLUG_DATA_KEY);
-
 	if (minicontrol_name) {
-		/* Sending an event 'MINICONTROL_EVENT_REQUEST_HIDE' should be done by minicontrol viewer manually */
+		/*
+		 * Sending an event 'MINICONTROL_EVENT_REQUEST_HIDE'
+		 * should be done by minicontrol viewer manually
+		 */
 		free(minicontrol_name);
 		ecore_evas_data_set(ee, MINICTRL_PLUG_DATA_KEY, NULL);
 	}
 }
 
-EXPORT_API Evas_Object *minicontrol_viewer_add(Evas_Object *parent, const char *minicontrol_name)
+EXPORT_API Evas_Object *minicontrol_viewer_add(Evas_Object *parent,
+		const char *minicontrol_name)
 {
 	Evas_Object *plug = NULL;
 	Evas_Object *plug_img = NULL;
@@ -180,7 +196,6 @@ EXPORT_API Evas_Object *minicontrol_viewer_add(Evas_Object *parent, const char *
 	}
 
 	plug = elm_plug_add(parent);
-
 	if (!plug) {
 		ERR("fail to create plug");
 		set_last_result(MINICONTROL_ERROR_ELM_FAILURE);
@@ -197,63 +212,49 @@ EXPORT_API Evas_Object *minicontrol_viewer_add(Evas_Object *parent, const char *
 	plug_img = elm_plug_image_object_get(plug);
 
 	ee = ecore_evas_object_ecore_evas_get(plug_img);
-	ecore_evas_data_set(ee, MINICTRL_PLUG_DATA_KEY, strdup(minicontrol_name));
+	ecore_evas_data_set(ee, MINICTRL_PLUG_DATA_KEY,
+			strdup(minicontrol_name));
 	ecore_evas_callback_delete_request_set(ee, _minictrl_plug_server_del);
 
-	evas_object_event_callback_add(plug, EVAS_CALLBACK_DEL,	_minictrl_plug_del, ee);
+	evas_object_event_callback_add(plug, EVAS_CALLBACK_DEL,
+			_minictrl_plug_del, ee);
 
 	return plug;
 }
 
-EXPORT_API Evas_Object *minicontrol_viewer_image_object_get(const Evas_Object *obj)
+EXPORT_API Evas_Object *minicontrol_viewer_image_object_get(
+		const Evas_Object *obj)
 {
 	return elm_plug_image_object_get(obj);
 }
 
-EXPORT_API int minicontrol_viewer_request(const char *minicontrol_name, minicontrol_request_e request, int value)
+EXPORT_API int minicontrol_viewer_request(const char *minicontrol_name,
+		minicontrol_request_e request, int value)
 {
-	int ret = MINICONTROL_ERROR_NONE;
-	minicontrol_viewer_event_e event  = 0;
-	bundle *event_arg_bundle = NULL;
-	char bundle_value_buffer[BUNDLE_BUFFER_LENGTH] = { 0, };
+	minicontrol_viewer_event_e event = MINICONTROL_EVENT_REPORT_ANGLE;
+	bundle *event_arg_bundle;
+	char bundle_value_buffer[BUNDLE_BUFFER_LENGTH];
 
 	if (minicontrol_name == NULL) {
 		ERR("appid is NULL, invaild parameter");
 		return MINICONTROL_ERROR_INVALID_PARAMETER;
 	}
 
-	switch (request) {
-	case MINICONTROL_REQ_ROTATE_PROVIDER: {
-		event = MINICONTROL_EVENT_REPORT_ANGLE;
-		event_arg_bundle = bundle_create();
-
-		if (event_arg_bundle == NULL) {
-			ERR("fail to create a bundle instance");
-			ret = MINICONTROL_ERROR_OUT_OF_MEMORY;
-			goto out;
-		}
-
-		snprintf(bundle_value_buffer, BUNDLE_BUFFER_LENGTH, "%d", value);
+	if (request != MINICONTROL_REQ_ROTATE_PROVIDER)
+		return MINICONTROL_ERROR_INVALID_PARAMETER;
 
-		bundle_add_str(event_arg_bundle, "angle", bundle_value_buffer);
-		break;
+	event_arg_bundle = bundle_create();
+	if (event_arg_bundle == NULL) {
+		ERR("fail to create a bundle instance");
+		return MINICONTROL_ERROR_OUT_OF_MEMORY;
 	}
-	case MINICONTROL_REQ_NONE:
-	case MINICONTROL_REQ_HIDE_VIEWER:
-	case MINICONTROL_REQ_FREEZE_SCROLL_VIEWER:
-	case MINICONTROL_REQ_UNFREEZE_SCROLL_VIEWER:
-	case MINICONTROL_REQ_REPORT_VIEWER_ANGLE:
-	default:
-		ret = MINICONTROL_ERROR_INVALID_PARAMETER;
-		goto out;
-	}
-
-	_minictrl_send_event(MINICTRL_DBUS_SIG_TO_PROVIDER, minicontrol_name, event, event_arg_bundle);
 
-out:
-	if (event_arg_bundle)
-		bundle_free(event_arg_bundle);
+	snprintf(bundle_value_buffer, sizeof(bundle_value_buffer), "%d", value);
+	bundle_add_str(event_arg_bundle, "angle", bundle_value_buffer);
+	_minictrl_send_event(MINICTRL_DBUS_SIG_TO_PROVIDER, minicontrol_name,
+			event, event_arg_bundle);
+	bundle_free(event_arg_bundle);
 
-	return ret;
+	return MINICONTROL_ERROR_NONE;
 }