diff options
Diffstat (limited to 'src')
-rwxr-xr-x | src/include/util/media-thumb-db.h | 13 | ||||
-rwxr-xr-x | src/ipc/media-thumb-ipc.c | 37 |
2 files changed, 16 insertions, 34 deletions
diff --git a/src/include/util/media-thumb-db.h b/src/include/util/media-thumb-db.h index b3d2d71..6a5b64c 100755 --- a/src/include/util/media-thumb-db.h +++ b/src/include/util/media-thumb-db.h @@ -25,31 +25,22 @@ #ifndef _MEDIA_THUMB_DB_H_ #define _MEDIA_THUMB_DB_H_ -#define STRING_VALID(str) \ - ((str != NULL && strlen(str) > 0) ? TRUE : FALSE) +#define STRING_VALID(str) ((str != NULL && strlen(str) > 0) ? TRUE : FALSE) #define SELECT_THUMB_BY_PATH "SELECT thumbnail_path, width, height FROM media WHERE path='%q';" #define UPDATE_THUMB_BY_PATH "UPDATE media SET thumbnail_path = '%q' WHERE path='%q';" #define UPDATE_THUMB_WH_BY_PATH "UPDATE media SET thumbnail_path = '%q', width=%d,height=%d WHERE path='%q';" sqlite3 *_media_thumb_db_get_handle(); - int _media_thumb_db_connect(uid_t uid); - int _media_thumb_db_disconnect(); - int _media_thumb_get_thumb_from_db_with_size(const char *origin_path, char *thumb_path, int max_length, int *need_update_db, int *width, int *height); - -int _media_thumb_update_db(const char *origin_path, - char *thumb_path, - int width, - int height, - uid_t uid); +int _media_thumb_update_db(const char *origin_path, char *thumb_path, int width, int height, uid_t uid); #endif /*_MEDIA_THUMB_DB_H_*/ diff --git a/src/ipc/media-thumb-ipc.c b/src/ipc/media-thumb-ipc.c index 3238092..e86658c 100755 --- a/src/ipc/media-thumb-ipc.c +++ b/src/ipc/media-thumb-ipc.c @@ -545,27 +545,24 @@ _media_thumb_request(int msg_type, const char *origin_path, char *thumb_path, in { int sock = -1; struct sockaddr_un serv_addr; - ms_sock_info_s sock_info; int recv_str_len = 0; int err = MS_MEDIA_ERR_NONE; int pid; - sock_info.port = MS_THUMB_CREATOR_PORT; - err = ms_ipc_create_client_socket(MS_TIMEOUT_SEC_10, &sock_info); + err = ms_ipc_create_client_socket(MS_TIMEOUT_SEC_10, &sock); if (err != MS_MEDIA_ERR_NONE) { thumb_err("ms_ipc_create_client_socket failed"); return err; } memset(&serv_addr, 0, sizeof(serv_addr)); - sock = sock_info.sock_fd; serv_addr.sun_family = AF_UNIX; SAFE_STRLCPY(serv_addr.sun_path, THUMB_IPC_PATH, sizeof(serv_addr.sun_path)); /* Connecting to the thumbnail server */ if (connect(sock, (struct sockaddr*)&serv_addr, sizeof(serv_addr)) < 0) { thumb_stderror("connect"); - ms_ipc_delete_client_socket(&sock_info); + close(sock); return MS_MEDIA_ERR_SOCKET_CONN; } @@ -591,7 +588,7 @@ _media_thumb_request(int msg_type, const char *origin_path, char *thumb_path, in if (req_msg.origin_path_size > MAX_PATH_SIZE || req_msg.dest_path_size > MAX_PATH_SIZE) { thumb_err("path's length exceeds %d", MAX_PATH_SIZE); - ms_ipc_delete_client_socket(&sock_info); + close(sock); return MS_MEDIA_ERR_INVALID_PARAMETER; } @@ -605,7 +602,7 @@ _media_thumb_request(int msg_type, const char *origin_path, char *thumb_path, in if (send(sock, buf, buf_size, 0) != buf_size) { thumb_err("sendto failed: %d", errno); SAFE_FREE(buf); - ms_ipc_delete_client_socket(&sock_info); + close(sock); return MS_MEDIA_ERR_SOCKET_SEND; } @@ -615,14 +612,14 @@ _media_thumb_request(int msg_type, const char *origin_path, char *thumb_path, in if ((err = _media_thumb_recv_msg(sock, header_size, &recv_msg)) < 0) { thumb_err("_media_thumb_recv_msg failed "); - ms_ipc_delete_client_socket(&sock_info); + close(sock); return err; } recv_str_len = strlen(recv_msg.org_path); thumb_dbg_slog("recv %s(%d) from thumb daemon is successful", recv_msg.org_path, recv_str_len); - ms_ipc_delete_client_socket(&sock_info); + close(sock); if (recv_str_len > max_length) { thumb_err("user buffer is too small. Output's length is %d", recv_str_len); @@ -757,19 +754,16 @@ int _media_thumb_send_request() int err = MS_MEDIA_ERR_NONE; int sock = -1; struct sockaddr_un serv_addr; - ms_sock_info_s sock_info; thumbReq *req_manager = NULL; int pid; - sock_info.port = MS_THUMB_CREATOR_PORT; - err = ms_ipc_create_client_socket(MS_TIMEOUT_SEC_10, &sock_info); + err = ms_ipc_create_client_socket(MS_TIMEOUT_SEC_10, &sock); if (err != MS_MEDIA_ERR_NONE) { thumb_err("ms_ipc_create_client_socket failed"); return err; } memset(&serv_addr, 0, sizeof(serv_addr)); - sock = sock_info.sock_fd; serv_addr.sun_family = AF_UNIX; SAFE_STRLCPY(serv_addr.sun_path, THUMB_IPC_PATH, sizeof(serv_addr.sun_path)); @@ -787,7 +781,7 @@ int _media_thumb_send_request() g_io_channel_shutdown(channel, TRUE, NULL); g_io_channel_unref(channel); - ms_ipc_delete_client_socket(&sock_info); + close(sock); return err; } @@ -798,7 +792,7 @@ int _media_thumb_send_request() thumb_err("queue pop fail"); g_io_channel_shutdown(channel, TRUE, NULL); g_io_channel_unref(channel); - ms_ipc_delete_client_socket(&sock_info); + close(sock); return MS_MEDIA_ERR_INVALID_PARAMETER; } @@ -827,7 +821,7 @@ int _media_thumb_send_request() thumb_err("path's length exceeds %d", MAX_PATH_SIZE); g_io_channel_shutdown(channel, TRUE, NULL); g_io_channel_unref(channel); - ms_ipc_delete_client_socket(&sock_info); + close(sock); return MS_MEDIA_ERR_INVALID_PARAMETER; } @@ -841,7 +835,7 @@ int _media_thumb_send_request() g_source_destroy(g_main_context_find_source_by_id(g_main_context_get_thread_default(), source_id)); g_io_channel_shutdown(channel, TRUE, NULL); g_io_channel_unref(channel); - ms_ipc_delete_client_socket(&sock_info); + close(sock); return MS_MEDIA_ERR_SOCKET_SEND; } @@ -877,19 +871,16 @@ int _media_thumb_raw_data_send_request() int err = MS_MEDIA_ERR_NONE; int sock = -1; struct sockaddr_un serv_addr; - ms_sock_info_s sock_info; thumbRawReq *req_manager = NULL; int pid; - sock_info.port = MS_THUMB_CREATOR_PORT; - err = ms_ipc_create_client_socket(MS_TIMEOUT_SEC_10, &sock_info); + err = ms_ipc_create_client_socket(MS_TIMEOUT_SEC_10, &sock); if (err != MS_MEDIA_ERR_NONE) { thumb_err("ms_ipc_create_client_socket failed"); return err; } memset(&serv_addr, 0, sizeof(serv_addr)); - sock = sock_info.sock_fd; serv_addr.sun_family = AF_UNIX; SAFE_STRLCPY(serv_addr.sun_path, THUMB_IPC_PATH, sizeof(serv_addr.sun_path)); @@ -907,7 +898,7 @@ int _media_thumb_raw_data_send_request() g_io_channel_shutdown(channel, TRUE, NULL); g_io_channel_unref(channel); - ms_ipc_delete_client_socket(&sock_info); + close(sock); return err; } @@ -917,7 +908,7 @@ int _media_thumb_raw_data_send_request() thumb_err("queue pop fail"); g_io_channel_shutdown(channel, TRUE, NULL); g_io_channel_unref(channel); - ms_ipc_delete_client_socket(&sock_info); + close(sock); return MS_MEDIA_ERR_INVALID_PARAMETER; } |