From 06cc11942bb4895a121610d437b1e07b69dba57f Mon Sep 17 00:00:00 2001 From: "Haejeong, Kim" Date: Thu, 15 Oct 2015 14:27:18 +0900 Subject: [PATCH] Apply tizen coding rule Change-Id: I228679d1a9e5f47ec476b20a0fe438bb136e03d3 --- lib/include/media-util-dbg.h | 4 +- lib/include/media-util-internal.h | 4 +- lib/media-util-cynara.c | 26 ++-- lib/media-util-db.c | 49 ++++---- lib/media-util-ipc.c | 94 +++++++------- lib/media-util-noti-internal.c | 64 +++++----- lib/media-util-noti.c | 50 ++++---- lib/media-util-register.c | 36 +++--- packaging/media-server.spec | 2 +- src/common/include/media-common-dbg.h | 14 +-- src/common/include/media-common-types.h | 4 +- src/common/media-common-db-svc.c | 36 +++--- src/common/media-common-external-storage.c | 14 +-- src/common/media-common-system.c | 67 +++++----- src/common/media-common-utils.c | 2 +- src/mediadb-update.c | 50 ++++---- src/scanner-v2/media-scanner-device-block-v2.c | 2 +- src/scanner-v2/media-scanner-extract-v2.c | 35 +++--- src/scanner-v2/media-scanner-scan-v2.c | 162 ++++++++++++------------- src/scanner-v2/media-scanner-socket-v2.c | 13 +- src/scanner-v2/media-scanner-v2.c | 14 +-- src/scanner/media-scanner-scan.c | 159 ++++++++++++------------ src/scanner/media-scanner-socket.c | 2 +- src/scanner/media-scanner.c | 10 +- src/server/media-server-db.c | 4 +- src/server/media-server-device-block.c | 10 +- src/server/media-server-main.c | 48 ++++---- src/server/media-server-scanner.c | 32 ++--- src/server/media-server-socket.c | 66 +++++----- src/server/media-server-thumb.c | 62 +++++----- 30 files changed, 552 insertions(+), 583 deletions(-) mode change 100644 => 100755 lib/media-util-cynara.c mode change 100644 => 100755 src/mediadb-update.c diff --git a/lib/include/media-util-dbg.h b/lib/include/media-util-dbg.h index 53fb5f3..8c5b66e 100755 --- a/lib/include/media-util-dbg.h +++ b/lib/include/media-util-dbg.h @@ -69,14 +69,14 @@ } while (0) #define MSAPI_RETV_IF(expr, val) do { \ - if(expr) { \ + if (expr) { \ LOGE(FONT_COLOR_RED); \ return (val); \ } \ } while (0) #define MSAPI_RETVM_IF(expr, val, fmt, arg...) do { \ - if(expr) { \ + if (expr) { \ LOGE(FONT_COLOR_RED fmt, ##arg); \ return (val); \ } \ diff --git a/lib/include/media-util-internal.h b/lib/include/media-util-internal.h index 3fa1b0d..0906232 100755 --- a/lib/include/media-util-internal.h +++ b/lib/include/media-util-internal.h @@ -31,9 +31,9 @@ #define TRUE 1 #endif -#define MS_SAFE_FREE(src) { if(src) {free(src); src = NULL;} } +#define MS_SAFE_FREE(src) { if (src) {free(src); src = NULL;} } #define MS_MALLOC(src, size) { if (size > SIZE_MAX || size <= 0) {src = NULL;} \ - else { src = malloc(size); if(src) memset(src, 0x0, size);} } + else { src = malloc(size); if (src) memset(src, 0x0, size);} } #define MS_STRING_VALID(str) \ ((str != NULL && strlen(str) > 0) ? TRUE : FALSE) diff --git a/lib/media-util-cynara.c b/lib/media-util-cynara.c old mode 100644 new mode 100755 index 5c75c0b..8baa634 --- a/lib/media-util-cynara.c +++ b/lib/media-util-cynara.c @@ -93,7 +93,7 @@ int ms_cynara_receive_untrusted_message(int sockfd, ms_comm_msg_s *recv_msg, ms_ int ret = 0; int recv_msg_size = 0; - if (!recv_msg ||!credentials) + if (!recv_msg || !credentials) return MS_MEDIA_ERR_INVALID_PARAMETER; if ((recv_msg_size = read(sockfd, recv_msg, sizeof(ms_comm_msg_s))) < 0) { @@ -114,19 +114,19 @@ int ms_cynara_receive_untrusted_message(int sockfd, ms_comm_msg_s *recv_msg, ms_ } ret = cynara_creds_socket_get_pid(sockfd, &(credentials->pid)); - if(ret < 0) { + if (ret < 0) { MSAPI_DBG_ERR("cynara_creds_socket_get_pid failed"); return MS_MEDIA_ERR_INTERNAL; } ret = cynara_creds_socket_get_user(sockfd, USER_METHOD_UID, &(credentials->uid)); - if(ret < 0) { + if (ret < 0) { MSAPI_DBG_ERR("cynara_creds_socket_get_user failed"); return MS_MEDIA_ERR_INTERNAL; } ret = cynara_creds_socket_get_client(sockfd, CLIENT_METHOD_SMACK, &(credentials->smack)); - if(ret < 0) { + if (ret < 0) { MSAPI_DBG_ERR("cynara_creds_socket_get_client failed"); return MS_MEDIA_ERR_INTERNAL; } @@ -143,11 +143,11 @@ int ms_cynara_receive_untrusted_message_thumb(int sockfd, thumbMsg *recv_msg, ms int recv_msg_size = 0; unsigned char *buf = NULL; - if (!recv_msg ||!credentials) + if (!recv_msg || !credentials) return MS_MEDIA_ERR_INVALID_PARAMETER; header_size = sizeof(thumbMsg) -(MAX_FILEPATH_LEN * 2) - sizeof(unsigned char *); - MS_MALLOC(buf,header_size); + MS_MALLOC(buf, header_size); if ((recv_msg_size = recv(sockfd, buf, header_size, 0)) < 0) { if (errno == EWOULDBLOCK) { @@ -165,12 +165,12 @@ int ms_cynara_receive_untrusted_message_thumb(int sockfd, thumbMsg *recv_msg, ms if (recv_msg->origin_path_size <= 0) { MS_SAFE_FREE(buf); - MSAPI_DBG_ERR("msg->origin_path_size is invalid %d", recv_msg->origin_path_size ); + MSAPI_DBG_ERR("msg->origin_path_size is invalid %d", recv_msg->origin_path_size); return MS_MEDIA_ERR_INVALID_PARAMETER; } MS_MALLOC(buf, (unsigned int)(recv_msg->origin_path_size)); - if(buf == NULL) { + if (buf == NULL) { MSAPI_DBG_STRERROR("malloc failed"); return MS_MEDIA_ERR_OUT_OF_MEMORY; } @@ -192,12 +192,12 @@ int ms_cynara_receive_untrusted_message_thumb(int sockfd, thumbMsg *recv_msg, ms if (recv_msg->dest_path_size <= 0) { MS_SAFE_FREE(buf); - MSAPI_DBG_ERR("msg->origin_path_size is invalid %d", recv_msg->dest_path_size ); + MSAPI_DBG_ERR("msg->origin_path_size is invalid %d", recv_msg->dest_path_size); return MS_MEDIA_ERR_INVALID_PARAMETER; } MS_MALLOC(buf, (unsigned int)(recv_msg->dest_path_size)); - if(buf == NULL) { + if (buf == NULL) { MSAPI_DBG_STRERROR("malloc failed"); return MS_MEDIA_ERR_OUT_OF_MEMORY; } @@ -219,19 +219,19 @@ int ms_cynara_receive_untrusted_message_thumb(int sockfd, thumbMsg *recv_msg, ms ret = cynara_creds_socket_get_pid(sockfd, &(credentials->pid)); - if(ret < 0) { + if (ret < 0) { MSAPI_DBG_ERR("cynara_creds_socket_get_pid failed"); return MS_MEDIA_ERR_INTERNAL; } ret = cynara_creds_socket_get_user(sockfd, USER_METHOD_UID, &(credentials->uid)); - if(ret < 0) { + if (ret < 0) { MSAPI_DBG_ERR("cynara_creds_socket_get_user failed"); return MS_MEDIA_ERR_INTERNAL; } ret = cynara_creds_socket_get_client(sockfd, CLIENT_METHOD_SMACK, &(credentials->smack)); - if(ret < 0) { + if (ret < 0) { MSAPI_DBG_ERR("cynara_creds_socket_get_client failed"); return MS_MEDIA_ERR_INTERNAL; } diff --git a/lib/media-util-db.c b/lib/media-util-db.c index f09e0ae..c84de9e 100755 --- a/lib/media-util-db.c +++ b/lib/media-util-db.c @@ -67,24 +67,21 @@ static char* __media_get_media_DB(uid_t uid) { char *result_psswd = NULL; struct group *grpinfo = NULL; - if(uid == getuid()) - { + if (uid == getuid()) { result_psswd = strdup(MEDIA_DB_NAME); grpinfo = getgrnam("users"); - if(grpinfo == NULL) { + if (grpinfo == NULL) { MSAPI_DBG_ERR("getgrnam(users) returns NULL !"); return NULL; } - } - else - { + } else { struct passwd *userinfo = getpwuid(uid); - if(userinfo == NULL) { + if (userinfo == NULL) { MSAPI_DBG_ERR("getpwuid(%d) returns NULL !", uid); return NULL; } grpinfo = getgrnam("users"); - if(grpinfo == NULL) { + if (grpinfo == NULL) { MSAPI_DBG_ERR("getgrnam(users) returns NULL !"); return NULL; } @@ -99,7 +96,7 @@ static char* __media_get_media_DB(uid_t uid) return result_psswd; } -static int __media_db_connect_db_with_handle(sqlite3 **db_handle,uid_t uid, bool need_write) +static int __media_db_connect_db_with_handle(sqlite3 **db_handle, uid_t uid, bool need_write) { int ret = SQLITE_OK; @@ -167,15 +164,13 @@ static int __media_db_request_update_tcp(ms_msg_type_e msg_type, const char *req int retry_count = 0; sock_info.port = MS_DB_UPDATE_PORT; - if(!MS_STRING_VALID(request_msg)) - { + if (!MS_STRING_VALID(request_msg)) { MSAPI_DBG_ERR("invalid query"); return MS_MEDIA_ERR_INVALID_PARAMETER; } request_msg_size = strlen(request_msg); - if(request_msg_size >= MAX_MSG_SIZE) - { + if (request_msg_size >= MAX_MSG_SIZE) { MSAPI_DBG_ERR("Query is Too long. [%d] query size limit is [%d]", request_msg_size, MAX_MSG_SIZE); return MS_MEDIA_ERR_INVALID_PARAMETER; } @@ -222,17 +217,17 @@ RETRY: if ((recv_msg_size = recv(sockfd, &recv_msg, sizeof(recv_msg), 0)) < 0) { MSAPI_DBG_ERR("recv failed : [%d]", sockfd); - if (errno == EINTR) { + if (errno == EINTR) { MSAPI_DBG_STRERROR("catch interrupt"); goto RETRY; - } + } if (errno == EWOULDBLOCK) { - if(retry_count < MAX_RETRY_COUNT) { + if (retry_count < MAX_RETRY_COUNT) { MSAPI_DBG_ERR("TIME OUT[%d]", retry_count); - retry_count ++; + retry_count++; goto RETRY; - } + } close(sockfd); MSAPI_DBG_ERR("Timeout. Can't try any more"); @@ -299,7 +294,7 @@ static int __media_db_close_tcp_client_socket() int ret = MS_MEDIA_ERR_NONE; if (g_tcp_client_sock != -1) { - if (close(g_tcp_client_sock)<0) { + if (close(g_tcp_client_sock) < 0) { MSAPI_DBG_ERR("sock(%d) close failed", g_tcp_client_sock); MSAPI_DBG_STRERROR("socket close failed"); ret = MS_MEDIA_ERR_SOCKET_INTERNAL; @@ -316,15 +311,13 @@ static int __media_db_request_batch_update(ms_msg_type_e msg_type, const char *r int request_msg_size = 0; int sockfd = -1; - if(!MS_STRING_VALID(request_msg)) - { + if (!MS_STRING_VALID(request_msg)) { MSAPI_DBG_ERR("invalid query"); return MS_MEDIA_ERR_INVALID_PARAMETER; } request_msg_size = strlen(request_msg); - if(request_msg_size >= MAX_MSG_SIZE) - { + if (request_msg_size >= MAX_MSG_SIZE) { MSAPI_DBG_ERR("Query is Too long. [%d] query size limit is [%d]", request_msg_size, MAX_MSG_SIZE); return MS_MEDIA_ERR_INVALID_PARAMETER; } @@ -383,11 +376,11 @@ static int _media_db_update_directly(sqlite3 *db_handle, const char *sql_str) // MSAPI_DBG_SLOG("SQL = [%s]", sql_str); -EXEC_RETRY: +EXEC_RETRY : ret = sqlite3_exec(db_handle, sql_str, NULL, NULL, &zErrMsg); if (SQLITE_OK != ret) { - MSAPI_DBG_ERR("DB Update Fail SQL:%s", sql_str); + MSAPI_DBG_ERR("DB Update Fail SQL : %s", sql_str); MSAPI_DBG_ERR("ERROR [%s]", zErrMsg); if (ret == SQLITE_BUSY) { ret = MS_MEDIA_ERR_DB_BUSY_FAIL; @@ -409,7 +402,7 @@ EXEC_RETRY: } if (zErrMsg) - sqlite3_free (zErrMsg); + sqlite3_free(zErrMsg); return ret; } @@ -421,7 +414,7 @@ int media_db_connect(MediaDBHandle **handle, uid_t uid, bool need_write) MSAPI_DBG_FUNC(); - ret = __media_db_connect_db_with_handle(&db_handle,uid, need_write); + ret = __media_db_connect_db_with_handle(&db_handle, uid, need_write); MSAPI_RETV_IF(ret != MS_MEDIA_ERR_NONE, ret); *handle = db_handle; @@ -447,7 +440,7 @@ int media_db_request_update_db(const char *query_str, uid_t uid) MSAPI_RETVM_IF(!MS_STRING_VALID(query_str), MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid Query"); - ret = __media_db_request_update_tcp(MS_MSG_DB_UPDATE, query_str ,uid); + ret = __media_db_request_update_tcp(MS_MSG_DB_UPDATE, query_str, uid); if (ret != MS_MEDIA_ERR_NONE) { MSAPI_DBG_ERR("__media_db_request_update_tcp failed : %d", ret); } diff --git a/lib/media-util-ipc.c b/lib/media-util-ipc.c index 1f43278..5f0c9db 100755 --- a/lib/media-util-ipc.c +++ b/lib/media-util-ipc.c @@ -36,7 +36,7 @@ #define MS_SOCK_UDP_BLOCK_SIZE 512 -char MEDIA_IPC_PATH[][70] ={ +char MEDIA_IPC_PATH[][70] = { {"/var/run/media-server/media_ipc_dbbatchupdate.socket"}, {"/var/run/media-server/media_ipc_scandaemon.socket"}, {"/var/run/media-server/media_ipc_scanner.socket"}, @@ -46,7 +46,7 @@ char MEDIA_IPC_PATH[][70] ={ {"/var/run/media-server/media_ipc_thumbdaemon.socket"}, }; -char MEDIA_IPC_PATH_CLIENT[][80] ={ +char MEDIA_IPC_PATH_CLIENT[][80] = { {"/var/run/user/%i/media-server/media_ipc_dbbatchupdate_client%i.socket"}, {"/var/run/user/%i/media-server/media_ipc_scandaemon_client%i.socket"}, {"/var/run/user/%i/media-server/media_ipc_scanner_client%i.socket"}, @@ -56,7 +56,7 @@ char MEDIA_IPC_PATH_CLIENT[][80] ={ {"/var/run/user/%i/media-server/media_ipc_thumbdaemon_client%i.socket"}, }; -char MEDIA_IPC_PATH_CLIENT_ROOT[][80] ={ +char MEDIA_IPC_PATH_CLIENT_ROOT[][80] = { {"/var/run/media-server/media_ipc_dbbatchupdate_client%i.socket"}, {"/var/run/media-server/media_ipc_scandaemon_client%i.socket"}, {"/var/run/media-server/media_ipc_scanner_client%i.socket"}, @@ -66,22 +66,24 @@ char MEDIA_IPC_PATH_CLIENT_ROOT[][80] ={ {"/var/run/media-server/media_ipc_thumbdaemon_client%i.socket"}, }; -static int _mkdir(const char *dir, mode_t mode) { - char tmp[256]; - char *p = NULL; - size_t len; - - snprintf(tmp, sizeof(tmp),"%s",dir); - len = strlen(tmp); - if(tmp[len - 1] == '/') - tmp[len - 1] = 0; - for(p = tmp + 1; *p; p++) - if(*p == '/') { - *p = 0; - mkdir(tmp, mode); - *p = '/'; - } - return mkdir(tmp, mode); +static int _mkdir(const char *dir, mode_t mode) +{ + char tmp[256]; + char *p = NULL; + size_t len; + + snprintf(tmp, sizeof(tmp), "%s", dir); + len = strlen(tmp); + if (tmp[len - 1] == '/') + tmp[len - 1] = 0; + for (p = tmp + 1; *p; p++) + if (*p == '/') { + *p = 0; + mkdir(tmp, mode); + *p = '/'; + } + + return mkdir(tmp, mode); } int ms_ipc_create_client_socket(ms_protocol_e protocol, int timeout_sec, ms_sock_info_s* sock_info) @@ -91,24 +93,23 @@ int ms_ipc_create_client_socket(ms_protocol_e protocol, int timeout_sec, ms_sock struct timeval tv_timeout = { timeout_sec, 0 }; - if(protocol == MS_PROTOCOL_UDP) - { - char *path; - int cx,len; + if (protocol == MS_PROTOCOL_UDP) { + char *path = NULL; + int cx = 0, len = 0; - if (tzplatform_getuid(TZ_USER_NAME) == 0 ){ - cx = snprintf ( NULL, 0, MEDIA_IPC_PATH_CLIENT_ROOT[sock_info->port],getpid()); - sock_info->sock_path = (char*)malloc((cx + 1 )*sizeof(char)); - snprintf ( sock_info->sock_path, cx + 1, MEDIA_IPC_PATH_CLIENT_ROOT[sock_info->port],getpid()); + if (tzplatform_getuid(TZ_USER_NAME) == 0) { + cx = snprintf(NULL, 0, MEDIA_IPC_PATH_CLIENT_ROOT[sock_info->port], getpid()); + sock_info->sock_path = (char*)malloc((cx + 1)*sizeof(char)); + snprintf(sock_info->sock_path, cx + 1, MEDIA_IPC_PATH_CLIENT_ROOT[sock_info->port], getpid()); } else { - len = snprintf ( NULL, 0, "/var/run/user/%i/media-server", tzplatform_getuid(TZ_USER_NAME)); - path = (char*)malloc((len + 1 )*sizeof(char)); - snprintf ( path, len + 1, "/var/run/user/%i/media-server", tzplatform_getuid(TZ_USER_NAME)); + len = snprintf(NULL, 0, "/var/run/user/%i/media-server", tzplatform_getuid(TZ_USER_NAME)); + path = (char*)malloc((len + 1)*sizeof(char)); + snprintf(path, len + 1, "/var/run/user/%i/media-server", tzplatform_getuid(TZ_USER_NAME)); _mkdir(path, 0777); free(path); - cx = snprintf ( NULL, 0, MEDIA_IPC_PATH_CLIENT[sock_info->port], tzplatform_getuid(TZ_USER_NAME),getpid()); - sock_info->sock_path = (char*)malloc((cx + 1 )*sizeof(char)); - snprintf ( sock_info->sock_path, cx + 1, MEDIA_IPC_PATH_CLIENT[sock_info->port],tzplatform_getuid(TZ_USER_NAME),getpid()); + cx = snprintf(NULL, 0, MEDIA_IPC_PATH_CLIENT[sock_info->port], tzplatform_getuid(TZ_USER_NAME), getpid()); + sock_info->sock_path = (char*)malloc((cx + 1)*sizeof(char)); + snprintf(sock_info->sock_path, cx + 1, MEDIA_IPC_PATH_CLIENT[sock_info->port], tzplatform_getuid(TZ_USER_NAME), getpid()); } /* Create a datagram/UDP socket */ @@ -130,9 +131,7 @@ int ms_ipc_create_client_socket(ms_protocol_e protocol, int timeout_sec, ms_sock free(sock_info->sock_path); return MS_MEDIA_ERR_SOCKET_CONN; } - } - else - { + } else { /*Create TCP Socket*/ if ((sock = socket(PF_FILE, SOCK_STREAM, 0)) < 0) { MSAPI_DBG_STRERROR("socket failed"); @@ -162,7 +161,7 @@ int ms_ipc_delete_client_socket(ms_sock_info_s* sock_info) MSAPI_DBG("sockfd %d close", sock_info->sock_fd); if (sock_info->sock_path != NULL) { err = unlink(sock_info->sock_path); - if (err< 0) { + if (err < 0) { MSAPI_DBG_STRERROR("unlink failed"); } free(sock_info->sock_path); @@ -181,16 +180,13 @@ int ms_ipc_create_server_socket(ms_protocol_e protocol, ms_msg_port_type_e port, serv_port = port; - if(protocol == MS_PROTOCOL_UDP) - { + if (protocol == MS_PROTOCOL_UDP) { /* Create a datagram/UDP socket */ if ((sock = socket(PF_FILE, SOCK_DGRAM, 0)) < 0) { MSAPI_DBG_STRERROR("socket failed"); return MS_MEDIA_ERR_SOCKET_CONN; } - } - else - { + } else { /* Create a TCP socket */ if ((sock = socket(PF_FILE, SOCK_STREAM, 0)) < 0) { MSAPI_DBG_STRERROR("socket failed"); @@ -206,12 +202,12 @@ int ms_ipc_create_server_socket(ms_protocol_e protocol, ms_msg_port_type_e port, strncpy(serv_addr.sun_path, MEDIA_IPC_PATH[serv_port], strlen(MEDIA_IPC_PATH[serv_port])); /* Bind to the local address */ - for (i = 0; i < 100; i ++) { + for (i = 0; i < 100; i++) { if (bind(sock, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) == 0) { bind_success = true; break; } - MSAPI_DBG("%d",i); + MSAPI_DBG("%d", i); usleep(250000); } @@ -360,7 +356,7 @@ int ms_ipc_wait_message(int sockfd, void *recv_msg, unsigned int msg_size, struc int recv_msg_size; socklen_t addr_len; - if (!recv_msg ||!recv_addr) + if (!recv_msg || !recv_addr) return MS_MEDIA_ERR_INVALID_PARAMETER; addr_len = sizeof(struct sockaddr_un); @@ -390,20 +386,20 @@ int ms_ipc_wait_block_message(int sockfd, void *recv_msg, unsigned int msg_size, int recv_size = 0; unsigned int remain_size = msg_size; - if (!recv_msg ||!recv_addr) + if (!recv_msg || !recv_addr) return MS_MEDIA_ERR_INVALID_PARAMETER; addr_len = sizeof(struct sockaddr_un); block_size = MS_SOCK_UDP_BLOCK_SIZE; block_buf = malloc(block_size * sizeof(unsigned char)); - if(block_buf == NULL) { + if (block_buf == NULL) { MSAPI_DBG_ERR("malloc failed."); return MS_MEDIA_ERR_OUT_OF_MEMORY; } memset(block_buf, 0, block_size * sizeof(unsigned char)); - while(remain_size > 0) { - if(remain_size < MS_SOCK_UDP_BLOCK_SIZE) { + while (remain_size > 0) { + if (remain_size < MS_SOCK_UDP_BLOCK_SIZE) { block_size = remain_size; } if ((recv_msg_size = recvfrom(sockfd, block_buf, block_size, 0, (struct sockaddr *)recv_addr, &addr_len)) < 0) { diff --git a/lib/media-util-noti-internal.c b/lib/media-util-noti-internal.c index 4ce1932..0c0157a 100755 --- a/lib/media-util-noti-internal.c +++ b/lib/media-util-noti-internal.c @@ -48,7 +48,7 @@ int ref_count; #define MS_MEDIA_DBUS_NAME_INTERNAL "ms_db_updated_internal" -typedef struct internal_noti_cb_data{ +typedef struct internal_noti_cb_data { DBusConnection *dbus; db_update_cb user_callback; void *user_data; @@ -70,15 +70,15 @@ int media_db_update_send_internal(int pid, /* mandatory */ int path_length = strlen(path) + 1; /* Get a connection to the session bus */ - dbus_error_init (&error); - bus = dbus_bus_get (DBUS_BUS_SYSTEM, &error); + dbus_error_init(&error); + bus = dbus_bus_get(DBUS_BUS_SYSTEM, &error); if (!bus) { - MSAPI_DBG ("Failed to connect to the D-BUS daemon: %s", error.message); - dbus_error_free (&error); + MSAPI_DBG("Failed to connect to the D-BUS daemon: %s", error.message); + dbus_error_free(&error); return MS_MEDIA_ERR_INTERNAL; } - message = dbus_message_new_signal (MS_MEDIA_DBUS_PATH, MS_MEDIA_DBUS_INTERFACE, MS_MEDIA_DBUS_NAME_INTERNAL); + message = dbus_message_new_signal(MS_MEDIA_DBUS_PATH, MS_MEDIA_DBUS_INTERFACE, MS_MEDIA_DBUS_NAME_INTERNAL); if (message != NULL) { path_array = malloc(sizeof(unsigned char) * path_length); memcpy(path_array, path, path_length); @@ -87,7 +87,7 @@ int media_db_update_send_internal(int pid, /* mandatory */ MSAPI_DBG("FILE CHANGED"); if (uuid != NULL && mime_type != NULL) { /* fill all datas */ - dbus_message_append_args (message, + dbus_message_append_args(message, DBUS_TYPE_INT32, &item, DBUS_TYPE_INT32, &pid, DBUS_TYPE_INT32, &update_type, @@ -99,14 +99,14 @@ int media_db_update_send_internal(int pid, /* mandatory */ } else { MSAPI_DBG_ERR("uuid or mime_type is NULL"); MS_SAFE_FREE(path_array); - dbus_message_unref (message); + dbus_message_unref(message); return MS_MEDIA_ERR_INVALID_PARAMETER; } } else if (item == MS_MEDIA_ITEM_DIRECTORY) { MSAPI_DBG("DIRECTORY CHANGED"); /* fill all datas */ - if(uuid != NULL) { - dbus_message_append_args (message, + if (uuid != NULL) { + dbus_message_append_args(message, DBUS_TYPE_INT32, &item, DBUS_TYPE_INT32, &pid, DBUS_TYPE_INT32, &update_type, @@ -114,7 +114,7 @@ int media_db_update_send_internal(int pid, /* mandatory */ DBUS_TYPE_STRING, &uuid, DBUS_TYPE_INVALID); } else { - dbus_message_append_args (message, + dbus_message_append_args(message, DBUS_TYPE_INT32, &item, DBUS_TYPE_INT32, &pid, DBUS_TYPE_INT32, &update_type, @@ -128,10 +128,10 @@ int media_db_update_send_internal(int pid, /* mandatory */ MS_SAFE_FREE(path_array); /* Send the signal */ - dbus_connection_send (bus, message, NULL); + dbus_connection_send(bus, message, NULL); /* Free the signal now we have finished with it */ - dbus_message_unref (message); + dbus_message_unref(message); MSAPI_DBG_ERR("success send notification"); } else { @@ -149,7 +149,7 @@ DBusHandlerResult __get_message_internal(DBusMessage *message, db_update_cb user_cb, void *userdata) { /* A Ping signal on the com.burtonini.dbus.Signal interface */ - if (dbus_message_is_signal (message, MS_MEDIA_DBUS_INTERFACE, MS_MEDIA_DBUS_NAME_INTERNAL)) { + if (dbus_message_is_signal(message, MS_MEDIA_DBUS_INTERFACE, MS_MEDIA_DBUS_NAME_INTERNAL)) { int i = 0; int current_type = DBUS_TYPE_INVALID; DBusError error; @@ -166,22 +166,22 @@ __get_message_internal(DBusMessage *message, db_update_cb user_cb, void *userdat void *recevie_path = NULL; int path_len = 0; - dbus_error_init (&error); + dbus_error_init(&error); MSAPI_DBG("size [%d]", sizeof(value)); memset(value, 0x0, sizeof(value)); /* get data from dbus message */ - dbus_message_iter_init (message, &read_iter); - while ((current_type = dbus_message_iter_get_arg_type (&read_iter)) != DBUS_TYPE_INVALID){ + dbus_message_iter_init(message, &read_iter); + while ((current_type = dbus_message_iter_get_arg_type(&read_iter)) != DBUS_TYPE_INVALID) { if (current_type == DBUS_TYPE_ARRAY) { DBusMessageIter sub; dbus_message_iter_recurse(&read_iter, &sub); dbus_message_iter_get_fixed_array(&sub, &recevie_path, &path_len); } else { - dbus_message_iter_get_basic (&read_iter, &value[i]); - i ++; + dbus_message_iter_get_basic(&read_iter, &value[i]); + i++; } - dbus_message_iter_next (&read_iter); + dbus_message_iter_next(&read_iter); } item = value[0].i32; @@ -237,17 +237,17 @@ int media_db_update_subscribe_internal(MediaNotiHandle *handle, db_update_cb use dbus_g_thread_init(); - dbus_error_init (&error); + dbus_error_init(&error); - dbus = dbus_bus_get_private (DBUS_BUS_SYSTEM, &error); + dbus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error); if (!dbus) { - MSAPI_DBG ("Failed to connect to the D-BUS daemon: %s", error.message); - dbus_error_free (&error); + MSAPI_DBG("Failed to connect to the D-BUS daemon: %s", error.message); + dbus_error_free(&error); ret = MS_MEDIA_ERR_INTERNAL; goto ERROR; } - dbus_connection_setup_with_g_main (dbus, NULL); + dbus_connection_setup_with_g_main(dbus, NULL); MS_MALLOC(noti_data, sizeof(internal_noti_cb_data)); if (noti_data == NULL) { @@ -259,9 +259,9 @@ int media_db_update_subscribe_internal(MediaNotiHandle *handle, db_update_cb use noti_data->user_data = user_data; /* listening to messages from all objects as no path is specified */ - dbus_bus_add_match (dbus, MS_MEDIA_DBUS_MATCH_RULE, &error); - if( !dbus_connection_add_filter (dbus, __message_filter_internal, noti_data, NULL)) { - dbus_bus_remove_match (dbus, MS_MEDIA_DBUS_MATCH_RULE, NULL); + dbus_bus_add_match(dbus, MS_MEDIA_DBUS_MATCH_RULE, &error); + if (!dbus_connection_add_filter(dbus, __message_filter_internal, noti_data, NULL)) { + dbus_bus_remove_match(dbus, MS_MEDIA_DBUS_MATCH_RULE, NULL); ret = MS_MEDIA_ERR_INTERNAL; goto ERROR; } @@ -307,8 +307,8 @@ static int _find_handle(MediaNotiHandle handle, int *idx) MediaNotiHandle data; /*delete all node*/ - if(handle_list_internal != NULL) { - for (i =0; i < handle_list_internal->len; i++) { + if (handle_list_internal != NULL) { + for (i = 0; i < handle_list_internal->len; i++) { data = g_array_index(handle_list_internal , MediaNotiHandle, i); MSAPI_DBG_ERR("%x %x", handle, data); if (data == handle) { @@ -342,11 +342,11 @@ int media_db_update_unsubscribe_internal(MediaNotiHandle handle, clear_user_data g_mutex_lock(&mutex_internal); err = _find_handle(handle, &idx); - if(err == MS_MEDIA_ERR_NONE) { + if (err == MS_MEDIA_ERR_NONE) { DBusConnection *dbus = ((internal_noti_cb_data*)handle)->dbus; dbus_connection_remove_filter(dbus, __message_filter_internal, (internal_noti_cb_data*)handle); - dbus_bus_remove_match (dbus, MS_MEDIA_DBUS_MATCH_RULE, NULL); + dbus_bus_remove_match(dbus, MS_MEDIA_DBUS_MATCH_RULE, NULL); dbus_connection_close(dbus); dbus_connection_unref(dbus); g_array_remove_index(handle_list_internal, idx); diff --git a/lib/media-util-noti.c b/lib/media-util-noti.c index 938a974..c0790ab 100755 --- a/lib/media-util-noti.c +++ b/lib/media-util-noti.c @@ -40,7 +40,7 @@ static int ref_count = 0; #define MS_MEDIA_DBUS_NAME "ms_db_updated" -typedef struct noti_callback_data{ +typedef struct noti_callback_data { db_update_cb user_callback; void *user_data; } noti_callback_data; @@ -117,8 +117,8 @@ int media_db_update_subscribe(db_update_cb user_cb, void *user_data) if (g_bus == NULL) { g_bus = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &error); if (!g_bus) { - MSAPI_DBG ("Failed to connect to the g D-BUS daemon: %s", error->message); - g_error_free (error); + MSAPI_DBG("Failed to connect to the g D-BUS daemon: %s", error->message); + g_error_free(error); ret = MS_MEDIA_ERR_INTERNAL; goto ERROR; } @@ -147,7 +147,7 @@ int media_db_update_subscribe(db_update_cb user_cb, void *user_data) g_data_store = (void *)callback_data; } - ref_count ++; + ref_count++; g_mutex_unlock(¬i_mutex); @@ -184,7 +184,7 @@ int media_db_update_unsubscribe(void) g_data_store = NULL; } - ref_count --; + ref_count--; g_mutex_unlock(¬i_mutex); @@ -206,8 +206,8 @@ int media_db_update_send(int pid, /* mandatory */ bus = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &error); if (!bus) { - MSAPI_DBG ("Failed to get gdbus connection: %s", error->message); - g_error_free (error); + MSAPI_DBG("Failed to get gdbus connection: %s", error->message); + g_error_free(error); return MS_MEDIA_ERR_INTERNAL; } @@ -223,7 +223,7 @@ int media_db_update_send(int pid, /* mandatory */ } else if (item == MS_MEDIA_ITEM_DIRECTORY) { MSAPI_DBG("DIRECTORY CHANGED"); /* fill all datas */ - if(uuid != NULL) { + if (uuid != NULL) { message = g_variant_new("(iiiss)", item, pid, update_type, path, uuid); } else { message = g_variant_new("(iiis)", item, pid, update_type, path); @@ -240,11 +240,9 @@ int media_db_update_send(int pid, /* mandatory */ MS_MEDIA_DBUS_NAME, message, &error); - if (!emmiting) - { - MSAPI_DBG_ERR("g_dbus_connection_emit_signal failed : %s", error?error->message:"none"); - if (error) - { + if (!emmiting) { + MSAPI_DBG_ERR("g_dbus_connection_emit_signal failed : %s", error ? error->message : "none"); + if (error) { MSAPI_DBG_ERR("Error in g_dbus_connection_emit_signal"); g_object_unref(bus); g_error_free(error); @@ -255,11 +253,9 @@ int media_db_update_send(int pid, /* mandatory */ gboolean flush = FALSE; flush = g_dbus_connection_flush_sync(bus, NULL, &error); - if (!flush) - { + if (!flush) { MSAPI_DBG_ERR("g_dbus_connection_flush_sync failed"); - if (error) - { + if (error) { MSAPI_DBG_ERR("error : [%s]", error->message); g_object_unref(bus); g_error_free(error); @@ -288,8 +284,8 @@ int media_db_update_send_v2(int pid, /* mandatory */ bus = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &error); if (!bus) { - MSAPI_DBG ("Failed to get gdbus connection: %s", error->message); - g_error_free (error); + MSAPI_DBG("Failed to get gdbus connection: %s", error->message); + g_error_free(error); return MS_MEDIA_ERR_INTERNAL; } @@ -305,7 +301,7 @@ int media_db_update_send_v2(int pid, /* mandatory */ } else if (item == MS_MEDIA_ITEM_DIRECTORY) { MSAPI_DBG("DIRECTORY CHANGED"); /* fill all datas */ - if(uuid != NULL) { + if (uuid != NULL) { message = g_variant_new("(iiiss)", item, pid, update_type, path, uuid); } else { message = g_variant_new("(iiis)", item, pid, update_type, path); @@ -322,11 +318,9 @@ int media_db_update_send_v2(int pid, /* mandatory */ MS_MEDIA_DBUS_NAME, message, &error); - if (!emmiting) - { - MSAPI_DBG_ERR("g_dbus_connection_emit_signal failed : %s", error?error->message:"none"); - if (error) - { + if (!emmiting) { + MSAPI_DBG_ERR("g_dbus_connection_emit_signal failed : %s", error ? error->message : "none"); + if (error) { MSAPI_DBG_ERR("Error in g_dbus_connection_emit_signal"); g_object_unref(bus); g_error_free(error); @@ -337,11 +331,9 @@ int media_db_update_send_v2(int pid, /* mandatory */ gboolean flush = FALSE; flush = g_dbus_connection_flush_sync(bus, NULL, &error); - if (!flush) - { + if (!flush) { MSAPI_DBG_ERR("g_dbus_connection_flush_sync failed"); - if (error) - { + if (error) { MSAPI_DBG_ERR("error : [%s]", error->message); g_object_unref(bus); g_error_free(error); diff --git a/lib/media-util-register.c b/lib/media-util-register.c index 8d73085..fa02f51 100755 --- a/lib/media-util-register.c +++ b/lib/media-util-register.c @@ -39,14 +39,14 @@ #include "media-util-dbg.h" #include "media-util.h" -typedef struct media_callback_data{ +typedef struct media_callback_data { GSource *source; scan_complete_cb user_callback; void *user_data; char *sock_path; } media_callback_data; -typedef struct media_scan_data{ +typedef struct media_scan_data { GIOChannel *src; media_callback_data *cb_data; int pid; @@ -123,7 +123,7 @@ static int _check_dir_path(const char *dir_path, uid_t uid) struct stat sb; DIR *dp = NULL; - if (!_is_valid_path(dir_path,uid)) { + if (!_is_valid_path(dir_path, uid)) { MSAPI_DBG("Invalid path : %s", dir_path); return MS_MEDIA_ERR_INVALID_PATH; } @@ -142,7 +142,7 @@ static int _check_dir_path(const char *dir_path, uid_t uid) } return MS_MEDIA_ERR_INTERNAL; } else { - if((sb.st_mode & S_IFMT) != S_IFDIR) { + if ((sb.st_mode & S_IFMT) != S_IFDIR) { MSAPI_DBG("Invalid path : %s is not directory", dir_path); return MS_MEDIA_ERR_INVALID_PATH; } @@ -184,7 +184,7 @@ gboolean _read_socket(GIOChannel *src, GIOCondition condition, gpointer data) req_result.pid = recv_msg.pid; req_result.result = recv_msg.result; - if (recv_msg.msg_type ==MS_MSG_SCANNER_RESULT) { + if (recv_msg.msg_type == MS_MSG_SCANNER_RESULT) { req_result.complete_path = strndup(recv_msg.msg, recv_msg.msg_size); req_result.request_type = MEDIA_DIRECTORY_SCAN; MSAPI_DBG("complete_path :%d", req_result.complete_path); @@ -278,7 +278,7 @@ static int _remove_request(const char * req_path) req_data = g_array_index(req_list, media_scan_data*, i); if (strcmp(req_data->req_path, req_path) == 0) { flag = true; - g_array_remove_index (req_list, i); + g_array_remove_index(req_list, i); } } @@ -368,8 +368,7 @@ static int __media_db_request_update_async(ms_msg_type_e msg_type, const char *s char *sock_path = NULL; ms_sock_info_s sock_info; - if(!MS_STRING_VALID(request_msg)) - { + if (!MS_STRING_VALID(request_msg)) { MSAPI_DBG_ERR("invalid query"); return MS_MEDIA_ERR_INVALID_PARAMETER; } @@ -377,8 +376,7 @@ static int __media_db_request_update_async(ms_msg_type_e msg_type, const char *s MSAPI_DBG("REQUEST DIRECTORY SCANNING[%s]", request_msg); request_msg_size = strlen(request_msg); - if(request_msg_size >= MAX_MSG_SIZE) - { + if (request_msg_size >= MAX_MSG_SIZE) { MSAPI_DBG_ERR("Query is Too long. [%d] query size limit is [%d]", request_msg_size, MAX_MSG_SIZE); return MS_MEDIA_ERR_INVALID_PARAMETER; } @@ -410,8 +408,8 @@ static int __media_db_request_update_async(ms_msg_type_e msg_type, const char *s return ret; } - ret = _attach_callback(request_msg, &sockfd, sock_path, user_callback ,user_data); - if(ret != MS_MEDIA_ERR_NONE) + ret = _attach_callback(request_msg, &sockfd, sock_path, user_callback, user_data); + if (ret != MS_MEDIA_ERR_NONE) return ret; return ret; @@ -426,8 +424,7 @@ static int __media_db_request_update_cancel(ms_msg_type_e msg_type, const char * ms_sock_info_s sock_info; sock_info.port = MS_SCANNER_PORT; - if(!MS_STRING_VALID(request_msg)) - { + if (!MS_STRING_VALID(request_msg)) { MSAPI_DBG_ERR("invalid query"); return MS_MEDIA_ERR_INVALID_PARAMETER; } @@ -435,8 +432,7 @@ static int __media_db_request_update_cancel(ms_msg_type_e msg_type, const char * MSAPI_DBG("REQUEST CANCEL DIRECTORY SCANNING[%s]", request_msg); request_msg_size = strlen(request_msg); - if(request_msg_size >= MAX_MSG_SIZE) - { + if (request_msg_size >= MAX_MSG_SIZE) { MSAPI_DBG_ERR("Query is Too long. [%d] query size limit is [%d]", request_msg_size, MAX_MSG_SIZE); return MS_MEDIA_ERR_INVALID_PARAMETER; } @@ -461,7 +457,7 @@ static int __media_db_request_update_cancel(ms_msg_type_e msg_type, const char * } ret = _remove_request(request_msg); - if(ret != MS_MEDIA_ERR_NONE) + if (ret != MS_MEDIA_ERR_NONE) return ret; return ret; @@ -471,8 +467,8 @@ int media_directory_scanning_async(const char *directory_path, const char *stora { int ret = MS_MEDIA_ERR_NONE; - ret = _check_dir_path(directory_path,uid); - if(ret != MS_MEDIA_ERR_NONE) + ret = _check_dir_path(directory_path, uid); + if (ret != MS_MEDIA_ERR_NONE) return ret; if (recursive_on == TRUE) @@ -488,7 +484,7 @@ int media_directory_scanning_cancel(const char *directory_path, uid_t uid) int ret = MS_MEDIA_ERR_NONE; ret = _check_dir_path(directory_path, uid); - if(ret != MS_MEDIA_ERR_NONE) + if (ret != MS_MEDIA_ERR_NONE) return ret; ret = __media_db_request_update_cancel(MS_MSG_DIRECTORY_SCANNING_CANCEL, directory_path); diff --git a/packaging/media-server.spec b/packaging/media-server.spec index 627a884..1705f09 100755 --- a/packaging/media-server.spec +++ b/packaging/media-server.spec @@ -1,6 +1,6 @@ Name: media-server Summary: File manager service server. -Version: 0.2.59 +Version: 0.2.60 Release: 0 Group: Multimedia/Service License: Apache-2.0 diff --git a/src/common/include/media-common-dbg.h b/src/common/include/media-common-dbg.h index eaee743..a563f8e 100755 --- a/src/common/include/media-common-dbg.h +++ b/src/common/include/media-common-dbg.h @@ -39,30 +39,30 @@ #define MS_DBG_SLOG(fmt, args...) do{ if (true) { \ SECURE_LOGD(fmt "\n" , ##args); \ - }} while(false) + }} while (false) #define MS_DBG(fmt, args...) do{ if (true) { \ LOGD(fmt "\n" , ##args); \ - }} while(false) + }} while (false) #define MS_DBG_INFO(fmt, args...) do{ if (true) { \ LOGI(fmt "\n" , ##args); \ - }} while(false) + }} while (false) #define MS_DBG_WARN(fmt, args...) do{ if (true) { \ LOGW(fmt "\n", ##args); \ - }} while(false) + }} while (false) #define MS_DBG_ERR(fmt, args...) do{ if (true) { \ LOGE(fmt "\n", ##args); \ - }} while(false) + }} while (false) #define MS_DBG_FENTER() do{ if (true) { \ LOGD(" \n"); \ - }} while(false) + }} while (false) #define MS_DBG_FLEAVE() do{ if (true) { \ LOGD(" \n"); \ - }} while(false) + }} while (false) #endif /*_MEDIA_COMMON_DBG_H_*/ diff --git a/src/common/include/media-common-types.h b/src/common/include/media-common-types.h index 9e7b3f7..17d9765 100755 --- a/src/common/include/media-common-types.h +++ b/src/common/include/media-common-types.h @@ -43,9 +43,9 @@ /*Use for Poweroff sequence*/ #define POWEROFF -1 /*This number uses for stopping Scannig thread*/ -#define MS_SAFE_FREE(src) { if(src) {free(src); src = NULL;} } +#define MS_SAFE_FREE(src) { if (src) {free(src); src = NULL;} } #define MS_MALLOC(src, size) { if (size > SIZE_MAX || size <= 0) {src = NULL;} \ - else { src = malloc(size); if(src) memset(src, 0x0, size);} } + else { src = malloc(size); if (src) memset(src, 0x0, size);} } #define MS_STRING_VALID(str) \ ((str != NULL && strlen(str) > 0) ? TRUE : FALSE) diff --git a/src/common/media-common-db-svc.c b/src/common/media-common-db-svc.c index b99df4a..1916687 100755 --- a/src/common/media-common-db-svc.c +++ b/src/common/media-common-db-svc.c @@ -27,7 +27,7 @@ #include "media-common-dbg.h" #include -#define CONFIG_PATH tzplatform_mkpath(TZ_SYS_DATA,"file-manager-service/plugin-config") +#define CONFIG_PATH tzplatform_mkpath(TZ_SYS_DATA, "file-manager-service/plugin-config") #define EXT ".so" #define EXT_LEN 3 #define MSC_REGISTER_COUNT 300 /*For bundle commit*/ @@ -124,7 +124,7 @@ static bool _ms_load_config() MS_DBG_ERR("fp is NULL"); return MS_MEDIA_ERR_FILE_OPEN_FAIL; } - while(1) { + while (1) { if (fgets(buf, 256, fp) == NULL) break; @@ -201,7 +201,7 @@ int ms_load_functions(void) /*load information of so*/ _ms_load_config(); - if(so_array->len == 0) { + if (so_array->len == 0) { MS_DBG_ERR("There is no information for functions"); return MS_MEDIA_ERR_DYNAMIC_LINK; } @@ -216,7 +216,7 @@ int ms_load_functions(void) return MS_MEDIA_ERR_OUT_OF_MEMORY; } - while(lib_index < lib_num) { + while (lib_index < lib_num) { /*get handle*/ MS_DBG_SLOG("[name of so : %s]", g_array_index(so_array, char*, lib_index)); func_handle[lib_index] = dlopen(g_array_index(so_array, char*, lib_index), RTLD_LAZY); @@ -238,12 +238,12 @@ int ms_load_functions(void) return MS_MEDIA_ERR_OUT_OF_MEMORY; } - for(lib_index = 0 ; lib_index < lib_num; lib_index ++) { + for (lib_index = 0 ; lib_index < lib_num; lib_index++) { MS_MALLOC(func_array[lib_index], sizeof(void*) * eFUNC_MAX); if (func_array[lib_index] == NULL) { int index; - for (index = 0; index < lib_index; index ++) { + for (index = 0; index < lib_index; index++) { MS_SAFE_FREE(func_array[index]); } MS_SAFE_FREE(func_array); @@ -261,7 +261,7 @@ int ms_load_functions(void) if (func_array[lib_index][func_index] == NULL) { int index; - for (index = 0; index < lib_index; index ++) { + for (index = 0; index < lib_index; index++) { MS_SAFE_FREE(func_array[index]); } MS_SAFE_FREE(func_array); @@ -280,7 +280,7 @@ void ms_unload_functions(void) { int lib_index; - for (lib_index = 0; lib_index < lib_num; lib_index ++) + for (lib_index = 0; lib_index < lib_num; lib_index++) dlclose(func_handle[lib_index]); for (lib_index = 0; lib_index < lib_num; lib_index++) { @@ -289,15 +289,15 @@ void ms_unload_functions(void) } } - MS_SAFE_FREE (func_array); - MS_SAFE_FREE (func_handle); + MS_SAFE_FREE(func_array); + MS_SAFE_FREE(func_handle); if (so_array) { /*delete all node*/ - while(so_array->len != 0) { + while (so_array->len != 0) { char *so_name = NULL; so_name = g_array_index(so_array , char*, 0); - g_array_remove_index (so_array, 0); + g_array_remove_index(so_array, 0); MS_SAFE_FREE(so_name); } g_array_free(so_array, FALSE); @@ -334,7 +334,7 @@ int ms_connect_db(void ***handle, uid_t uid) /*Lock mutex for openning db*/ g_mutex_lock(&db_mutex); - MS_MALLOC(*handle, sizeof (void*) * lib_num); + MS_MALLOC(*handle, sizeof(void*) * lib_num); if (*handle == NULL) { MS_DBG_ERR("malloc failed"); g_mutex_unlock(&db_mutex); @@ -751,12 +751,12 @@ int ms_get_folder_list(void **handle, const char* storage_id, char* start_path, *dir_array = g_array_new(FALSE, FALSE, sizeof(ms_dir_info_s*)); if (count != 0) { - for(i = 0; i < count; i ++) { + for (i = 0; i < count; i++) { dir_info = malloc(sizeof(ms_dir_info_s)); if (dir_info != NULL) { dir_info->dir_path = strdup(folder_list[i]); dir_info->modified_time = modified_time_list[i]; - dir_info->item_num= item_num_list[i]; + dir_info->item_num = item_num_list[i]; g_array_append_val(*dir_array, dir_info); } else { MS_DBG_ERR("malloc failed"); @@ -777,10 +777,10 @@ int ms_get_folder_list(void **handle, const char* storage_id, char* start_path, ERROR: if (*dir_array) { - while((*dir_array)->len != 0) { + while ((*dir_array)->len != 0) { ms_dir_info_s *data = NULL; data = g_array_index(*dir_array , ms_dir_info_s*, 0); - g_array_remove_index (*dir_array, 0); + g_array_remove_index(*dir_array, 0); MS_SAFE_FREE(data->dir_path); } g_array_free(*dir_array, FALSE); @@ -971,7 +971,7 @@ int ms_check_db_upgrade(void **handle, bool *need_full_scan, uid_t uid) return res; } - int ms_genarate_uuid(void **handle, char **uuid) +int ms_genarate_uuid(void **handle, char **uuid) { int lib_index = 0; int ret; diff --git a/src/common/media-common-external-storage.c b/src/common/media-common-external-storage.c index 39e7de7..5aca252 100755 --- a/src/common/media-common-external-storage.c +++ b/src/common/media-common-external-storage.c @@ -132,7 +132,7 @@ int ms_present_mmc_status(ms_sdcard_status_type_t status) else if (status == MS_SDCARD_REMOVED) ret = notification_status_message_post(_GETSYSTEMSTR("IDS_COM_BODY_SD_CARD_UNEXPECTEDLY_REMOVED")); - if(ret != NOTIFICATION_ERROR_NONE) + if (ret != NOTIFICATION_ERROR_NONE) return MS_MEDIA_ERR_INTERNAL; return MS_MEDIA_ERR_NONE; } @@ -140,11 +140,11 @@ int ms_present_mmc_status(ms_sdcard_status_type_t status) #define DEVICE_INFO_FILE ".device_info_" struct linux_dirent { - ino64_t d_ino; /* 64-bit inode number */ - off64_t d_off; /* 64-bit offset to next structure */ - unsigned short d_reclen; /* Size of this dirent */ - unsigned char d_type; /* File type */ - char d_name[]; /* Filename (null-terminated) */ + ino64_t d_ino; /* 64-bit inode number */ + off64_t d_off; /* 64-bit offset to next structure */ + unsigned short d_reclen; /* Size of this dirent */ + unsigned char d_type; /* File type */ + char d_name[]; /* Filename (null-terminated) */ }; #define BUF_SIZE 1024 @@ -253,7 +253,7 @@ int ms_write_device_info(const char *root_path, char *device_uuid) int len = 0; char path[MS_FILE_PATH_LEN_MAX] = {0,}; - len = snprintf(path, MS_FILE_PATH_LEN_MAX -1 , "%s/%s%s", root_path, DEVICE_INFO_FILE,device_uuid); + len = snprintf(path, MS_FILE_PATH_LEN_MAX -1, "%s/%s%s", root_path, DEVICE_INFO_FILE, device_uuid); if (len < 0) { return MS_MEDIA_ERR_INVALID_PARAMETER; } diff --git a/src/common/media-common-system.c b/src/common/media-common-system.c index 41d371f..6c03319 100755 --- a/src/common/media-common-system.c +++ b/src/common/media-common-system.c @@ -63,7 +63,7 @@ static GDBusConnection *g_usb_bus; static int g_usb_handler; -typedef struct block_cb_data{ +typedef struct block_cb_data { block_changed_cb usr_cb; void *usr_data; } block_cb_data; @@ -98,18 +98,18 @@ static void __ms_block_changed(GDBusConnection* connection, MS_DBG_ERR("block_type : %d", block_info->block_type); tmp = g_variant_get_child_value(parameters, 1); - devnode = g_variant_get_string (tmp, &size); + devnode = g_variant_get_string(tmp, &size); MS_DBG_ERR("devnode : %s", devnode); tmp = g_variant_get_child_value(parameters, 8); - mount_path = g_variant_get_string (tmp, &size); + mount_path = g_variant_get_string(tmp, &size); if (mount_path != NULL) { block_info->mount_path = strdup(mount_path); MS_DBG_ERR("mount_point : %s", block_info->mount_path); } tmp = g_variant_get_child_value(parameters, 9); - block_info->state = g_variant_get_int32 (tmp); + block_info->state = g_variant_get_int32(tmp); MS_DBG_ERR("state : %d", block_info->state); ((block_changed_cb)usr_cb)(block_info, usr_data); @@ -138,8 +138,8 @@ static int __ms_sys_subscribe_device_block_event(block_changed_cb usr_callback, if (g_usb_bus == NULL) { g_usb_bus = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &error); if (!g_usb_bus) { - MS_DBG_ERR ("Failed to connect to the g D-BUS daemon: %s", error->message); - g_error_free (error); + MS_DBG_ERR("Failed to connect to the g D-BUS daemon: %s", error->message); + g_error_free(error); ret = MS_MEDIA_ERR_INTERNAL; goto ERROR; } @@ -203,9 +203,8 @@ int ms_sys_unset_device_block_event_cb(void) return MS_MEDIA_ERR_NONE; } -#define DBUS_REPLY_TIMEOUT (-1) -static int __ms_dbus_method_sync(const char *dest, const char *path, - const char *interface, const char *method, const char *param, GArray **dev_list) +#define DBUS_REPLY_TIMEOUT (-1) +static int __ms_dbus_method_sync(const char *dest, const char *path, const char *interface, const char *method, const char *param, GArray **dev_list) { DBusConnection *conn; DBusMessage *msg; @@ -289,7 +288,7 @@ static int __ms_dbus_method_sync(const char *dest, const char *path, dbus_message_iter_next(&piter); dbus_message_iter_get_basic(&piter, &val_int); - MS_DBG("\treadonly(%d)", val_int); + MS_DBG("\treadonly(%d)", val_int); dbus_message_iter_next(&piter); dbus_message_iter_get_basic(&piter, &val_str); @@ -345,15 +344,15 @@ int ms_sys_get_device_list(ms_stg_type_e stg_type, GArray **dev_list) int ms_sys_release_device_list(GArray **dev_list) { if (*dev_list) { - while((*dev_list)->len != 0) { + while ((*dev_list)->len != 0) { ms_block_info_s *data = NULL; data = g_array_index(*dev_list , ms_block_info_s*, 0); - g_array_remove_index (*dev_list, 0); - MS_DBG("MOUNT PATH [%s] RELEASED",data->mount_path); + g_array_remove_index(*dev_list, 0); + MS_DBG("MOUNT PATH [%s] RELEASED", data->mount_path); MS_SAFE_FREE(data->mount_path); MS_SAFE_FREE(data); } - g_array_free (*dev_list, FALSE); + g_array_free(*dev_list, FALSE); *dev_list = NULL; } @@ -440,7 +439,7 @@ int ms_sys_get_uid(uid_t *uid) { int ret; - ret = __ms_dbus_get_uid(UID_DBUS_NAME,UID_DBUS_PATH, UID_DBUS_INTERFACE, UID_DBUS_METHOD, uid); + ret = __ms_dbus_get_uid(UID_DBUS_NAME, UID_DBUS_PATH, UID_DBUS_INTERFACE, UID_DBUS_METHOD, uid); if (ret < 0) { MS_DBG("Failed to send dbus (%d)", ret); } else { @@ -459,7 +458,7 @@ int ms_sys_get_uid(uid_t *uid) #define POWER_DBUS_INTERFACE "org.tizen.system.deviced.PowerOff" #define POWER_DBUS_MATCH_RULE "type='signal',interface='org.tizen.system.deviced.PowerOff'" -typedef struct pwoff_cb_data{ +typedef struct pwoff_cb_data { power_off_cb usr_cb; void *usr_data; } pwoff_cb_data; @@ -468,7 +467,7 @@ DBusConnection *g_pwr_dbus; pwoff_cb_data *g_pwr_cb_data = NULL; -static DBusHandlerResult __poweroff_msg_filter (DBusConnection *connection, DBusMessage *message, void *user_data) +static DBusHandlerResult __poweroff_msg_filter(DBusConnection *connection, DBusMessage *message, void *user_data) { pwoff_cb_data *cb_data = (pwoff_cb_data *)user_data; void *usr_cb = cb_data->usr_cb; @@ -477,7 +476,7 @@ static DBusHandlerResult __poweroff_msg_filter (DBusConnection *connection, DBus MS_DBG_FENTER(); /* A Ping signal on the com.burtonini.dbus.Signal interface */ - if (dbus_message_is_signal (message, POWER_DBUS_INTERFACE, POWER_DBUS_NAME)) { + if (dbus_message_is_signal(message, POWER_DBUS_INTERFACE, POWER_DBUS_NAME)) { int current_type = DBUS_TYPE_INVALID; DBusError error; DBusMessageIter read_iter; @@ -485,13 +484,13 @@ static DBusHandlerResult __poweroff_msg_filter (DBusConnection *connection, DBus power_off_cb cb_func = (power_off_cb)usr_cb; ms_power_info_s *power_info = NULL; - dbus_error_init (&error); + dbus_error_init(&error); /* get data from dbus message */ - dbus_message_iter_init (message, &read_iter); - while ((current_type = dbus_message_iter_get_arg_type (&read_iter)) != DBUS_TYPE_INVALID){ - dbus_message_iter_get_basic (&read_iter, &value); - switch(current_type) { + dbus_message_iter_init(message, &read_iter); + while ((current_type = dbus_message_iter_get_arg_type(&read_iter)) != DBUS_TYPE_INVALID) { + dbus_message_iter_get_basic(&read_iter, &value); + switch (current_type) { case DBUS_TYPE_INT32: MS_DBG_WARN("value[%d]", value.i32); break; @@ -505,7 +504,7 @@ static DBusHandlerResult __poweroff_msg_filter (DBusConnection *connection, DBus break; } - dbus_message_iter_next (&read_iter); + dbus_message_iter_next(&read_iter); } if (value.i32 == 2 || value.i32 == 3) @@ -522,19 +521,19 @@ int ms_sys_set_poweroff_cb(power_off_cb user_callback, void *user_data) DBusError error; /*add noti receiver for power off*/ - dbus_error_init (&error); + dbus_error_init(&error); - g_pwr_dbus = dbus_bus_get (DBUS_BUS_SYSTEM, &error); + g_pwr_dbus = dbus_bus_get(DBUS_BUS_SYSTEM, &error); if (!g_pwr_dbus) { - MS_DBG_ERR ("Failed to connect to the D-BUS daemon: %s", error.message); + MS_DBG_ERR("Failed to connect to the D-BUS daemon: %s", error.message); return MS_MEDIA_ERR_INTERNAL; } - dbus_connection_setup_with_g_main (g_pwr_dbus, NULL); + dbus_connection_setup_with_g_main(g_pwr_dbus, NULL); g_pwr_cb_data = malloc(sizeof(pwoff_cb_data)); if (g_pwr_cb_data == NULL) { - MS_DBG_ERR ("malloc failed"); + MS_DBG_ERR("malloc failed"); return MS_MEDIA_ERR_OUT_OF_MEMORY; } @@ -542,9 +541,9 @@ int ms_sys_set_poweroff_cb(power_off_cb user_callback, void *user_data) g_pwr_cb_data->usr_data = user_data; /* listening to messages from all objects as no path is specified */ - dbus_bus_add_match (g_pwr_dbus, POWER_DBUS_MATCH_RULE, &error); - if( !dbus_connection_add_filter (g_pwr_dbus, __poweroff_msg_filter, g_pwr_cb_data, NULL)) { - dbus_bus_remove_match (g_pwr_dbus, POWER_DBUS_MATCH_RULE, NULL); + dbus_bus_add_match(g_pwr_dbus, POWER_DBUS_MATCH_RULE, &error); + if (!dbus_connection_add_filter(g_pwr_dbus, __poweroff_msg_filter, g_pwr_cb_data, NULL)) { + dbus_bus_remove_match(g_pwr_dbus, POWER_DBUS_MATCH_RULE, NULL); MS_DBG_ERR("dbus_connection_add_filter failed"); return MS_MEDIA_ERR_INTERNAL; } @@ -559,12 +558,12 @@ int ms_sys_unset_poweroff_cb(void) } dbus_connection_remove_filter(g_pwr_dbus, __poweroff_msg_filter, g_pwr_cb_data); - dbus_bus_remove_match (g_pwr_dbus, MS_MEDIA_DBUS_MATCH_RULE, NULL); + dbus_bus_remove_match(g_pwr_dbus, MS_MEDIA_DBUS_MATCH_RULE, NULL); dbus_connection_unref(g_pwr_dbus); g_pwr_dbus = NULL; MS_SAFE_FREE(g_pwr_cb_data); - return MS_MEDIA_ERR_NONE; + return MS_MEDIA_ERR_NONE; } diff --git a/src/common/media-common-utils.c b/src/common/media-common-utils.c index 62b7cb7..227c91c 100755 --- a/src/common/media-common-utils.c +++ b/src/common/media-common-utils.c @@ -161,7 +161,7 @@ int ms_strappend(char *res, const int size, const char *pattern, int len = 0; int real_size = size - 1; - if (!res ||!pattern || !str1 ||!str2 ) + if (!res || !pattern || !str1 || !str2) return MS_MEDIA_ERR_INVALID_PARAMETER; if (real_size < (int)(strlen(str1) + strlen(str2))) diff --git a/src/mediadb-update.c b/src/mediadb-update.c old mode 100644 new mode 100755 index b6594cf..73df1ec --- a/src/mediadb-update.c +++ b/src/mediadb-update.c @@ -59,8 +59,8 @@ void print_help() printf("\n"); printf("db-update --help for check this messages.\n"); printf("\n"); - printf("A file or directory must exists under %s or %s.\n",tzplatform_getenv(TZ_USER_HOME),tzplatform_mkpath(TZ_SYS_STORAGE,"sdcard")); - printf("Using %s is allowed SD card is mounted.\n",tzplatform_mkpath(TZ_SYS_STORAGE,"sdcard")); + printf("A file or directory must exists under %s or %s.\n", tzplatform_getenv(TZ_USER_HOME), tzplatform_mkpath(TZ_SYS_STORAGE, "sdcard")); + printf("Using %s is allowed SD card is mounted.\n", tzplatform_mkpath(TZ_SYS_STORAGE, "sdcard")); printf("\n"); printf("=======================================================================================\n"); } @@ -71,34 +71,33 @@ static void __check_media_db(void) void *db_handle = NULL; char *err_msg = NULL; int ret = 0; - bool fscan= false; + bool fscan = false; - funcHandle = dlopen ("/usr/lib/libmedia-content-plugin.so", RTLD_LAZY); - if(funcHandle == NULL) - { + funcHandle = dlopen("/usr/lib/libmedia-content-plugin.so", RTLD_LAZY); + if (funcHandle == NULL) { printf("Error when open plug-in\n"); return; } - svc_connect = dlsym (funcHandle, "connect_db"); - svc_disconnect = dlsym (funcHandle, "disconnect_db"); - svc_check_db = dlsym (funcHandle, "check_db"); + svc_connect = dlsym(funcHandle, "connect_db"); + svc_disconnect = dlsym(funcHandle, "disconnect_db"); + svc_check_db = dlsym(funcHandle, "check_db"); - ret = svc_connect(&db_handle,tzplatform_getuid(TZ_USER_NAME), &err_msg); - if(ret < 0) + ret = svc_connect(&db_handle, tzplatform_getuid(TZ_USER_NAME), &err_msg); + if (ret < 0) printf("Error svc_connect\n"); ret = svc_check_db(db_handle, &fscan, tzplatform_getuid(TZ_USER_NAME), &err_msg); - if(ret < 0) + if (ret < 0) printf("Error svc_check_db\n"); ret = svc_disconnect(db_handle, &err_msg); - if(ret < 0) + if (ret < 0) printf("Error svc_disconnect\n"); printf("Check media db done\n"); - dlclose (funcHandle); + dlclose(funcHandle); } static void __get_storage_id(const char *path, char *storage_id, uid_t uid) @@ -108,32 +107,31 @@ static void __get_storage_id(const char *path, char *storage_id, uid_t uid) char *err_msg = NULL; int ret = 0; - funcHandle = dlopen ("/usr/lib/libmedia-content-plugin.so", RTLD_LAZY); - if(funcHandle == NULL) - { + funcHandle = dlopen("/usr/lib/libmedia-content-plugin.so", RTLD_LAZY); + if (funcHandle == NULL) { printf("Error when open plug-in\n"); return; } - svc_connect = dlsym (funcHandle, "connect_db"); - svc_disconnect = dlsym (funcHandle, "disconnect_db"); - svc_get_storage_id = dlsym (funcHandle, "get_storage_id"); + svc_connect = dlsym(funcHandle, "connect_db"); + svc_disconnect = dlsym(funcHandle, "disconnect_db"); + svc_get_storage_id = dlsym(funcHandle, "get_storage_id"); ret = svc_connect(&db_handle, uid, &err_msg); - if(ret < 0) + if (ret < 0) printf("Error svc_connect\n"); ret = svc_get_storage_id(db_handle, path, storage_id, uid, &err_msg); - if(ret < 0) + if (ret < 0) printf("Error svc_get_storage_id\n"); ret = svc_disconnect(db_handle, &err_msg); - if(ret < 0) + if (ret < 0) printf("Error svc_disconnect\n"); printf("Start Scanning for [%s][%s]\n", path, storage_id); - dlclose (funcHandle); + dlclose(funcHandle); } int dir_scan_non_recursive(const char *path) @@ -158,7 +156,7 @@ typedef enum { DIRECTORY_OK, FILE_OK, NOT_OK, -}check_result; +} check_result; check_result check_path(char *path) { @@ -197,7 +195,7 @@ int main(int argc, char **argv) char *argv1 = NULL; char *argv2 = NULL; - if (argc > 3 ||argc < 2) { + if (argc > 3 || argc < 2) { print_help(); exit(1); } diff --git a/src/scanner-v2/media-scanner-device-block-v2.c b/src/scanner-v2/media-scanner-device-block-v2.c index 9564130..e446fd8 100755 --- a/src/scanner-v2/media-scanner-device-block-v2.c +++ b/src/scanner-v2/media-scanner-device-block-v2.c @@ -42,7 +42,7 @@ static void __msc_usb_remove_event(const char *mount_path) int remain_request = 0; bool status = FALSE; - if(!ms_config_get_int(VCONFKEY_FILEMANAGER_DB_STATUS, &update_status)) { + if (!ms_config_get_int(VCONFKEY_FILEMANAGER_DB_STATUS, &update_status)) { MS_DBG_ERR("ms_config_get_int[VCONFKEY_FILEMANAGER_DB_STATUS]"); } diff --git a/src/scanner-v2/media-scanner-extract-v2.c b/src/scanner-v2/media-scanner-extract-v2.c index de8ca15..6bd20e0 100755 --- a/src/scanner-v2/media-scanner-extract-v2.c +++ b/src/scanner-v2/media-scanner-extract-v2.c @@ -166,7 +166,7 @@ gboolean msc_folder_extract_thread(void *data) /*call for bundle commit*/ //__msc_bacth_commit_disable(handle, TRUE, TRUE, extract_data->storage_id, ret); -NEXT: +NEXT : msc_get_power_status(&power_off_status); if (power_off_status) { MS_DBG_ERR("power off"); @@ -360,8 +360,7 @@ NEXT: /*Active flush */ malloc_trim(0); - if(extract_data->result) - { + if (extract_data->result) { msc_send_result(ret, extract_data); } @@ -391,13 +390,13 @@ void msc_insert_exactor_request(int message_type, bool ins_status, const char *s extract_data->uid = uid; extract_data->result = ins_status; extract_data->msg_size = strlen(path); - strncpy(extract_data->msg, path, extract_data->msg_size ); + strncpy(extract_data->msg, path, extract_data->msg_size); strncpy(extract_data->storage_id, storage_id, MS_UUID_SIZE-1); if (message_type == MS_MSG_STORAGE_ALL || message_type == MS_MSG_STORAGE_PARTIAL || message_type == MS_MSG_STORAGE_INVALID) { g_async_queue_push(storage_extract_queue, GINT_TO_POINTER(extract_data)); MS_DBG("insert to storage exactor queue. msg_type [%d]", ins_status); - } else if(message_type == MS_MSG_DIRECTORY_SCANNING || message_type == MS_MSG_DIRECTORY_SCANNING_NON_RECURSIVE) { + } else if (message_type == MS_MSG_DIRECTORY_SCANNING || message_type == MS_MSG_DIRECTORY_SCANNING_NON_RECURSIVE) { g_async_queue_push(folder_extract_queue, GINT_TO_POINTER(extract_data)); MS_DBG("insert to dir exactor queue. msg_type [%d]", ins_status); } else { @@ -410,7 +409,7 @@ void msc_insert_exactor_request(int message_type, bool ins_status, const char *s int msc_remove_extract_request(const ms_comm_msg_s *recv_msg) { - if(recv_msg == NULL) { + if (recv_msg == NULL) { MS_DBG_ERR("recv_msg is null"); return MS_MEDIA_ERR_INVALID_PARAMETER; } @@ -429,7 +428,7 @@ int msc_remove_extract_request(const ms_comm_msg_s *recv_msg) temp_queue = g_async_queue_new(); int i = 0; - for (; i storage_id, storageid) == 0)) { @@ -438,7 +437,7 @@ int msc_remove_extract_request(const ms_comm_msg_s *recv_msg) g_async_queue_push(temp_queue, GINT_TO_POINTER(msg)); } } - g_async_queue_unref (storage_extract_queue); + g_async_queue_unref(storage_extract_queue); storage_extract_queue = temp_queue; END_REMOVE_REQUEST: @@ -596,23 +595,23 @@ static int __msc_get_storage_extract_status(ms_storage_scan_status_e *status) static int __msc_resume_extract() { - g_mutex_lock (&extract_data_mutex); + g_mutex_lock(&extract_data_mutex); - g_cond_signal (&extract_data_cond); + g_cond_signal(&extract_data_cond); - g_mutex_unlock (&extract_data_mutex); + g_mutex_unlock(&extract_data_mutex); return MS_MEDIA_ERR_NONE; } static int __msc_pause_extract() { - g_mutex_lock (&extract_data_mutex); + g_mutex_lock(&extract_data_mutex); while (g_directory_extract_processing) - g_cond_wait (&extract_data_cond, &extract_data_mutex); + g_cond_wait(&extract_data_cond, &extract_data_mutex); - g_mutex_unlock (&extract_data_mutex); + g_mutex_unlock(&extract_data_mutex); return MS_MEDIA_ERR_NONE; } @@ -635,7 +634,7 @@ static int __msc_extract_set_db_status(ms_db_status_type_t status, ms_storage_ty } } } else if (status == MS_DB_UPDATED) { - if(!ms_config_set_int(VCONFKEY_FILEMANAGER_DB_STATUS, VCONFKEY_FILEMANAGER_DB_UPDATED)) { + if (!ms_config_set_int(VCONFKEY_FILEMANAGER_DB_STATUS, VCONFKEY_FILEMANAGER_DB_UPDATED)) { res = MS_MEDIA_ERR_VCONF_SET_FAIL; MS_DBG_ERR("ms_config_set_int failed"); } @@ -647,7 +646,7 @@ static int __msc_extract_set_db_status(ms_db_status_type_t status, ms_storage_ty } } } else { - if(!ms_config_set_int(VCONFKEY_FILEMANAGER_DB_STATUS, VCONFKEY_FILEMANAGER_DB_UPDATED)) { + if (!ms_config_set_int(VCONFKEY_FILEMANAGER_DB_STATUS, VCONFKEY_FILEMANAGER_DB_UPDATED)) { res = MS_MEDIA_ERR_VCONF_SET_FAIL; MS_DBG_ERR("ms_config_set_int failed"); } @@ -697,7 +696,7 @@ int msc_push_extract_request(ms_extract_type_e scan_type, ms_comm_msg_s *recv_ms { int ret = MS_MEDIA_ERR_NONE; - switch(scan_type) { + switch (scan_type) { case MS_EXTRACT_STORAGE: g_async_queue_push(storage_extract_queue, GINT_TO_POINTER(recv_msg)); break; @@ -738,7 +737,7 @@ int msc_get_remain_extract_request(ms_extract_type_e scan_type, int *remain_requ { int ret = MS_MEDIA_ERR_NONE; - switch(scan_type) { + switch (scan_type) { case MS_EXTRACT_STORAGE: *remain_request = g_async_queue_length(storage_extract_queue); break; diff --git a/src/scanner-v2/media-scanner-scan-v2.c b/src/scanner-v2/media-scanner-scan-v2.c index 82f986f..e58e6f5 100755 --- a/src/scanner-v2/media-scanner-scan-v2.c +++ b/src/scanner-v2/media-scanner-scan-v2.c @@ -93,7 +93,7 @@ static char* __msc_get_path(uid_t uid) if (uid == getuid()) { result_psswd = strndup(MEDIA_ROOT_PATH_INTERNAL, strlen(MEDIA_ROOT_PATH_INTERNAL)); grpinfo = getgrnam("users"); - if(grpinfo == NULL) { + if (grpinfo == NULL) { MS_DBG_ERR("getgrnam(users) returns NULL !"); return NULL; } @@ -164,7 +164,7 @@ static int __msc_set_db_status(ms_db_status_type_t status, ms_storage_type_t sto } } } else if (status == MS_DB_UPDATED) { - if(!ms_config_set_int(VCONFKEY_FILEMANAGER_DB_STATUS, VCONFKEY_FILEMANAGER_DB_UPDATED)) { + if (!ms_config_set_int(VCONFKEY_FILEMANAGER_DB_STATUS, VCONFKEY_FILEMANAGER_DB_UPDATED)) { res = MS_MEDIA_ERR_VCONF_SET_FAIL; MS_DBG_ERR("ms_config_set_int failed"); } @@ -176,7 +176,7 @@ static int __msc_set_db_status(ms_db_status_type_t status, ms_storage_type_t sto } } } else { - if(!ms_config_set_int(VCONFKEY_FILEMANAGER_DB_STATUS, VCONFKEY_FILEMANAGER_DB_UPDATED)) { + if (!ms_config_set_int(VCONFKEY_FILEMANAGER_DB_STATUS, VCONFKEY_FILEMANAGER_DB_UPDATED)) { res = MS_MEDIA_ERR_VCONF_SET_FAIL; MS_DBG_ERR("ms_config_set_int failed"); } @@ -206,8 +206,7 @@ static int __msc_check_scan_ignore(char * path) char *check_ignore_file = NULL; int ret = MS_MEDIA_ERR_NONE; - if(strstr(path, "/.")) - { + if (strstr(path, "/.")) { MS_DBG_ERR("hidden path"); ret = MS_MEDIA_ERR_INVALID_PATH; goto ERROR; @@ -221,7 +220,7 @@ static int __msc_check_scan_ignore(char * path) if (strstr(path, MEDIA_ROOT_PATH_USB) != NULL) { if (errno == ENOENT) { /*if the directory does not exist, check the device is unmounted*/ - if(!__msc_storage_mount_status(path)) { + if (!__msc_storage_mount_status(path)) { MS_DBG_ERR("Device is unmounted[%s]", path); ret = MS_MEDIA_ERR_USB_UNMOUNTED; goto ERROR; @@ -230,7 +229,7 @@ static int __msc_check_scan_ignore(char * path) } struct stat folder_st; - if(stat(path, &folder_st) == 0) { + if (stat(path, &folder_st) == 0) { MS_DBG_ERR("DEV[%ld] INODE[%lld] UID[%ld] GID[%ld] MODE[%lo] PATH[%s]", (long)folder_st.st_dev, (long long)folder_st.st_ino, (long)folder_st.st_uid, (long)folder_st.st_gid, (unsigned long) folder_st.st_mode, path); } else { @@ -244,12 +243,12 @@ static int __msc_check_scan_ignore(char * path) path_len = strlen(path) + strlen(ignore_path) + 1; check_ignore_file = malloc(path_len); - if(check_ignore_file != NULL) { + if (check_ignore_file != NULL) { memset(check_ignore_file, 0x0, path_len); snprintf(check_ignore_file, path_len, "%s%s", path, ignore_path); exist = open(check_ignore_file, O_RDONLY); - if(exist >= 0) { + if (exist >= 0) { MS_DBG_ERR("scan_ignore exists [%s]", check_ignore_file); ret = MS_MEDIA_ERR_INVALID_PATH; } @@ -263,7 +262,7 @@ static int __msc_check_scan_ignore(char * path) ERROR: - if(fd != -1) { + if (fd != -1) { close(fd); fd = -1; } @@ -299,22 +298,22 @@ int msc_deinit_scan_thread() static int __msc_resume_scan() { - g_mutex_lock (&data_mutex2); + g_mutex_lock(&data_mutex2); - g_cond_signal (&data_cond2); + g_cond_signal(&data_cond2); - g_mutex_unlock (&data_mutex2); + g_mutex_unlock(&data_mutex2); return MS_MEDIA_ERR_NONE; } static int __msc_pause_scan() { - g_mutex_lock (&data_mutex2); + g_mutex_lock(&data_mutex2); while (g_directory_scan_processing2) - g_cond_wait (&data_cond2, &data_mutex2); + g_cond_wait(&data_cond2, &data_mutex2); - g_mutex_unlock (&data_mutex2); + g_mutex_unlock(&data_mutex2); return MS_MEDIA_ERR_NONE; } @@ -332,7 +331,7 @@ static int __msc_check_stop_status(int scan_type, ms_storage_type_t storage_type ret = MS_MEDIA_ERR_SCANNER_FORCE_STOP; } - if (scan_type == MS_MSG_DIRECTORY_SCANNING ||scan_type == MS_MSG_DIRECTORY_SCANNING_NON_RECURSIVE) { + if (scan_type == MS_MSG_DIRECTORY_SCANNING || scan_type == MS_MSG_DIRECTORY_SCANNING_NON_RECURSIVE) { g_mutex_lock(&scan_req_mutex2); /* check cancel path */ if (g_cancel_path2 != NULL) { @@ -369,7 +368,7 @@ static int __msc_check_stop_status(int scan_type, ms_storage_type_t storage_type g_mutex_lock(&blocked_mutex2); /* check cancel path */ - if (g_blocked_path2!= NULL) { + if (g_blocked_path2 != NULL) { MS_DBG_ERR("check blocked storage [%s][%s]", g_blocked_path2, start_path); if (strncmp(start_path, g_blocked_path2, strlen(start_path)) == 0) { MS_DBG_ERR("Receive blocked message[%s][%s]. STOP scan!!", @@ -397,11 +396,11 @@ static void __msc_check_dir_path(char *dir_path) } struct linux_dirent { - ino64_t d_ino; /* 64-bit inode number */ - off64_t d_off; /* 64-bit offset to next structure */ - unsigned short d_reclen; /* Size of this dirent */ - unsigned char d_type; /* File type */ - char d_name[]; /* Filename (null-terminated) */ + ino64_t d_ino; /* 64-bit inode number */ + off64_t d_off; /* 64-bit offset to next structure */ + unsigned short d_reclen; /* Size of this dirent */ + unsigned char d_type; /* File type */ + char d_name[]; /* Filename (null-terminated) */ }; #define BUF_SIZE 1024 @@ -429,7 +428,7 @@ static int __msc_dir_scan(void **handle, const char *storage_id, const char*star MS_DBG_ERR("storage id [%s] start path [%s]", storage_id, start_path); /* make new array for storing directory */ - dir_array = g_array_new (FALSE, FALSE, sizeof (char*)); + dir_array = g_array_new(FALSE, FALSE, sizeof(char*)); if (dir_array == NULL) { MS_DBG_ERR("g_array_new failed"); @@ -437,15 +436,15 @@ static int __msc_dir_scan(void **handle, const char *storage_id, const char*star } /* add first direcotiry to directory array */ new_start_path = strdup(start_path); - if (new_start_path == NULL){ + if (new_start_path == NULL) { MS_DBG_ERR("strdup failed"); g_array_free(dir_array, FALSE); return MS_MEDIA_ERR_OUT_OF_MEMORY; } MS_DBG_ERR("new start path [%s]", new_start_path); - g_array_append_val (dir_array, start_path); - if(ms_insert_folder(handle, storage_id, new_start_path, uid) != MS_MEDIA_ERR_NONE) { + g_array_append_val(dir_array, start_path); + if (ms_insert_folder(handle, storage_id, new_start_path, uid) != MS_MEDIA_ERR_NONE) { MS_DBG_ERR("insert folder failed"); } @@ -454,7 +453,7 @@ static int __msc_dir_scan(void **handle, const char *storage_id, const char*star /* folder validity set 0 under the start_path in folder table*/ if (scan_type == MS_MSG_DIRECTORY_SCANNING_NON_RECURSIVE || scan_type == MS_MSG_DIRECTORY_SCANNING) { - if(ms_set_folder_validity(handle, storage_id, new_start_path, MS_INVALID, is_recursive, uid) != MS_MEDIA_ERR_NONE) { + if (ms_set_folder_validity(handle, storage_id, new_start_path, MS_INVALID, is_recursive, uid) != MS_MEDIA_ERR_NONE) { MS_DBG_ERR("set_folder_validity failed [%d] ", scan_type); } } @@ -468,7 +467,7 @@ static int __msc_dir_scan(void **handle, const char *storage_id, const char*star } /* get the current path from directory array */ current_path = g_array_index(dir_array , char*, 0); - g_array_remove_index (dir_array, 0); + g_array_remove_index(dir_array, 0); ret = __msc_check_scan_ignore(current_path); if (ret != MS_MEDIA_ERR_NONE) { @@ -529,7 +528,7 @@ static int __msc_dir_scan(void **handle, const char *storage_id, const char*star } if (ms_strappend(path, sizeof(path), "%s/%s", current_path, d->d_name) != MS_MEDIA_ERR_NONE) { - MS_DBG_ERR("ms_strappend failed"); + MS_DBG_ERR("ms_strappend failed"); bpos += d->d_reclen; continue; } @@ -537,15 +536,14 @@ static int __msc_dir_scan(void **handle, const char *storage_id, const char*star if (d->d_type == DT_REG) { MS_DBG_ERR("INSERT DT_REG"); /* insert into media DB */ - if (scan_function(handle,storage_id, path, uid) != MS_MEDIA_ERR_NONE) { + if (scan_function(handle, storage_id, path, uid) != MS_MEDIA_ERR_NONE) { MS_DBG_ERR("failed to update db : %d\n", scan_type); bpos += d->d_reclen; continue; - } - else { + } else { ++scan_count; //MSC_DBG_ERR("insert count %d", nScanCount); - if(scan_count/MAX_SCAN_COUNT>0) { + if (scan_count/MAX_SCAN_COUNT > 0) { scan_count = 0; MS_DBG_ERR("storage_id = [%s]", storage_id); msc_insert_exactor_request(scan_type, FALSE, storage_id, current_path, 0, uid); @@ -557,15 +555,15 @@ static int __msc_dir_scan(void **handle, const char *storage_id, const char*star /* this request is recursive scanning */ /* add new directory to dir_array */ new_path = strdup(path); - g_array_append_val (dir_array, new_path); + g_array_append_val(dir_array, new_path); - if(ms_insert_folder(handle, storage_id, new_path, uid) != MS_MEDIA_ERR_NONE) { + if (ms_insert_folder(handle, storage_id, new_path, uid) != MS_MEDIA_ERR_NONE) { MS_DBG_ERR("insert folder failed"); } } else { /* this request is non-recursive scanning */ /* don't add new directory to dir_array */ - if(ms_insert_folder(handle, storage_id, path, uid) != MS_MEDIA_ERR_NONE) { + if (ms_insert_folder(handle, storage_id, path, uid) != MS_MEDIA_ERR_NONE) { MS_DBG_ERR("insert folder failed"); bpos += d->d_reclen; continue; @@ -581,7 +579,7 @@ static int __msc_dir_scan(void **handle, const char *storage_id, const char*star // msc_insert_exactor_request(scan_type, FALSE, storage_id, current_path, 0); // scan_count = 0; - if(fd != -1) { + if (fd != -1) { close(fd); fd = -1; } @@ -592,7 +590,7 @@ static int __msc_dir_scan(void **handle, const char *storage_id, const char*star /*remove invalid folder in folder table.*/ if (scan_type == MS_MSG_STORAGE_ALL || scan_type == MS_MSG_STORAGE_PARTIAL) { if (__msc_storage_mount_status(new_start_path)) { - if(ms_delete_invalid_folder(handle, storage_id, uid) != MS_MEDIA_ERR_NONE) { + if (ms_delete_invalid_folder(handle, storage_id, uid) != MS_MEDIA_ERR_NONE) { MS_DBG_ERR("delete invalid folder failed"); ret = MS_MEDIA_ERR_DB_DELETE_FAIL; } @@ -601,7 +599,7 @@ static int __msc_dir_scan(void **handle, const char *storage_id, const char*star } } STOP_SCAN: - if(fd != -1) { + if (fd != -1) { close(fd); fd = -1; } @@ -635,7 +633,7 @@ static int __msc_db_update(void **handle, const char *storage_id, const ms_comm_ if (err != MS_MEDIA_ERR_NONE) { MS_DBG_ERR("error : %d", err); } - } else if ( scan_type == MS_MSG_STORAGE_INVALID) { + } else if (scan_type == MS_MSG_STORAGE_INVALID) { MS_DBG_ERR("INVALID"); /*In this case, update just validation record*/ /*update just valid type*/ @@ -645,7 +643,7 @@ static int __msc_db_update(void **handle, const char *storage_id, const ms_comm_ } /* folder validity set 0 under the start_path in folder table*/ - if(ms_set_folder_validity(handle, storage_id, scan_data->msg, MS_INVALID, TRUE, scan_data->uid) != MS_MEDIA_ERR_NONE) { + if (ms_set_folder_validity(handle, storage_id, scan_data->msg, MS_INVALID, TRUE, scan_data->uid) != MS_MEDIA_ERR_NONE) { MS_DBG_ERR("set_folder_validity failed"); } msc_remove_extract_request(scan_data); @@ -758,7 +756,7 @@ gboolean msc_directory_scan_thread(void *data) ms_delete_invalid_items_in_folder(handle, storage_id, scan_data->msg, is_recursive, scan_data->uid); - if ( !(count == 0 && insert_count == 0)) { + if (!(count == 0 && insert_count == 0)) { ms_send_dir_update_noti(handle, storage_id, noti_path, NULL, MS_ITEM_UPDATE, scan_data->pid); } MS_SAFE_FREE(noti_path); @@ -816,18 +814,18 @@ static int _check_folder_from_list(char *folder_path, GArray *dir_array) time_t mtime; bool find_flag = false; - if(stat(folder_path, &buf) == 0) { + if (stat(folder_path, &buf) == 0) { mtime = buf.st_mtime; } else { return MS_MEDIA_ERR_INTERNAL; } for (i = 0; i < array_len; i++) { - dir_info = g_array_index (dir_array, ms_dir_info_s*, i); + dir_info = g_array_index(dir_array, ms_dir_info_s*, i); if (strcmp(folder_path, dir_info->dir_path) == 0) { /* if modified time is same, the folder does not need updating */ if (mtime == dir_info->modified_time) { - g_array_remove_index (dir_array, i); + g_array_remove_index(dir_array, i); MS_SAFE_FREE(dir_info->dir_path); MS_SAFE_FREE(dir_info); } @@ -874,19 +872,19 @@ static int __msc_compare_with_db(void **handle, const char *storage_id, const ch } /* make new array for storing directory */ - read_dir_array = g_array_new (FALSE, FALSE, sizeof (char*)); - if (read_dir_array == NULL){ + read_dir_array = g_array_new(FALSE, FALSE, sizeof(char*)); + if (read_dir_array == NULL) { MS_DBG_ERR("g_array_new failed"); return MS_MEDIA_ERR_OUT_OF_MEMORY; } /* add first direcotiry to directory array */ - g_array_append_val (read_dir_array, start_path); + g_array_append_val(read_dir_array, start_path); /*start db update. the number of element in the array , db update is complete.*/ while (read_dir_array->len != 0) { /* get the current path from directory array */ current_path = g_array_index(read_dir_array , char*, 0); - g_array_remove_index (read_dir_array, 0); + g_array_remove_index(read_dir_array, 0); // MSC_DBG_ERR("%s", current_path); if (__msc_check_scan_ignore(current_path) != MS_MEDIA_ERR_NONE) { @@ -910,12 +908,12 @@ static int __msc_compare_with_db(void **handle, const char *storage_id, const ch if (entry.d_type & DT_DIR) { if (ms_strappend(path, sizeof(path), "%s/%s", current_path, entry.d_name) != MS_MEDIA_ERR_NONE) { - MS_DBG_ERR("ms_strappend failed"); + MS_DBG_ERR("ms_strappend failed"); continue; } /* add new directory to dir_array */ new_path = strdup(path); - g_array_append_val (read_dir_array, new_path); + g_array_append_val(read_dir_array, new_path); } } } else { @@ -941,8 +939,8 @@ static int _msc_db_update_partial(void **handle, const char *storage_id, ms_stor ms_dir_info_s* dir_info = NULL; char *update_path = NULL; - for (i = 0; i < dir_array->len; i ++) { - dir_info = g_array_index (dir_array, ms_dir_info_s*, i); + for (i = 0; i < dir_array->len; i++) { + dir_info = g_array_index(dir_array, ms_dir_info_s*, i); update_path = strdup(dir_info->dir_path); if (update_path == NULL) { MS_DBG_ERR("malloc failed"); @@ -961,10 +959,10 @@ static int _msc_db_update_partial(void **handle, const char *storage_id, ms_stor } /*delete all node*/ - while(dir_array->len != 0) { + while (dir_array->len != 0) { ms_dir_info_s *data = NULL; data = g_array_index(dir_array , ms_dir_info_s*, 0); - g_array_remove_index (dir_array, 0); + g_array_remove_index(dir_array, 0); MS_SAFE_FREE(data->dir_path); MS_SAFE_FREE(data); } @@ -1151,7 +1149,7 @@ static bool __msc_is_valid_path(const char *path, uid_t uid) return false; usr_path = __msc_get_path(uid); - if(usr_path == NULL) + if (usr_path == NULL) return false; if (strncmp(path, usr_path, strlen(usr_path)) == 0) { @@ -1176,14 +1174,14 @@ static int __msc_check_file_path(const char *file_path, uid_t uid) /* check location of file */ /* file must exists under "/opt/usr/media" or "/opt/storage/sdcard" */ - if(!__msc_is_valid_path(file_path, uid)) { + if (!__msc_is_valid_path(file_path, uid)) { MS_DBG_ERR("Invalid path : %s", file_path); return MS_MEDIA_ERR_INVALID_PATH; } /* check the file exits actually */ exist = open(file_path, O_RDONLY); - if(exist < 0) { + if (exist < 0) { MS_DBG_ERR("[%s]open files"); return MS_MEDIA_ERR_INVALID_PATH; } @@ -1192,8 +1190,8 @@ static int __msc_check_file_path(const char *file_path, uid_t uid) /* check type of the path */ /* It must be a regular file */ memset(&file_st, 0, sizeof(struct stat)); - if(stat(file_path, &file_st) == 0) { - if(!S_ISREG(file_st.st_mode)) { + if (stat(file_path, &file_st) == 0) { + if (!S_ISREG(file_st.st_mode)) { /* In this case, it is not a regula file */ MS_DBG_ERR("this path is not a file"); return MS_MEDIA_ERR_INVALID_PATH; @@ -1209,10 +1207,10 @@ static int __msc_check_file_path(const char *file_path, uid_t uid) static int __msc_clear_file_list(GArray *path_array) { if (path_array) { - while(path_array->len != 0) { + while (path_array->len != 0) { char *data = NULL; data = g_array_index(path_array , char*, 0); - g_array_remove_index (path_array, 0); + g_array_remove_index(path_array, 0); MS_SAFE_FREE(data); } g_array_free(path_array, FALSE); @@ -1241,22 +1239,22 @@ static int __msc_check_ignore_dir(const char *full_path, uid_t uid) return MS_MEDIA_ERR_INVALID_PATH; } - while(1) { - if(__msc_check_scan_ignore(dir_path) != MS_MEDIA_ERR_NONE) { + while (1) { + if (__msc_check_scan_ignore(dir_path) != MS_MEDIA_ERR_NONE) { ret = MS_MEDIA_ERR_INVALID_PATH; break; } /*If root path, Stop Scanning*/ - if(strcmp(dir_path, __msc_get_path(uid)) == 0) + if (strcmp(dir_path, __msc_get_path(uid)) == 0) break; - else if(strcmp(dir_path, MEDIA_ROOT_PATH_SDCARD) == 0) + else if (strcmp(dir_path, MEDIA_ROOT_PATH_SDCARD) == 0) break; - else if(strcmp(dir_path, MEDIA_ROOT_PATH_USB) == 0) + else if (strcmp(dir_path, MEDIA_ROOT_PATH_USB) == 0) break; leaf_path = strrchr(dir_path, '/'); - if(leaf_path != NULL) { + if (leaf_path != NULL) { int seek_len = leaf_path -dir_path; dir_path[seek_len] = '\0'; } else { @@ -1290,7 +1288,7 @@ static int __msc_make_file_list(char *file_path, GArray **path_array, uid_t uid) memset(buf, 0x0, MS_FILE_PATH_LEN_MAX); /* This is an array for storing the path of insert datas*/ - *path_array = g_array_new (FALSE, FALSE, sizeof (char *)); + *path_array = g_array_new(FALSE, FALSE, sizeof(char *)); if (*path_array == NULL) { MS_DBG_ERR("g_array_new failed"); res = MS_MEDIA_ERR_OUT_OF_MEMORY; @@ -1298,7 +1296,7 @@ static int __msc_make_file_list(char *file_path, GArray **path_array, uid_t uid) } /* read registering file path from stored file */ - while(fgets(buf, MS_FILE_PATH_LEN_MAX, fp) != NULL) { + while (fgets(buf, MS_FILE_PATH_LEN_MAX, fp) != NULL) { length = strlen(buf); /*the return value of function, strlen(), includes "\n" */ path = strndup(buf, length - 1); /*copying except "\n" and strndup fuction adds "\0" at the end of the copying string */ @@ -1317,7 +1315,7 @@ static int __msc_make_file_list(char *file_path, GArray **path_array, uid_t uid) } } - if(fp) fclose(fp); + if (fp) fclose(fp); fp = NULL; return MS_MEDIA_ERR_NONE; @@ -1326,7 +1324,7 @@ FREE_RESOURCE: __msc_clear_file_list(*path_array); - if(fp) fclose(fp); + if (fp) fclose(fp); fp = NULL; return res; @@ -1398,7 +1396,7 @@ static int __msc_pop_register_request(GArray *register_array, ms_comm_msg_s **re /*updating requests remain*/ if (register_array->len != 0 && remain_request == 0) { *register_data = g_array_index(register_array, ms_comm_msg_s*, 0); - g_array_remove_index (register_array, 0); + g_array_remove_index(register_array, 0); break; } else if (remain_request != 0) { insert_data = g_async_queue_pop(reg_queue2); @@ -1412,7 +1410,7 @@ static int __msc_pop_register_request(GArray *register_array, ms_comm_msg_s **re } } - if(((*register_data)->msg_size <= 0) ||((*register_data)->msg_size > MS_FILE_PATH_LEN_MAX)) { + if (((*register_data)->msg_size <= 0) || ((*register_data)->msg_size > MS_FILE_PATH_LEN_MAX)) { MS_DBG_ERR("message size[%d] is wrong", (*register_data)->msg_size); return MS_MEDIA_ERR_INVALID_IPC_MESSAGE; } @@ -1432,7 +1430,7 @@ gboolean msc_register_thread(void *data) ms_msg_type_e current_msg = MS_MSG_MAX; /*create array for processing overlay data*/ - register_array = g_array_new (FALSE, FALSE, sizeof (ms_comm_msg_s *)); + register_array = g_array_new(FALSE, FALSE, sizeof(ms_comm_msg_s *)); if (register_array == NULL) { MS_DBG_ERR("g_array_new error"); return false; @@ -1493,13 +1491,13 @@ _POWEROFF: MS_SAFE_FREE(file_path); MS_SAFE_FREE(register_data); if (register_array) { - while(register_array->len != 0) { + while (register_array->len != 0) { ms_comm_msg_s *data = NULL; data = g_array_index(register_array , ms_comm_msg_s*, 0); - g_array_remove_index (register_array, 0); + g_array_remove_index(register_array, 0); MS_SAFE_FREE(data); } - g_array_free (register_array, FALSE); + g_array_free(register_array, FALSE); register_array = NULL; } @@ -1604,7 +1602,7 @@ static bool __msc_storage_mount_status(const char* start_path) int dev_num = dev_list->len; ms_block_info_s *block_info = NULL; - for (i = 0; i < dev_num; i ++) { + for (i = 0; i < dev_num; i++) { block_info = (ms_block_info_s *)g_array_index(dev_list , ms_stg_type_e*, i); if (strcmp(block_info->mount_path, storage_path) == 0) { ret = TRUE; @@ -1692,7 +1690,7 @@ int msc_push_scan_request(ms_scan_type_e scan_type, ms_comm_msg_s *recv_msg) { int ret = MS_MEDIA_ERR_NONE; - switch(scan_type) { + switch (scan_type) { case MS_SCAN_STORAGE: g_async_queue_push(storage_queue2, GINT_TO_POINTER(recv_msg)); break; @@ -1745,7 +1743,7 @@ int msc_get_remain_scan_request(ms_scan_type_e scan_type, int *remain_request) { int ret = MS_MEDIA_ERR_NONE; - switch(scan_type) { + switch (scan_type) { case MS_SCAN_STORAGE: *remain_request = g_async_queue_length(storage_queue2); break; diff --git a/src/scanner-v2/media-scanner-socket-v2.c b/src/scanner-v2/media-scanner-socket-v2.c index 3184848..da0bb07 100755 --- a/src/scanner-v2/media-scanner-socket-v2.c +++ b/src/scanner-v2/media-scanner-socket-v2.c @@ -66,7 +66,7 @@ static int _msc_remove_request(GAsyncQueue *req_queue, ms_comm_msg_s *recv_msg) temp_scan_queue = g_async_queue_new(); - for (i = 0; i msg, cancel_path) == 0) && (pid == msg->pid)) { @@ -75,7 +75,7 @@ static int _msc_remove_request(GAsyncQueue *req_queue, ms_comm_msg_s *recv_msg) g_async_queue_push(temp_scan_queue, GINT_TO_POINTER(msg)); } } - g_async_queue_unref (scan_queue2); + g_async_queue_unref(scan_queue2); scan_queue2 = temp_scan_queue; END_REMOVE_REQUEST: @@ -84,10 +84,9 @@ END_REMOVE_REQUEST: GAsyncQueue *temp_extract_queue = NULL; int len_extract = g_async_queue_length(folder_extract_queue); - if(len_extract != 0) - { + if (len_extract != 0) { temp_extract_queue = g_async_queue_new(); - for (i = 0; i msg, cancel_path) == 0) && (pid == msg->pid)) { @@ -96,7 +95,7 @@ END_REMOVE_REQUEST: g_async_queue_push(temp_extract_queue, GINT_TO_POINTER(msg)); } } - g_async_queue_unref (folder_extract_queue); + g_async_queue_unref(folder_extract_queue); folder_extract_queue = temp_extract_queue; } @@ -135,7 +134,7 @@ gboolean msc_receive_request(GIOChannel *src, GIOCondition condition, gpointer d /* copy from recived data */ req_num = recv_msg->msg_type; - switch(req_num){ + switch (req_num) { case MS_MSG_BULK_INSERT: case MS_MSG_BURSTSHOT_INSERT: { diff --git a/src/scanner-v2/media-scanner-v2.c b/src/scanner-v2/media-scanner-v2.c index 294a94c..4823204 100755 --- a/src/scanner-v2/media-scanner-v2.c +++ b/src/scanner-v2/media-scanner-v2.c @@ -80,12 +80,12 @@ int main(int argc, char **argv) /* Create pipe */ err = unlink(MS_SCANNER_FIFO_PATH_REQ); - if (err !=0) { + if (err != 0) { MS_DBG_STRERROR("[No-Error] unlink failed"); } err = mkfifo(MS_SCANNER_FIFO_PATH_REQ, MS_SCANNER_FIFO_MODE); - if (err !=0) { + if (err != 0) { MS_DBG_STRERROR("mkfifo failed"); return MS_MEDIA_ERR_INTERNAL; } @@ -125,11 +125,11 @@ int main(int argc, char **argv) g_main_loop_run(scanner_mainloop2); - g_thread_join (scan_thread); - g_thread_join (register_thread); - g_thread_join (storage_scan_thread); - g_thread_join (storage_extract_thread); - g_thread_join (folder_extract_thread); + g_thread_join(scan_thread); + g_thread_join(register_thread); + g_thread_join(storage_scan_thread); + g_thread_join(storage_extract_thread); + g_thread_join(folder_extract_thread); g_io_channel_shutdown(channel, FALSE, NULL); g_io_channel_unref(channel); diff --git a/src/scanner/media-scanner-scan.c b/src/scanner/media-scanner-scan.c index f499056..d5a9ae6 100755 --- a/src/scanner/media-scanner-scan.c +++ b/src/scanner/media-scanner-scan.c @@ -93,7 +93,7 @@ static char* __msc_get_path(uid_t uid) if (uid == getuid()) { result_psswd = strndup(MEDIA_ROOT_PATH_INTERNAL, strlen(MEDIA_ROOT_PATH_INTERNAL)); grpinfo = getgrnam("users"); - if(grpinfo == NULL) { + if (grpinfo == NULL) { MS_DBG_ERR("getgrnam(users) returns NULL !"); return NULL; } @@ -164,7 +164,7 @@ static int __msc_set_db_status(ms_db_status_type_t status, ms_storage_type_t sto } } } else if (status == MS_DB_UPDATED) { - if(!ms_config_set_int(VCONFKEY_FILEMANAGER_DB_STATUS, VCONFKEY_FILEMANAGER_DB_UPDATED)) { + if (!ms_config_set_int(VCONFKEY_FILEMANAGER_DB_STATUS, VCONFKEY_FILEMANAGER_DB_UPDATED)) { res = MS_MEDIA_ERR_VCONF_SET_FAIL; MS_DBG_ERR("ms_config_set_int failed"); } @@ -193,8 +193,7 @@ static bool __msc_check_scan_ignore(char * path) struct dirent *result; const char *ignore_path = ".scan_ignore"; - if(strstr(path, "/.")) - { + if (strstr(path, "/.")) { MS_DBG_ERR("hidden path"); return true; } @@ -226,26 +225,26 @@ gpointer current_data = NULL; static int __msc_resume_scan() { - g_mutex_lock (&data_mutex); + g_mutex_lock(&data_mutex); // current_data = GINT_TO_POINTER(g_directory_scan_processing); - g_cond_signal (&data_cond); + g_cond_signal(&data_cond); - g_mutex_unlock (&data_mutex); + g_mutex_unlock(&data_mutex); return MS_MEDIA_ERR_NONE; } static int __msc_pause_scan() { - g_mutex_lock (&data_mutex); + g_mutex_lock(&data_mutex); // while (current_data) while (g_directory_scan_processing) - g_cond_wait (&data_cond, &data_mutex); + g_cond_wait(&data_cond, &data_mutex); // current_data = GPOINTER_TO_INT(g_directory_scan_processing); - g_mutex_unlock (&data_mutex); + g_mutex_unlock(&data_mutex); return MS_MEDIA_ERR_NONE; } @@ -264,7 +263,7 @@ static int __msc_check_stop_status(ms_storage_type_t storage_type) /*check SD card in out */ #if 0 if ((mmc_state != MS_STG_INSERTED) && (storage_type == MS_STORAGE_EXTERNAL)) { - MS_DBG_ERR("Directory scanning is stopped"); + MS_DBG_ERR(fmt,args...)("Directory scanning is stopped"); ret = MS_MEDIA_ERR_SCANNER_FORCE_STOP; } #endif @@ -314,13 +313,13 @@ static int __msc_read_dir(void **handle, GArray *dir_array, const char *start_pa } /* make new array for storing directory */ - dir_array = g_array_new (FALSE, FALSE, sizeof (char*)); - if (dir_array == NULL){ + dir_array = g_array_new(FALSE, FALSE, sizeof(char*)); + if (dir_array == NULL) { MS_DBG_ERR("g_array_new failed"); return MS_MEDIA_ERR_OUT_OF_MEMORY; } - g_array_append_val (dir_array, start_path); + g_array_append_val(dir_array, start_path); scan_function = (scan_type == MS_MSG_STORAGE_ALL) ? ms_insert_item_batch : ms_validate_item; @@ -333,7 +332,7 @@ static int __msc_read_dir(void **handle, GArray *dir_array, const char *start_pa } /* get the current path from directory array */ current_path = g_array_index(dir_array , char*, 0); - g_array_remove_index (dir_array, 0); + g_array_remove_index(dir_array, 0); MS_DBG_SLOG("%d", dir_array->len); if (__msc_check_scan_ignore(current_path)) { @@ -347,7 +346,7 @@ static int __msc_read_dir(void **handle, GArray *dir_array, const char *start_pa dp = opendir(current_path); if (dp != NULL) { /*insert current directory*/ - if(ms_insert_folder(handle, storage_id, current_path, uid) != MS_MEDIA_ERR_NONE) { + if (ms_insert_folder(handle, storage_id, current_path, uid) != MS_MEDIA_ERR_NONE) { MS_DBG_ERR("insert folder failed"); } @@ -372,7 +371,7 @@ static int __msc_read_dir(void **handle, GArray *dir_array, const char *start_pa if (entry.d_type & DT_REG) { /* insert into media DB */ - if (scan_function(handle,storage_id, path, uid) != MS_MEDIA_ERR_NONE) { + if (scan_function(handle, storage_id, path, uid) != MS_MEDIA_ERR_NONE) { MS_DBG_ERR("failed to update db : %d", scan_type); continue; } @@ -382,7 +381,7 @@ static int __msc_read_dir(void **handle, GArray *dir_array, const char *start_pa /* add new directory to dir_array */ new_path = strdup(path); if (new_path != NULL) { - g_array_append_val (dir_array, new_path); + g_array_append_val(dir_array, new_path); } else { MS_DBG_ERR("strdup failed"); continue; @@ -390,7 +389,7 @@ static int __msc_read_dir(void **handle, GArray *dir_array, const char *start_pa } else { /* this request is recursive scanning */ /* don't add new directory to dir_array */ - if(ms_insert_folder(handle, storage_id, path, uid) != MS_MEDIA_ERR_NONE) { + if (ms_insert_folder(handle, storage_id, path, uid) != MS_MEDIA_ERR_NONE) { MS_DBG_ERR("insert folder failed"); } } @@ -460,8 +459,8 @@ static int __msc_stg_scan(void **handle, const char *storage_id, const char*star int (*scan_function)(void **, const char*, const char*, uid_t) = NULL; /* make new array for storing directory */ - dir_array = g_array_new (FALSE, FALSE, sizeof (char*)); - if (dir_array == NULL){ + dir_array = g_array_new(FALSE, FALSE, sizeof(char*)); + if (dir_array == NULL) { MS_DBG_ERR("g_array_new failed"); return MS_MEDIA_ERR_OUT_OF_MEMORY; } @@ -474,7 +473,7 @@ static int __msc_stg_scan(void **handle, const char *storage_id, const char*star return MS_MEDIA_ERR_OUT_OF_MEMORY; } - g_array_append_val (dir_array, start_path); + g_array_append_val(dir_array, start_path); MS_DBG_ERR("[No-Error] start path [%s]", new_start_path); @@ -483,12 +482,12 @@ static int __msc_stg_scan(void **handle, const char *storage_id, const char*star /* folder validity set 0 under the start_path in folder table*/ if (scan_type == MS_MSG_DIRECTORY_SCANNING_NON_RECURSIVE || scan_type == MS_MSG_DIRECTORY_SCANNING) { - if(ms_set_folder_validity(handle, storage_id, new_start_path, MS_INVALID, is_recursive, uid) != MS_MEDIA_ERR_NONE) { + if (ms_set_folder_validity(handle, storage_id, new_start_path, MS_INVALID, is_recursive, uid) != MS_MEDIA_ERR_NONE) { MS_DBG_ERR("set_folder_validity failed [%d] ", scan_type); } } - if(__msc_check_folder_path(new_start_path)) { + if (__msc_check_folder_path(new_start_path)) { ms_insert_folder(handle, storage_id, new_start_path, uid); } @@ -501,7 +500,7 @@ static int __msc_stg_scan(void **handle, const char *storage_id, const char*star } /* get the current path from directory array */ current_path = g_array_index(dir_array , char*, 0); - g_array_remove_index (dir_array, 0); + g_array_remove_index(dir_array, 0); // MS_DBG_SLOG("%d", dir_array->len); if (__msc_check_scan_ignore(current_path)) { @@ -528,13 +527,13 @@ static int __msc_stg_scan(void **handle, const char *storage_id, const char*star continue; if (ms_strappend(path, sizeof(path), "%s/%s", current_path, entry.d_name) != MS_MEDIA_ERR_NONE) { - MS_DBG_ERR("ms_strappend failed"); + MS_DBG_ERR("ms_strappend failed"); continue; } if (entry.d_type & DT_REG) { /* insert into media DB */ - if (scan_function(handle,storage_id, path, uid) != MS_MEDIA_ERR_NONE) { + if (scan_function(handle, storage_id, path, uid) != MS_MEDIA_ERR_NONE) { MS_DBG_ERR("failed to update db : %d", scan_type); continue; } @@ -544,9 +543,9 @@ static int __msc_stg_scan(void **handle, const char *storage_id, const char*star /* add new directory to dir_array */ new_path = strdup(path); if (new_path != NULL) { - g_array_append_val (dir_array, new_path); + g_array_append_val(dir_array, new_path); - if(ms_insert_folder(handle, storage_id, new_path, uid) != MS_MEDIA_ERR_NONE) { + if (ms_insert_folder(handle, storage_id, new_path, uid) != MS_MEDIA_ERR_NONE) { MS_DBG_ERR("insert folder failed"); } } else { @@ -556,7 +555,7 @@ static int __msc_stg_scan(void **handle, const char *storage_id, const char*star } else { /* this request is recursive scanning */ /* don't add new directory to dir_array */ - if(ms_insert_folder(handle, storage_id, path, uid) != MS_MEDIA_ERR_NONE) { + if (ms_insert_folder(handle, storage_id, path, uid) != MS_MEDIA_ERR_NONE) { MS_DBG_ERR("insert folder failed"); continue; } @@ -579,7 +578,7 @@ static int __msc_stg_scan(void **handle, const char *storage_id, const char*star /*remove invalid folder in folder table.*/ if (__msc_check_mount_storage(new_start_path)) { - if(ms_delete_invalid_folder(handle, storage_id, uid) != MS_MEDIA_ERR_NONE) { + if (ms_delete_invalid_folder(handle, storage_id, uid) != MS_MEDIA_ERR_NONE) { MS_DBG_ERR("delete invalid folder failed"); ret = MS_MEDIA_ERR_DB_DELETE_FAIL; } @@ -726,7 +725,7 @@ gboolean msc_directory_scan_thread(void *data) MS_DBG_ERR("BEFORE COUNT[%d]", before_count); /* folder validity set 0 under the start_path in folder table*/ - if(ms_set_folder_validity(handle, storage_id, scan_data->msg, MS_INVALID, is_recursive, scan_data->uid) != MS_MEDIA_ERR_NONE) { + if (ms_set_folder_validity(handle, storage_id, scan_data->msg, MS_INVALID, is_recursive, scan_data->uid) != MS_MEDIA_ERR_NONE) { MS_DBG_ERR("set_folder_validity failed [%d] ", scan_type); } @@ -753,7 +752,7 @@ gboolean msc_directory_scan_thread(void *data) } /*remove invalid folder in folder table.*/ - if(ms_delete_invalid_folder_by_path(handle, storage_id, scan_data->msg, scan_data->uid, &delete_folder_count) != MS_MEDIA_ERR_NONE) { + if (ms_delete_invalid_folder_by_path(handle, storage_id, scan_data->msg, scan_data->uid, &delete_folder_count) != MS_MEDIA_ERR_NONE) { MS_DBG_ERR("deleting invalid folder failed"); } @@ -819,21 +818,21 @@ static int _check_folder_from_list(char *folder_path, int item_num, GArray *dir_ time_t mtime; bool find_flag = false; - if(stat(folder_path, &buf) == 0) { + if (stat(folder_path, &buf) == 0) { mtime = buf.st_mtime; } else { return MS_MEDIA_ERR_INTERNAL; } for (i = 0; i < array_len; i++) { - dir_info = g_array_index (dir_array, ms_dir_info_s*, i); + dir_info = g_array_index(dir_array, ms_dir_info_s*, i); if (strcmp(folder_path, dir_info->dir_path) == 0) { /* if modified time is same, the folder does not need updating */ if ((mtime == dir_info->modified_time) && (item_num == dir_info->item_num)) { if (mtime == 0) continue; - g_array_remove_index (dir_array, i); + g_array_remove_index(dir_array, i); MS_SAFE_FREE(dir_info->dir_path); MS_SAFE_FREE(dir_info); } @@ -883,19 +882,19 @@ static int __msc_compare_with_db(void **handle, const char *storage_id, const ch } /* make new array for storing directory */ - read_dir_array = g_array_new (FALSE, FALSE, sizeof (char*)); - if (read_dir_array == NULL){ + read_dir_array = g_array_new(FALSE, FALSE, sizeof(char*)); + if (read_dir_array == NULL) { MS_DBG_ERR("g_array_new failed"); return MS_MEDIA_ERR_OUT_OF_MEMORY; } /* add first direcotiry to directory array */ - g_array_append_val (read_dir_array, start_path); + g_array_append_val(read_dir_array, start_path); /*start db update. the number of element in the array , db update is complete.*/ while (read_dir_array->len != 0) { /* get the current path from directory array */ current_path = g_array_index(read_dir_array , char*, 0); - g_array_remove_index (read_dir_array, 0); + g_array_remove_index(read_dir_array, 0); // MS_DBG_ERR("%s", current_path); if (__msc_check_scan_ignore(current_path)) { @@ -916,12 +915,12 @@ static int __msc_compare_with_db(void **handle, const char *storage_id, const ch if (entry.d_type & DT_DIR) { if (ms_strappend(path, sizeof(path), "%s/%s", current_path, entry.d_name) != MS_MEDIA_ERR_NONE) { - MS_DBG_ERR("ms_strappend failed"); + MS_DBG_ERR("ms_strappend failed"); continue; } /* add new directory to dir_array */ new_path = strdup(path); - g_array_append_val (read_dir_array, new_path); + g_array_append_val(read_dir_array, new_path); } else if (entry.d_type & DT_REG) { item_num++; } @@ -953,8 +952,8 @@ static int _msc_db_update_partial(void **handle, const char *storage_id, ms_stor ms_dir_info_s* dir_info = NULL; char *update_path = NULL; - for (i = 0; i < dir_array->len; i ++) { - dir_info = g_array_index (dir_array, ms_dir_info_s*, i); + for (i = 0; i < dir_array->len; i++) { + dir_info = g_array_index(dir_array, ms_dir_info_s*, i); update_path = strdup(dir_info->dir_path); // MS_DBG_SLOG("update_path : %s, %d", update_path, dir_info->modified_time); @@ -974,10 +973,10 @@ static int _msc_db_update_partial(void **handle, const char *storage_id, ms_stor } /*delete all node*/ - while(dir_array->len != 0) { + while (dir_array->len != 0) { ms_dir_info_s *data = NULL; data = g_array_index(dir_array , ms_dir_info_s*, 0); - g_array_remove_index (dir_array, 0); + g_array_remove_index(dir_array, 0); MS_SAFE_FREE(data->dir_path); MS_SAFE_FREE(data); } @@ -1169,7 +1168,7 @@ static bool __msc_is_valid_path(const char *path, uid_t uid) return false; usr_path = __msc_get_path(uid); - if(usr_path == NULL) + if (usr_path == NULL) return false; if (strncmp(path, usr_path, strlen(usr_path)) == 0) { @@ -1194,14 +1193,14 @@ static int __msc_check_file_path(const char *file_path, uid_t uid) /* check location of file */ /* file must exists under "/opt/usr/media" or "/opt/storage/sdcard" */ - if(!__msc_is_valid_path(file_path, uid)) { + if (!__msc_is_valid_path(file_path, uid)) { MS_DBG_ERR("Invalid path : %s", file_path); return MS_MEDIA_ERR_INVALID_PATH; } /* check the file exits actually */ exist = open(file_path, O_RDONLY); - if(exist < 0) { + if (exist < 0) { MS_DBG_STRERROR("Open failed"); MS_DBG_ERR("error path [%s]", file_path); return MS_MEDIA_ERR_INVALID_PATH; @@ -1211,8 +1210,8 @@ static int __msc_check_file_path(const char *file_path, uid_t uid) /* check type of the path */ /* It must be a regular file */ memset(&file_st, 0, sizeof(struct stat)); - if(stat(file_path, &file_st) == 0) { - if(!S_ISREG(file_st.st_mode)) { + if (stat(file_path, &file_st) == 0) { + if (!S_ISREG(file_st.st_mode)) { /* In this case, it is not a regula file */ MS_DBG_ERR("this path is not a file"); return MS_MEDIA_ERR_INVALID_PATH; @@ -1242,10 +1241,10 @@ static bool __msc_check_folder_path(const char *folder_path) static int __msc_clear_file_list(GArray *path_array) { if (path_array) { - while(path_array->len != 0) { + while (path_array->len != 0) { char *data = NULL; data = g_array_index(path_array , char*, 0); - g_array_remove_index (path_array, 0); + g_array_remove_index(path_array, 0); MS_SAFE_FREE(data); } g_array_free(path_array, FALSE); @@ -1274,22 +1273,22 @@ static int __msc_check_ignore_dir(const char *full_path, uid_t uid) return MS_MEDIA_ERR_INVALID_PATH; } - while(1) { - if(__msc_check_scan_ignore(dir_path)) { + while (1) { + if (__msc_check_scan_ignore(dir_path)) { ret = MS_MEDIA_ERR_INVALID_PATH; break; } /*If root path, Stop Scanning*/ - if(strcmp(dir_path, __msc_get_path(uid)) == 0) + if (strcmp(dir_path, __msc_get_path(uid)) == 0) break; - else if(strcmp(dir_path, MEDIA_ROOT_PATH_SDCARD) == 0) + else if (strcmp(dir_path, MEDIA_ROOT_PATH_SDCARD) == 0) break; - else if(strcmp(dir_path, MEDIA_ROOT_PATH_USB) == 0) + else if (strcmp(dir_path, MEDIA_ROOT_PATH_USB) == 0) break; leaf_path = strrchr(dir_path, '/'); - if(leaf_path != NULL) { + if (leaf_path != NULL) { int seek_len = leaf_path -dir_path; dir_path[seek_len] = '\0'; } else { @@ -1323,7 +1322,7 @@ static int __msc_make_file_list(char *file_path, GArray **path_array, uid_t uid) memset(buf, 0x0, MS_FILE_PATH_LEN_MAX); /* This is an array for storing the path of insert datas*/ - *path_array = g_array_new (FALSE, FALSE, sizeof (char *)); + *path_array = g_array_new(FALSE, FALSE, sizeof(char *)); if (*path_array == NULL) { MS_DBG_ERR("g_array_new failed"); res = MS_MEDIA_ERR_OUT_OF_MEMORY; @@ -1331,7 +1330,7 @@ static int __msc_make_file_list(char *file_path, GArray **path_array, uid_t uid) } /* read registering file path from stored file */ - while(fgets(buf, MS_FILE_PATH_LEN_MAX, fp) != NULL) { + while (fgets(buf, MS_FILE_PATH_LEN_MAX, fp) != NULL) { length = strlen(buf); /*the return value of function, strlen(), includes "\n" */ path = strndup(buf, length - 1); /*copying except "\n" and strndup fuction adds "\0" at the end of the copying string */ @@ -1350,7 +1349,7 @@ static int __msc_make_file_list(char *file_path, GArray **path_array, uid_t uid) } } - if(fp) fclose(fp); + if (fp) fclose(fp); fp = NULL; return MS_MEDIA_ERR_NONE; @@ -1359,7 +1358,7 @@ FREE_RESOURCE: __msc_clear_file_list(*path_array); - if(fp) fclose(fp); + if (fp) fclose(fp); fp = NULL; return res; @@ -1430,7 +1429,7 @@ static int __msc_pop_register_request(GArray *register_array, ms_comm_msg_s **re /*updating requests remain*/ if (register_array->len != 0 && remain_request == 0) { *register_data = g_array_index(register_array, ms_comm_msg_s*, 0); - g_array_remove_index (register_array, 0); + g_array_remove_index(register_array, 0); break; } else if (remain_request != 0) { insert_data = g_async_queue_pop(reg_queue); @@ -1444,7 +1443,7 @@ static int __msc_pop_register_request(GArray *register_array, ms_comm_msg_s **re } } - if(((*register_data)->msg_size <= 0) ||((*register_data)->msg_size > MS_FILE_PATH_LEN_MAX)) { + if (((*register_data)->msg_size <= 0) || ((*register_data)->msg_size > MS_FILE_PATH_LEN_MAX)) { MS_DBG_ERR("message size[%d] is wrong", (*register_data)->msg_size); return MS_MEDIA_ERR_INVALID_IPC_MESSAGE; } @@ -1464,7 +1463,7 @@ gboolean msc_register_thread(void *data) ms_msg_type_e current_msg = MS_MSG_MAX; /*create array for processing overlay data*/ - register_array = g_array_new (FALSE, FALSE, sizeof (ms_comm_msg_s *)); + register_array = g_array_new(FALSE, FALSE, sizeof(ms_comm_msg_s *)); if (register_array == NULL) { MS_DBG_ERR("g_array_new error"); return false; @@ -1525,13 +1524,13 @@ _POWEROFF: MS_SAFE_FREE(file_path); MS_SAFE_FREE(register_data); if (register_array) { - while(register_array->len != 0) { + while (register_array->len != 0) { ms_comm_msg_s *data = NULL; data = g_array_index(register_array , ms_comm_msg_s*, 0); - g_array_remove_index (register_array, 0); + g_array_remove_index(register_array, 0); MS_SAFE_FREE(data); } - g_array_free (register_array, FALSE); + g_array_free(register_array, FALSE); register_array = NULL; } @@ -1584,13 +1583,13 @@ static int __msc_dir_scan_meta_update(void **handle, const char*start_path, ms_s int (*scan_function)(void **, const char*, uid_t) = ms_update_meta_batch; /* make new array for storing directory */ - dir_array = g_array_new (FALSE, FALSE, sizeof (char*)); - if (dir_array == NULL){ + dir_array = g_array_new(FALSE, FALSE, sizeof(char*)); + if (dir_array == NULL) { MS_DBG_ERR("g_array_new failed"); return MS_MEDIA_ERR_OUT_OF_MEMORY; } /* add first direcotiry to directory array */ - g_array_append_val (dir_array, start_path); + g_array_append_val(dir_array, start_path); /*start db update. the number of element in the array , db update is complete.*/ while (dir_array->len != 0) { @@ -1602,7 +1601,7 @@ static int __msc_dir_scan_meta_update(void **handle, const char*start_path, ms_s /* get the current path from directory array */ current_path = g_array_index(dir_array , char*, 0); - g_array_remove_index (dir_array, 0); + g_array_remove_index(dir_array, 0); // MS_DBG_SLOG("%d", dir_array->len); if (__msc_check_scan_ignore(current_path)) { @@ -1628,25 +1627,25 @@ static int __msc_dir_scan_meta_update(void **handle, const char*start_path, ms_s if (entry.d_type & DT_REG) { if (ms_strappend(path, sizeof(path), "%s/%s", current_path, entry.d_name) != MS_MEDIA_ERR_NONE) { - MS_DBG_ERR("ms_strappend failed"); + MS_DBG_ERR("ms_strappend failed"); continue; } /* insert into media DB */ MS_DBG_ERR("%s", path); - if (scan_function(handle,path, uid) != MS_MEDIA_ERR_NONE) { + if (scan_function(handle, path, uid) != MS_MEDIA_ERR_NONE) { MS_DBG_ERR("failed to update db"); continue; } } else if (entry.d_type & DT_DIR) { /* this request is recursive scanning */ if (ms_strappend(path, sizeof(path), "%s/%s", current_path, entry.d_name) != MS_MEDIA_ERR_NONE) { - MS_DBG_ERR("ms_strappend failed"); + MS_DBG_ERR("ms_strappend failed"); continue; } /* add new directory to dir_array */ new_path = strdup(path); - g_array_append_val (dir_array, new_path); + g_array_append_val(dir_array, new_path); } } } else { @@ -1787,7 +1786,7 @@ int msc_push_scan_request(ms_scan_type_e scan_type, ms_comm_msg_s *recv_msg) { int ret = MS_MEDIA_ERR_NONE; - switch(scan_type) { + switch (scan_type) { case MS_SCAN_STORAGE: g_async_queue_push(storage_queue, GINT_TO_POINTER(recv_msg)); break; @@ -1857,7 +1856,7 @@ int msc_remove_dir_scan_request(ms_comm_msg_s *recv_msg) temp_scan_queue = g_async_queue_new(); - for (i = 0; i msg, cancel_path) == 0) && (pid == msg->pid)) { @@ -1866,7 +1865,7 @@ int msc_remove_dir_scan_request(ms_comm_msg_s *recv_msg) g_async_queue_push(temp_scan_queue, GINT_TO_POINTER(msg)); } } - g_async_queue_unref (scan_queue); + g_async_queue_unref(scan_queue); scan_queue = temp_scan_queue; END_REMOVE_REQUEST: diff --git a/src/scanner/media-scanner-socket.c b/src/scanner/media-scanner-socket.c index 30f976d..6a1c1c9 100755 --- a/src/scanner/media-scanner-socket.c +++ b/src/scanner/media-scanner-socket.c @@ -69,7 +69,7 @@ gboolean msc_receive_request(GIOChannel *src, GIOCondition condition, gpointer d /* copy from recived data */ req_num = recv_msg->msg_type; - switch(req_num){ + switch (req_num) { case MS_MSG_BULK_INSERT: case MS_MSG_BURSTSHOT_INSERT: { diff --git a/src/scanner/media-scanner.c b/src/scanner/media-scanner.c index b41c6b9..e07e83f 100755 --- a/src/scanner/media-scanner.c +++ b/src/scanner/media-scanner.c @@ -72,12 +72,12 @@ int main(int argc, char **argv) /* Create pipe */ err = unlink(MS_SCANNER_FIFO_PATH_REQ); - if (err !=0) { + if (err != 0) { MS_DBG_STRERROR("unlink failed"); } err = mkfifo(MS_SCANNER_FIFO_PATH_REQ, MS_SCANNER_FIFO_MODE); - if (err !=0) { + if (err != 0) { MS_DBG_STRERROR("mkfifo failed"); return MS_MEDIA_ERR_INTERNAL; } @@ -118,9 +118,9 @@ int main(int argc, char **argv) g_main_loop_run(scanner_mainloop); - g_thread_join (scan_thread); - g_thread_join (register_thread); - g_thread_join (storage_scan_thread); + g_thread_join(scan_thread); + g_thread_join(register_thread); + g_thread_join(storage_scan_thread); g_io_channel_shutdown(channel, FALSE, NULL); g_io_channel_unref(channel); diff --git a/src/server/media-server-db.c b/src/server/media-server-db.c index e04cd67..6e5d836 100755 --- a/src/server/media-server-db.c +++ b/src/server/media-server-db.c @@ -55,7 +55,7 @@ gboolean ms_db_thread(void *data) /* Create TCP Socket*/ ret = ms_ipc_create_server_socket(MS_PROTOCOL_TCP, MS_DB_UPDATE_PORT, &sockfd); - if(ret != MS_MEDIA_ERR_NONE) { + if (ret != MS_MEDIA_ERR_NONE) { MS_DBG_ERR("Failed to create socket"); return FALSE; } @@ -67,7 +67,7 @@ gboolean ms_db_thread(void *data) /* Create TCP Socket for batch query*/ ret = ms_ipc_create_server_socket(MS_PROTOCOL_TCP, MS_DB_BATCH_UPDATE_PORT, &tcp_sockfd); - if(ret != MS_MEDIA_ERR_NONE) { + if (ret != MS_MEDIA_ERR_NONE) { close(sockfd); MS_DBG_ERR("Failed to create socket"); return FALSE; diff --git a/src/server/media-server-device-block.c b/src/server/media-server-device-block.c index ecd45b4..d9d5fd8 100755 --- a/src/server/media-server-device-block.c +++ b/src/server/media-server-device-block.c @@ -94,7 +94,7 @@ int ms_usb_insert_handler(const char *mount_path) } scan_type = MS_SCAN_PART; ms_set_storage_validity(handle, storage_id, 1, uid); - if (ms_set_storage_scan_status(handle, storage_id, MEDIA_SCAN_PREPARE, uid) != MS_MEDIA_ERR_NONE){ + if (ms_set_storage_scan_status(handle, storage_id, MEDIA_SCAN_PREPARE, uid) != MS_MEDIA_ERR_NONE) { MS_DBG_ERR("ms_set_storage_scan_status failed"); } } else { @@ -140,7 +140,7 @@ int ms_usb_remove_handler(const char *mount_path) ms_connect_db(&handle, uid); - while(1) { + while (1) { memset(device_id, 0x0, sizeof(device_id)); ms_get_storage_id(handle, mount_path, device_id); @@ -170,13 +170,13 @@ static ms_dir_scan_type_t __ms_get_mmc_scan_type(const char *cid, const char *st MS_DBG("Last MMC id = [%s] MMC path = [%s]", storage_name, storage_path); MS_DBG("Current MMC info = [%s]", cid); - if(storage_name != NULL) { + if (storage_name != NULL) { if (strcmp(storage_name, cid) == 0) { scan_type = MS_SCAN_PART; } } - if(scan_type == MS_SCAN_PART) + if (scan_type == MS_SCAN_PART) MS_DBG("MMC Scan type [MS_SCAN_PART]"); else MS_DBG("MMC Scan type [MS_SCAN_ALL]"); @@ -269,7 +269,7 @@ int ms_mmc_insert_handler(const char *mount_path) if (info_exist == TRUE) { scan_type = __ms_get_mmc_scan_type(cid, storage_name, storage_path); - if(scan_type == MS_SCAN_ALL) /*FIX ME. path should be compared*/ + if (scan_type == MS_SCAN_ALL) /*FIX ME. path should be compared*/ __ms_update_mmc_info(db_handle, storage_name, cid, mount_path); } else { __ms_insert_mmc_info(db_handle, cid, mount_path); diff --git a/src/server/media-server-main.c b/src/server/media-server-main.c index 152c7a4..d622db2 100755 --- a/src/server/media-server-main.c +++ b/src/server/media-server-main.c @@ -72,7 +72,7 @@ void _power_off_cb(ms_power_info_s *power_info, void* data) /*Quit DB Thread*/ GMainLoop *db_mainloop = ms_db_get_mainloop(); - if(db_mainloop && g_main_loop_is_running(db_mainloop)) { + if (db_mainloop && g_main_loop_is_running(db_mainloop)) { g_main_loop_quit(db_mainloop); } @@ -172,22 +172,24 @@ void _ms_change_lang_vconf_cb(keynode_t *key, void* data) return; } -static int _mkdir(const char *dir, mode_t mode) { - char tmp[256]; - char *p = NULL; - size_t len; - - snprintf(tmp, sizeof(tmp),"%s",dir); - len = strlen(tmp); - if(tmp[len - 1] == '/') - tmp[len - 1] = 0; - for(p = tmp + 1; *p; p++) - if(*p == '/') { - *p = 0; - mkdir(tmp, mode); - *p = '/'; - } - return mkdir(tmp, mode); +static int _mkdir(const char *dir, mode_t mode) +{ + char tmp[256]; + char *p = NULL; + size_t len; + + snprintf(tmp, sizeof(tmp), "%s", dir); + len = strlen(tmp); + if (tmp[len - 1] == '/') + tmp[len - 1] = 0; + for (p = tmp + 1; *p; p++) + if (*p == '/') { + *p = 0; + mkdir(tmp, mode); + *p = '/'; + } + + return mkdir(tmp, mode); } int main(int argc, char **argv) @@ -220,7 +222,7 @@ int main(int argc, char **argv) thumb_thread = g_thread_new("thumb_agent_thread", (GThreadFunc)ms_thumb_agent_start_thread, NULL); /*clear previous data of sdcard on media database and check db status for updating*/ - while(!ms_db_get_thread_status()) { + while (!ms_db_get_thread_status()) { MS_DBG_ERR("wait db thread"); sleep(1); } @@ -259,7 +261,7 @@ static void __ms_add_requst_receiver(GMainLoop *mainloop, GIOChannel **channel) /*prepare socket*/ /* create dir socket */ - _mkdir("/var/run/media-server",S_IRWXU | S_IRWXG | S_IRWXO); + _mkdir("/var/run/media-server", S_IRWXU | S_IRWXG | S_IRWXO); /* Create and bind new UDP socket */ if (ms_ipc_create_server_socket(MS_PROTOCOL_TCP, MS_SCANNER_PORT, &sockfd) @@ -305,7 +307,7 @@ static void __ms_add_event_receiver(GIOChannel *channel) char *lang = NULL; /*set power off callback function*/ - ms_sys_set_poweroff_cb(_power_off_cb,channel); + ms_sys_set_poweroff_cb(_power_off_cb, channel); ms_sys_set_device_block_event_cb(ms_device_block_changed_cb, NULL); if (!ms_config_get_str(VCONFKEY_LANGSET, &lang)) { @@ -347,7 +349,7 @@ static void __ms_add_signal_handler(void) MS_DBG_STRERROR("sigaction failed"); } - signal(SIGPIPE,SIG_IGN); + signal(SIGPIPE, SIG_IGN); } static void __ms_check_mediadb(void) @@ -375,7 +377,7 @@ static int __ms_check_mmc_status(void) int dev_num = dev_list->len; ms_block_info_s *block_info = NULL; - for (i = 0; i < dev_num; i ++) { + for (i = 0; i < dev_num; i++) { block_info = (ms_block_info_s *)g_array_index(dev_list , ms_stg_type_e*, i); ms_mmc_insert_handler(block_info->mount_path); } @@ -406,7 +408,7 @@ static int __ms_check_usb_status(void) int dev_num = dev_list->len; ms_block_info_s *block_info = NULL; - for (i = 0; i < dev_num; i ++) { + for (i = 0; i < dev_num; i++) { block_info = (ms_block_info_s *)g_array_index(dev_list , ms_stg_type_e*, i); ms_usb_insert_handler(block_info->mount_path); } diff --git a/src/server/media-server-scanner.c b/src/server/media-server-scanner.c index 9ceee0b..6c91a73 100755 --- a/src/server/media-server-scanner.c +++ b/src/server/media-server-scanner.c @@ -40,8 +40,8 @@ #define MS_NO_REMAIN_TASK 0 -#define MEDIA_SERVER_PATH tzplatform_mkpath(TZ_SYS_BIN,"media-scanner") -#define MEDIA_SERVER_PATH_V2 tzplatform_mkpath(TZ_SYS_BIN,"media-scanner-v2") +#define MEDIA_SERVER_PATH tzplatform_mkpath(TZ_SYS_BIN, "media-scanner") +#define MEDIA_SERVER_PATH_V2 tzplatform_mkpath(TZ_SYS_BIN, "media-scanner-v2") extern GMainLoop *mainloop; extern GArray *owner_list; @@ -70,7 +70,7 @@ ms_db_status_type_t ms_check_scanning_status(void) { int status; - if(ms_config_get_int(VCONFKEY_FILEMANAGER_DB_STATUS, &status)) { + if (ms_config_get_int(VCONFKEY_FILEMANAGER_DB_STATUS, &status)) { if (status == VCONFKEY_FILEMANAGER_DB_UPDATING) { return MS_DB_UPDATING; } @@ -79,7 +79,7 @@ ms_db_status_type_t ms_check_scanning_status(void) return MS_DB_UPDATED; } -static gboolean _ms_stop_scanner (gpointer user_data) +static gboolean _ms_stop_scanner(gpointer user_data) { int task_num = MS_NO_REMAIN_TASK; @@ -103,7 +103,7 @@ static gboolean _ms_stop_scanner (gpointer user_data) } /* stop media scanner */ - if (child_pid >0 ) { + if (child_pid > 0) { if (kill(child_pid, SIGKILL) < 0) { MS_DBG_STRERROR("kill failed"); g_mutex_unlock(&scanner_mutex); @@ -124,8 +124,8 @@ static gboolean _ms_stop_scanner (gpointer user_data) // ms_reset_scanner_status(); - g_source_destroy(g_main_context_find_source_by_id(g_main_loop_get_context (mainloop), alarm_id)); - g_source_destroy(g_main_context_find_source_by_id(g_main_loop_get_context (mainloop), receive_id)); + g_source_destroy(g_main_context_find_source_by_id(g_main_loop_get_context(mainloop), alarm_id)); + g_source_destroy(g_main_context_find_source_by_id(g_main_loop_get_context(mainloop), receive_id)); return FALSE; } @@ -136,7 +136,7 @@ static int _ms_get_ini_config(const char *key) int value = 0; dict = iniparser_load(MS_INI_DEFAULT_PATH); - if(!dict) { + if (!dict) { MS_DBG_ERR("%s load failed", MS_INI_DEFAULT_PATH); return 0; } @@ -160,8 +160,8 @@ void ms_cleanup_scanner(void) unlink(MS_SCANNER_FIFO_PATH_RES); unlink(MS_SCANNER_FIFO_PATH_REQ); - g_source_destroy(g_main_context_find_source_by_id(g_main_loop_get_context (mainloop), alarm_id)); - g_source_destroy(g_main_context_find_source_by_id(g_main_loop_get_context (mainloop), receive_id)); + g_source_destroy(g_main_context_find_source_by_id(g_main_loop_get_context(mainloop), alarm_id)); + g_source_destroy(g_main_context_find_source_by_id(g_main_loop_get_context(mainloop), receive_id)); g_mutex_unlock(&scanner_mutex); @@ -178,7 +178,7 @@ static void _ms_add_timeout(guint interval, GSourceFunc func, gpointer data) src = g_timeout_source_new_seconds(interval); g_source_set_callback(src, func, data, NULL); - alarm_id = g_source_attach(src, g_main_loop_get_context (mainloop)); + alarm_id = g_source_attach(src, g_main_loop_get_context(mainloop)); g_source_unref(src); } @@ -194,7 +194,7 @@ int ms_scanner_start(void) return MS_MEDIA_ERR_NONE; } - if((pid = fork()) < 0) { + if ((pid = fork()) < 0) { MS_DBG_ERR("Fork error\n"); g_mutex_unlock(&scanner_mutex); } else if (pid > 0) { @@ -207,11 +207,11 @@ int ms_scanner_start(void) int scanner_status = -1; err = unlink(MS_SCANNER_FIFO_PATH_RES); - if (err !=0) { + if (err != 0) { MS_DBG_STRERROR("[No-Error] unlink failed"); } err = mkfifo(MS_SCANNER_FIFO_PATH_RES, MS_SCANNER_FIFO_MODE); - if (err !=0) { + if (err != 0) { MS_DBG_STRERROR("mkfifo failed"); return MS_MEDIA_ERR_INTERNAL; } @@ -267,12 +267,12 @@ int ms_scanner_start(void) return ret; /* attach socket receive message callback */ - } else if(pid == 0) { + } else if (pid == 0) { /* child process */ MS_DBG_ERR("[No-Error] CHILD PROCESS"); MS_DBG("[No-Error] EXECUTE MEDIA SCANNER"); - if(_ms_get_ini_config("media-content-config:scanner_type") == 1) + if (_ms_get_ini_config("media-content-config:scanner_type") == 1) execl(MEDIA_SERVER_PATH_V2, "media-scanner-v2", NULL); else execl(MEDIA_SERVER_PATH, "media-scanner", NULL); diff --git a/src/server/media-server-socket.c b/src/server/media-server-socket.c index 1fdb929..8152e25 100755 --- a/src/server/media-server-socket.c +++ b/src/server/media-server-socket.c @@ -49,13 +49,12 @@ gint cur_running_task; extern bool power_off; -typedef struct ms_req_owner_data -{ +typedef struct ms_req_owner_data { int pid; int index; int client_sockfd; char *req_path; -}ms_req_owner_data; +} ms_req_owner_data; static int __ms_add_owner(int pid, int client_sock, char *path) { @@ -69,7 +68,7 @@ static int __ms_add_owner(int pid, int client_sock, char *path) /* These are used for sending result of scanning */ if (owner_list == NULL) { /*create array for processing overlay data*/ - owner_list = g_array_new (FALSE, FALSE, sizeof (ms_req_owner_data *)); + owner_list = g_array_new(FALSE, FALSE, sizeof(ms_req_owner_data *)); if (owner_list == NULL) { MS_DBG_ERR("g_array_new error"); return MS_MEDIA_ERR_OUT_OF_MEMORY; @@ -81,7 +80,7 @@ static int __ms_add_owner(int pid, int client_sock, char *path) if (owner_data == NULL) { MS_DBG_ERR("MS_MALLOC failed"); - g_array_free (owner_list, FALSE); + g_array_free(owner_list, FALSE); owner_list = NULL; return MS_MEDIA_ERR_OUT_OF_MEMORY; } @@ -114,7 +113,7 @@ static int __ms_find_owner(int pid, const char *req_path, ms_req_owner_data **ow MS_DBG("length list : %d", len); - for (i=0; i < len; i++) { + for (i = 0; i < len; i++) { data = g_array_index(owner_list, ms_req_owner_data*, i); MS_DBG("%d %d", data->pid, pid); MS_DBG("%s %s", data->req_path, req_path); @@ -143,7 +142,7 @@ static int __ms_delete_owner(ms_req_owner_data *owner_data) static int __ms_send_result_to_client(int pid, ms_comm_msg_s *recv_msg) { - if(strlen(recv_msg->msg) == 0) { + if (strlen(recv_msg->msg) == 0) { MS_DBG_ERR("msg is NULL"); return MS_MEDIA_ERR_INVALID_PARAMETER; } @@ -154,7 +153,7 @@ static int __ms_send_result_to_client(int pid, ms_comm_msg_s *recv_msg) /* find owner data */ ms_req_owner_data *owner_data = NULL; char *res_path = strdup(recv_msg->msg); - if(res_path == NULL) { + if (res_path == NULL) { MS_DBG_ERR("res_path is NULL"); return MS_MEDIA_ERR_OUT_OF_MEMORY; } @@ -219,7 +218,7 @@ gboolean ms_read_socket(gpointer user_data) goto ERROR; } - if(strncmp(recv_msg.msg, MEDIA_ROOT_PATH_EXTERNAL, strlen(MEDIA_ROOT_PATH_EXTERNAL)) == 0) { + if (strncmp(recv_msg.msg, MEDIA_ROOT_PATH_EXTERNAL, strlen(MEDIA_ROOT_PATH_EXTERNAL)) == 0) { if (ms_cynara_check(&creds, EXTERNAL_STORAGE_PRIVILEGE) != MS_MEDIA_ERR_NONE) { res = ret; goto ERROR; @@ -238,11 +237,10 @@ gboolean ms_read_socket(gpointer user_data) req_num = recv_msg.msg_type; pid = recv_msg.pid; - /* register file request - * media server inserts the meta data of one file into media db */ + /* register file request media server inserts the meta data of one file into media db */ if (req_num == MS_MSG_DIRECTORY_SCANNING - ||req_num == MS_MSG_BULK_INSERT - ||req_num == MS_MSG_DIRECTORY_SCANNING_NON_RECURSIVE + || req_num == MS_MSG_BULK_INSERT + || req_num == MS_MSG_DIRECTORY_SCANNING_NON_RECURSIVE || req_num == MS_MSG_BURSTSHOT_INSERT || req_num == MS_MSG_DIRECTORY_SCANNING_CANCEL) { if ((ret = ms_send_scan_request(&recv_msg, client_sock)) != MS_MEDIA_ERR_NONE) { @@ -267,7 +265,7 @@ ERROR: memset(&res_msg, 0x0, sizeof(ms_comm_msg_s)); - switch(req_num) { + switch (req_num) { case MS_MSG_DIRECTORY_SCANNING: case MS_MSG_DIRECTORY_SCANNING_NON_RECURSIVE: res_msg.msg_type = MS_MSG_SCANNER_RESULT; @@ -276,7 +274,7 @@ ERROR: case MS_MSG_BURSTSHOT_INSERT: res_msg.msg_type = MS_MSG_SCANNER_BULK_RESULT; break; - default : + default: break; } @@ -332,9 +330,9 @@ int ms_send_scan_request(ms_comm_msg_s *send_msg, int client_sock) g_mutex_unlock(&scanner_mutex); err = ms_scanner_start(); - if(err == MS_MEDIA_ERR_NONE) { + if (err == MS_MEDIA_ERR_NONE) { err = __ms_send_request(send_msg); - if(err != MS_MEDIA_ERR_NONE) { + if (err != MS_MEDIA_ERR_NONE) { MS_DBG_ERR("__ms_send_request failed", err); } } else { @@ -380,7 +378,7 @@ int ms_send_storage_scan_request(const char *root_path, const char *storage_id, case MS_SCAN_META: scan_msg.msg_type = MS_MSG_STORAGE_META; break; - default : + default: ret = MS_MEDIA_ERR_INVALID_PARAMETER; MS_DBG_ERR("ms_send_storage_scan_request invalid parameter"); goto ERROR; @@ -390,14 +388,14 @@ int ms_send_storage_scan_request(const char *root_path, const char *storage_id, /* msg_size & msg */ if (root_path != NULL) { scan_msg.msg_size = strlen(root_path); - strncpy(scan_msg.msg, root_path, scan_msg.msg_size ); + strncpy(scan_msg.msg, root_path, scan_msg.msg_size); } if (storage_id != NULL) { strncpy(scan_msg.storage_id, storage_id, MS_UUID_SIZE-1); } - if(uid == 0) { + if (uid == 0) { ms_sys_get_uid(&uid); } @@ -456,7 +454,7 @@ gboolean ms_read_db_tcp_socket(GIOChannel *src, GIOCondition condition, gpointer MS_SAFE_FREE(creds.smack); MS_SAFE_FREE(creds.uid); - if(media_db_connect(&db_handle, recv_msg.uid, TRUE) != MS_MEDIA_ERR_NONE) { + if (media_db_connect(&db_handle, recv_msg.uid, TRUE) != MS_MEDIA_ERR_NONE) { MS_DBG_ERR("Failed to connect DB"); goto ERROR; } @@ -482,7 +480,7 @@ ERROR: MS_DBG("Sent successfully"); } - if (close(client_sock) <0) { + if (close(client_sock) < 0) { MS_DBG_STRERROR("close failed"); } @@ -495,7 +493,7 @@ void _ms_process_tcp_message(gpointer data, gpointer user_data) int ret = MS_MEDIA_ERR_NONE; char * sql_query = NULL; ms_comm_msg_s recv_msg; - int client_sock = GPOINTER_TO_INT (data); + int client_sock = GPOINTER_TO_INT(data); int send_msg = MS_MEDIA_ERR_NONE; MediaDBHandle *db_handle = NULL; @@ -503,7 +501,7 @@ void _ms_process_tcp_message(gpointer data, gpointer user_data) // MS_DBG_ERR("client sokcet : %d", client_sock); - while(1) { + while (1) { if (power_off == TRUE) { MS_DBG_WARN("in the power off sequence"); break; @@ -518,8 +516,8 @@ void _ms_process_tcp_message(gpointer data, gpointer user_data) } /* Connect Media DB*/ - if(db_handle == NULL) { - if(media_db_connect(&db_handle, recv_msg.uid, TRUE) != MS_MEDIA_ERR_NONE) { + if (db_handle == NULL) { + if (media_db_connect(&db_handle, recv_msg.uid, TRUE) != MS_MEDIA_ERR_NONE) { MS_DBG_ERR("Failed to connect DB"); send_msg = MS_MEDIA_ERR_DB_CONNECT_FAIL; goto ERROR; @@ -530,9 +528,9 @@ void _ms_process_tcp_message(gpointer data, gpointer user_data) if (sql_query != NULL) { if (recv_msg.msg_type == MS_MSG_DB_UPDATE_BATCH_START) { ret = media_db_update_db_batch_start(sql_query); - } else if(recv_msg.msg_type == MS_MSG_DB_UPDATE_BATCH_END) { + } else if (recv_msg.msg_type == MS_MSG_DB_UPDATE_BATCH_END) { ret = media_db_update_db_batch_end(db_handle, sql_query); - } else if(recv_msg.msg_type == MS_MSG_DB_UPDATE_BATCH) { + } else if (recv_msg.msg_type == MS_MSG_DB_UPDATE_BATCH) { ret = media_db_update_db_batch(sql_query); } else { @@ -567,7 +565,7 @@ void _ms_process_tcp_message(gpointer data, gpointer user_data) } } - if (close(client_sock) <0) { + if (close(client_sock) < 0) { MS_DBG_STRERROR("close failed"); } @@ -588,7 +586,7 @@ ERROR: MS_DBG("Sent successfully"); } - if (close(client_sock) <0) { + if (close(client_sock) < 0) { MS_DBG_STRERROR("close failed"); } @@ -672,7 +670,7 @@ ERROR: MS_DBG("Sent successfully"); } - if (close(client_sock) <0) { + if (close(client_sock) < 0) { MS_DBG_STRERROR("close failed"); } } @@ -716,7 +714,7 @@ gboolean ms_receive_message_from_scanner(GIOChannel *src, GIOCondition condition MS_DBG_SLOG("This request is from media-server"); } } else { - MS_DBG_ERR("This result message is wrong : %d", recv_msg.msg_type ); + MS_DBG_ERR("This result message is wrong : %d", recv_msg.msg_type); } return TRUE; @@ -775,7 +773,7 @@ int ms_send_storage_otg_scan_request(const char *path, const char *device_uuid, case MS_SCAN_INVALID: scan_msg.msg_type = MS_MSG_STORAGE_INVALID; break; - default : + default: ret = MS_MEDIA_ERR_INVALID_PARAMETER; MS_DBG_ERR("ms_send_storage_scan_request invalid parameter"); goto ERROR; @@ -784,7 +782,7 @@ int ms_send_storage_otg_scan_request(const char *path, const char *device_uuid, /* msg_size & msg */ scan_msg.msg_size = strlen(path); - strncpy(scan_msg.msg, path, scan_msg.msg_size ); + strncpy(scan_msg.msg, path, scan_msg.msg_size); strncpy(scan_msg.storage_id, device_uuid, MS_UUID_SIZE-1); ret = ms_send_scan_request(&scan_msg, -1); diff --git a/src/server/media-server-thumb.c b/src/server/media-server-thumb.c index 2e53267..f8acd43 100755 --- a/src/server/media-server-thumb.c +++ b/src/server/media-server-thumb.c @@ -41,8 +41,8 @@ do { \ value = iniparser_getint(dict, key, default); \ MS_DBG("get %s = %d", key, value); \ - } while(0) -#define THUMB_SERVER_PATH tzplatform_mkpath(TZ_SYS_BIN,"media-thumbnail-server") + } while (0) +#define THUMB_SERVER_PATH tzplatform_mkpath(TZ_SYS_BIN, "media-thumbnail-server") gboolean _ms_thumb_agent_timer(); @@ -124,8 +124,8 @@ void _ms_thumb_create_timer(int id) g_source_destroy(g_main_context_find_source_by_id(g_main_context_get_thread_default(), id)); GSource *timer_src = g_timeout_source_new_seconds(MS_TIMEOUT_SEC_20); - g_source_set_callback (timer_src, _ms_thumb_agent_timer, NULL, NULL); - g_timer_id = g_source_attach (timer_src, g_main_context_get_thread_default()); + g_source_set_callback(timer_src, _ms_thumb_agent_timer, NULL, NULL); + g_timer_id = g_source_attach(timer_src, g_main_context_get_thread_default()); } @@ -203,7 +203,7 @@ int _ms_thumb_recv_msg(int sock, thumbMsg *msg) header_size = sizeof(thumbMsg) -(MAX_FILEPATH_LEN * 2) - sizeof(unsigned char *); MS_MALLOC(buf, header_size); - if(buf == NULL) { + if (buf == NULL) { MS_DBG_STRERROR("malloc failed"); return MS_MEDIA_ERR_OUT_OF_MEMORY; } @@ -219,19 +219,19 @@ int _ms_thumb_recv_msg(int sock, thumbMsg *msg) MS_SAFE_FREE(buf); - if(msg->msg_type == MS_MSG_THUMB_EXTRACT_ALL_DONE || msg->msg_type == 5) { + if (msg->msg_type == MS_MSG_THUMB_EXTRACT_ALL_DONE || msg->msg_type == 5) { MS_DBG("msg_type only cases [%d]", msg->msg_type); return MS_MEDIA_ERR_NONE; } if (msg->origin_path_size <= 0 || msg->origin_path_size > MS_FILE_PATH_LEN_MAX) { MS_SAFE_FREE(buf); - MS_DBG_ERR("msg->origin_path_size is invalid %d", msg->origin_path_size ); + MS_DBG_ERR("msg->origin_path_size is invalid %d", msg->origin_path_size); return MS_MEDIA_ERR_DATA_TAINTED; } MS_MALLOC(buf, (unsigned int)(msg->origin_path_size)); - if(buf == NULL) { + if (buf == NULL) { MS_DBG_STRERROR("malloc failed"); return MS_MEDIA_ERR_OUT_OF_MEMORY; } @@ -247,12 +247,12 @@ int _ms_thumb_recv_msg(int sock, thumbMsg *msg) if (msg->dest_path_size <= 0 || msg->dest_path_size > MS_FILE_PATH_LEN_MAX) { MS_SAFE_FREE(buf); - MS_DBG_ERR("msg->dest_path_size is invalid %d", msg->dest_path_size ); + MS_DBG_ERR("msg->dest_path_size is invalid %d", msg->dest_path_size); return MS_MEDIA_ERR_DATA_TAINTED; } MS_MALLOC(buf, (unsigned int)(msg->dest_path_size)); - if(buf == NULL) { + if (buf == NULL) { MS_DBG_ERR("malloc failed"); return MS_MEDIA_ERR_OUT_OF_MEMORY; } @@ -268,13 +268,13 @@ int _ms_thumb_recv_msg(int sock, thumbMsg *msg) if (msg->thumb_size < 0) { MS_SAFE_FREE(buf); - MS_DBG_ERR("msg->thumb_size is invalid %d", msg->thumb_size ); + MS_DBG_ERR("msg->thumb_size is invalid %d", msg->thumb_size); return MS_MEDIA_ERR_DATA_TAINTED; } - if(msg->thumb_size > 0) { + if (msg->thumb_size > 0) { MS_MALLOC(buf, (unsigned int)(msg->thumb_size)); - if(buf == NULL) { + if (buf == NULL) { MS_DBG_ERR("malloc failed"); return MS_MEDIA_ERR_OUT_OF_MEMORY; } @@ -287,7 +287,7 @@ int _ms_thumb_recv_msg(int sock, thumbMsg *msg) MS_SAFE_FREE(msg->thumb_data); MS_MALLOC(msg->thumb_data, (unsigned int)(msg->thumb_size)); - if(msg->thumb_data == NULL) { + if (msg->thumb_data == NULL) { MS_DBG_ERR("malloc failed"); MS_SAFE_FREE(buf); return MS_MEDIA_ERR_OUT_OF_MEMORY; @@ -321,7 +321,7 @@ int _ms_thumb_set_buffer(thumbMsg *req_msg, unsigned char **buf, int *buf_size) size = header_size + org_path_len + dst_path_len + data_len; MS_MALLOC(*buf, size); - if(*buf == NULL) { + if (*buf == NULL) { MS_DBG_STRERROR("MALLOC failed"); return -1; } @@ -329,7 +329,7 @@ int _ms_thumb_set_buffer(thumbMsg *req_msg, unsigned char **buf, int *buf_size) memcpy(*buf, req_msg, header_size); memcpy((*buf)+header_size, req_msg->org_path, org_path_len); memcpy((*buf)+header_size + org_path_len, req_msg->dst_path, dst_path_len); - if(data_len > 0) + if (data_len > 0) memcpy((*buf)+header_size + org_path_len + dst_path_len, req_msg->thumb_data, data_len); *buf_size = size; @@ -384,9 +384,9 @@ gboolean _ms_thumb_agent_recv_thumb_done_from_server(GIOChannel *src, GIOConditi /* Once all-thumb extraction is done, check if there is queued all-thumb request */ GSource *check_queued_all_thumb_request = NULL; - check_queued_all_thumb_request = g_idle_source_new (); - g_source_set_callback (check_queued_all_thumb_request, _ms_thumb_check_queued_request, NULL, NULL); - g_source_attach (check_queued_all_thumb_request, g_main_context_get_thread_default()); + check_queued_all_thumb_request = g_idle_source_new(); + g_source_set_callback(check_queued_all_thumb_request, _ms_thumb_check_queued_request, NULL, NULL); + g_source_attach(check_queued_all_thumb_request, g_main_context_get_thread_default()); if (g_thumb_server_extracting == FALSE) { MS_DBG_WARN("Recv thumb server extracting done already"); @@ -616,7 +616,7 @@ gboolean _ms_thumb_request_to_server(gpointer data) } if (g_folk_thumb_server == FALSE && g_thumb_server_extracting == FALSE) { -// if(_ms_thumb_check_process() == FALSE) { // This logic is temporary +// if (_ms_thumb_check_process() == FALSE) { // This logic is temporary MS_DBG_WARN("Thumb server is not running.. so start it"); if (!_ms_thumb_agent_execute_server()) { MS_DBG_ERR("_ms_thumb_agent_execute_server is failed"); @@ -647,7 +647,7 @@ gboolean _ms_thumb_request_to_server(gpointer data) client_sock = req->client_sock; recv_msg = req->recv_msg; - if (req->client_sock <=0 || req->recv_msg == NULL) { + if (req->client_sock <= 0 || req->recv_msg == NULL) { MS_DBG_ERR("client sock is below 0 or recv msg is NULL"); MS_SAFE_FREE(req->recv_msg); MS_SAFE_FREE(req); @@ -707,8 +707,8 @@ gboolean _ms_thumb_request_to_server(gpointer data) unsigned char *buf = NULL; _ms_thumb_set_buffer(&res_msg, &buf, &buf_size); - while(buf_size > 0) { - if(buf_size < MS_SOCK_BLOCK_SIZE) { + while (buf_size > 0) { + if (buf_size < MS_SOCK_BLOCK_SIZE) { block_size = buf_size; } if (send(client_sock, buf+sending_block, block_size, 0) != block_size) { @@ -716,11 +716,11 @@ gboolean _ms_thumb_request_to_server(gpointer data) } sending_block += block_size; buf_size -= block_size; - if(block_size < MS_SOCK_BLOCK_SIZE) { + if (block_size < MS_SOCK_BLOCK_SIZE) { block_size = MS_SOCK_BLOCK_SIZE; } } - if(buf_size == 0) { + if (buf_size == 0) { MS_DBG_SLOG("Sent data(%d) from %s", res_msg.thumb_size, res_msg.org_path); } @@ -780,7 +780,7 @@ gboolean _ms_thumb_agent_read_socket(GIOChannel *src, MS_DBG_ERR("credential information error"); } - if ( getuid() != cr.uid ){ + if (getuid() != cr.uid) { recv_msg->uid = cr.uid; } @@ -838,10 +838,10 @@ gboolean _ms_thumb_agent_read_socket(GIOChannel *src, if (!g_queue_work) { GSource *src_request = NULL; - src_request = g_idle_source_new (); - g_source_set_callback (src_request, _ms_thumb_request_to_server, NULL, NULL); + src_request = g_idle_source_new(); + g_source_set_callback(src_request, _ms_thumb_request_to_server, NULL, NULL); //g_source_set_priority(src_request, G_PRIORITY_LOW); - g_source_attach (src_request, g_main_context_get_thread_default()); + g_source_attach(src_request, g_main_context_get_thread_default()); g_queue_work = 1; } @@ -867,12 +867,12 @@ int ms_thumb_get_config() dictionary *dict = NULL; dict = iniparser_load(MS_INI_DEFAULT_PATH); - if(!dict) { + if (!dict) { MS_DBG_ERR("%s load failed", MS_INI_DEFAULT_PATH); return -1; } - MS_INI_GET_INT(dict, "media-content-config:thumbnail_activation",g_thumb_server_active, 0); + MS_INI_GET_INT(dict, "media-content-config:thumbnail_activation", g_thumb_server_active, 0); MS_DBG("Thumb-server activation level = %d", g_thumb_server_active); iniparser_freedict(dict); -- 2.7.4