From: Minje Ahn Date: Fri, 1 Apr 2016 01:07:08 +0000 (+0900) Subject: Apply tizen coding rule X-Git-Tag: accepted/tizen/common/20160406.144226~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=26696e3203070b3fed52e6989a53cf0ae351cd3b;p=platform%2Fcore%2Fapi%2Fmedia-controller.git Apply tizen coding rule Change-Id: I18d3c6df90aa8756aacd4fa633ef56416ace7f6b Signed-off-by: Minje Ahn --- diff --git a/include/media_controller_db.h b/include/media_controller_db.h index 6e09b70..87aeab3 100755 --- a/include/media_controller_db.h +++ b/include/media_controller_db.h @@ -56,8 +56,8 @@ #define DB_COLUMN_PLAYBACK_STATE "playback_state" #define DB_COLUMN_PLAYBACK_POSITION "playback_position" -#define SQLITE3_SAFE_FREE(sql_string) {if(sql_string) { sqlite3_free(sql_string); sql_string = NULL;}} -#define SQLITE3_FINALIZE(x) {if(x != NULL) {sqlite3_finalize(x);}} +#define SQLITE3_SAFE_FREE(sql_string) {if (sql_string) { sqlite3_free(sql_string); sql_string = NULL; } } +#define SQLITE3_FINALIZE(x) {if (x != NULL) sqlite3_finalize(x); } int mc_db_connect(void **db_handle, bool need_write); int mc_db_disconnect(void *db_handle); diff --git a/include/media_controller_private.h b/include/media_controller_private.h index 12cffce..63f0c18 100755 --- a/include/media_controller_private.h +++ b/include/media_controller_private.h @@ -67,14 +67,14 @@ extern "C" { } while (0) #define mc_retm_if(expr, fmt, arg...) do { \ - if(expr) { \ + if (expr) { \ LOGE(FONT_COLOR_RED""fmt"", ##arg); \ return; \ } \ } while (0) #define mc_retvm_if(expr, val, fmt, arg...) do { \ - if(expr) { \ + if (expr) { \ LOGE(FONT_COLOR_RED""fmt"", ##arg); \ return (val); \ } \ @@ -87,7 +87,7 @@ extern "C" { LOGE(fmt" : standard error= [%s]", mc_stderror_buf); \ } while (0) -#define MC_SAFE_FREE(src) {if(src) {free(src); src = NULL;}} +#define MC_SAFE_FREE(src) { if (src) {free(src); src = NULL; } } #define MC_STRING_VALID(str) ((str != NULL && strlen(str) > 0) ? TRUE : FALSE) #define MC_STRING_DELIMITER "VAL_SEP" @@ -134,7 +134,7 @@ extern "C" { #define MC_MILLISEC_SLEEP(msec) \ do { \ - if(msec) { \ + if (msec) { \ unsigned long sec_t = 0; \ unsigned long nsec_t = 0; \ unsigned long cal_time = msec * 1000000; \ @@ -151,12 +151,12 @@ typedef struct { void *callback; void *user_data; GList *filter_list; -}media_controller_receiver_s; +} media_controller_receiver_s; typedef struct { mc_playback_states_e state; unsigned long long position; -}media_controller_playback_s; +} media_controller_playback_s; typedef struct { char *title; @@ -170,7 +170,7 @@ typedef struct { char *description; char *track_num; char *picture; -}media_controller_metadata_s; +} media_controller_metadata_s; typedef struct { char *server_name; @@ -187,7 +187,7 @@ typedef struct { media_controller_receiver_s playback_state_reciever; media_controller_receiver_s custom_cmd_reciever; -}media_controller_server_s; +} media_controller_server_s; typedef struct { char *client_name; @@ -204,7 +204,7 @@ typedef struct { media_controller_receiver_s shuffle_cb; media_controller_receiver_s repeat_cb; media_controller_receiver_s reply_cb; -}media_controller_client_s; +} media_controller_client_s; /* formal callback to receive signal */ typedef void(*mc_signal_received_cb)(const char *interface_name, const char *signal_name, const char *message, int size, void *user_data); diff --git a/svc/media_controller_db_util.h b/svc/media_controller_db_util.h index 47918a5..a427212 100755 --- a/svc/media_controller_db_util.h +++ b/svc/media_controller_db_util.h @@ -28,8 +28,8 @@ #define DB_SELECT_ALL_SERVER_LIST_EXCEPT_LATEST "SELECT name FROM SQLITE_MASTER WHERE type='table' AND (name != '%q') AND (name NOT IN (SELECT server_name FROM "MC_DB_TABLE_LATEST_SERVER"))" -#define SQLITE3_SAFE_FREE(sql_string) {if(sql_string) { sqlite3_free(sql_string); sql_string = NULL;}} -#define SQLITE3_FINALIZE(x) {if(x != NULL) {sqlite3_finalize(x);}} +#define SQLITE3_SAFE_FREE(sql_string) {if (sql_string) {sqlite3_free(sql_string); sql_string = NULL; } } +#define SQLITE3_FINALIZE(x) {if (x != NULL) sqlite3_finalize(x); } int mc_db_util_connect(void **handle, uid_t uid, bool need_write); int mc_db_util_disconnect(void *handle); diff --git a/svc/media_controller_socket.h b/svc/media_controller_socket.h index 489f777..0be7287 100755 --- a/svc/media_controller_socket.h +++ b/svc/media_controller_socket.h @@ -29,18 +29,18 @@ extern "C" { #define SERVER_IP "127.0.0.1" #define MC_TIMEOUT_SEC_5 5 /**< Response from Server time out */ #define MAX_MSG_SIZE 4096*2 -#define MC_SOCK_NOT_ALLOCATE -1 -//#define MC_SOCK_ACTIVATION_PATH tzplatform_mkpath(TZ_SYS_RUN, "media-controller/media_sa_controller") +#define MC_SOCK_NOT_ALLOCATE -1 +/*#define MC_SOCK_ACTIVATION_PATH tzplatform_mkpath(TZ_SYS_RUN, "media-controller/media_sa_controller") */ #define MC_IPC_PATH tzplatform_mkpath(TZ_SYS_RUN, "media-controller/media_ipc_controller") #define MC_SERVER_CONNECTION_MSG "Connect" #define MC_SERVER_DISCONNECTION_MSG "Disonnect" -typedef enum{ +typedef enum { MC_DB_UPDATE_PORT, /**< Media Controller DB Update */ MC_PORT_MAX, } mc_msg_port_type_e; -typedef enum{ +typedef enum { MC_MSG_DB_UPDATE, /**< Media Controller DB Update */ MC_MSG_CLIENT_SET, MC_MSG_CLIENT_GET, @@ -52,7 +52,7 @@ typedef enum{ typedef struct { int sock_fd; char *sock_path; -}mc_sock_info_s; +} mc_sock_info_s; typedef struct { mc_msg_type_e msg_type; @@ -61,7 +61,7 @@ typedef struct { int result; size_t msg_size; /*this is size of message below and this does not include the terminationg null byte ('\0'). */ char msg[MAX_MSG_SIZE]; -}mc_comm_msg_s; +} mc_comm_msg_s; int mc_ipc_create_client_socket(int timeout_sec, mc_sock_info_s* sock_info); int mc_ipc_delete_client_socket(mc_sock_info_s* sock_info);