summaryrefslogtreecommitdiff
path: root/src/util
diff options
context:
space:
mode:
authorMinje Ahn <minje.ahn@samsung.com>2015-06-08 03:43:27 (GMT)
committerMinje Ahn <minje.ahn@samsung.com>2015-06-08 06:22:41 (GMT)
commit9c534f334a71a5250c9411cc53c83cd72e3b7e74 (patch)
treecca701a14ae87449dab7de9e8ccbec23c6312554 /src/util
parentbe3906afcd5d61009fa339b320305b04b5e89c64 (diff)
downloadlibmedia-thumbnail-9c534f334a71a5250c9411cc53c83cd72e3b7e74.zip
libmedia-thumbnail-9c534f334a71a5250c9411cc53c83cd72e3b7e74.tar.gz
libmedia-thumbnail-9c534f334a71a5250c9411cc53c83cd72e3b7e74.tar.bz2
Remove unused code.refs/changes/58/40658/2
Change-Id: I9c8d472cff513d88c90b9558201d20f2fbad05c2 Signed-off-by: Minje Ahn <minje.ahn@samsung.com>
Diffstat (limited to 'src/util')
-rwxr-xr-xsrc/util/media-thumb-db.c133
-rwxr-xr-xsrc/util/media-thumb-debug.c1
-rwxr-xr-xsrc/util/media-thumb-util.c12
3 files changed, 9 insertions, 137 deletions
diff --git a/src/util/media-thumb-db.c b/src/util/media-thumb-db.c
index 664cc47..275a98e 100755
--- a/src/util/media-thumb-db.c
+++ b/src/util/media-thumb-db.c
@@ -28,12 +28,7 @@
#include <unistd.h>
#include <util-func.h>
-
-#ifdef _USE_MEDIA_UTIL_
static __thread MediaDBHandle *db_handle;
-#else
-static __thread sqlite3 *db_handle;
-#endif
static int _media_thumb_busy_handler(void *pData, int count)
{
@@ -48,8 +43,7 @@ sqlite3 *_media_thumb_db_get_handle()
return db_handle;
}
-int
-_media_thumb_sqlite_connect(sqlite3 **handle)
+int _media_thumb_sqlite_connect(sqlite3 **handle)
{
int err = MS_MEDIA_ERR_NONE;
@@ -81,8 +75,7 @@ _media_thumb_sqlite_connect(sqlite3 **handle)
return MS_MEDIA_ERR_NONE;
}
-int
-_media_thumb_sqlite_disconnect(sqlite3 *handle)
+int _media_thumb_sqlite_disconnect(sqlite3 *handle)
{
int err = MS_MEDIA_ERR_NONE;
if (handle != NULL) {
@@ -258,42 +251,17 @@ int _media_thumb_update_thumb_path_to_db(sqlite3 *handle,
thumbpath_string = sqlite3_mprintf("%s", thumb_path);
query_string = sqlite3_mprintf(UPDATE_THUMB_BY_PATH, thumbpath_string, path_string);
-#ifndef _USE_MEDIA_UTIL_
- char *err_msg = NULL;
- err = sqlite3_exec(handle, query_string, NULL, NULL, &err_msg);
-
- thumb_dbg("Query : %s", query_string);
-
- sqlite3_free(query_string);
- sqlite3_free(thumbpath_string);
- sqlite3_free(path_string);
-
- if (SQLITE_OK != err) {
- if (err_msg) {
- thumb_err("Failed to query[ %s ]", err_msg);
- sqlite3_free(err_msg);
- err_msg = NULL;
- }
-
- return MS_MEDIA_ERR_DB_UPDATE_FAIL;
- }
-
- if (err_msg)
- sqlite3_free(err_msg);
-#else
err = media_db_request_update_db(query_string, uid);
if (err < 0) {
thumb_err("media_db_request_update_db failed : %d", err);
return err;
}
-#endif
thumb_dbg("Query success");
return MS_MEDIA_ERR_NONE;
}
-int
-_media_thumb_update_wh_to_db(sqlite3 *handle,
+int _media_thumb_update_wh_to_db(sqlite3 *handle,
const char *origin_path,
int width,
int height,
@@ -311,34 +279,11 @@ _media_thumb_update_wh_to_db(sqlite3 *handle,
path_string = sqlite3_mprintf("%s", origin_path);
query_string = sqlite3_mprintf(UPDATE_WH_BY_PATH, width, height, path_string);
-#ifndef _USE_MEDIA_UTIL_
- char *err_msg = NULL;
- err = sqlite3_exec(handle, query_string, NULL, NULL, &err_msg);
-
- thumb_dbg("Query : %s", query_string);
-
- sqlite3_free(query_string);
- sqlite3_free(path_string);
-
- if (SQLITE_OK != err) {
- if (err_msg) {
- thumb_err("Failed to query[ %s ]", err_msg);
- sqlite3_free(err_msg);
- err_msg = NULL;
- }
-
- return MS_MEDIA_ERR_DB_UPDATE_FAIL;
- }
-
- if (err_msg)
- sqlite3_free(err_msg);
-#else
err = media_db_request_update_db(query_string, uid);
if (err != MS_MEDIA_ERR_NONE) {
thumb_err("media_db_request_update_db failed : %d", err);
return err;
}
-#endif
thumb_dbg("Query success");
return err;
@@ -377,61 +322,27 @@ int _media_thumb_update_thumb_path_wh_to_db(sqlite3 *handle,
int _media_thumb_db_connect(uid_t uid)
{
int err = MS_MEDIA_ERR_NONE;
-/*
- err = media_svc_connect(&mb_svc_handle);
- if (err != MS_MEDIA_ERR_NONE) {
- thumb_err("media_svc_connect failed: %d", err);
- mb_svc_handle = NULL;
- return err;
- }
-*/
-#ifndef _USE_MEDIA_UTIL_
- err = _media_thumb_sqlite_connect(&db_handle);
- if (err != MS_MEDIA_ERR_NONE) {
- thumb_err("_media_thumb_sqlite_connect failed: %d", err);
- db_handle = NULL;
- return err;
- }
-#else
+
err = media_db_connect(&db_handle,uid);
if (err != MS_MEDIA_ERR_NONE) {
thumb_err("media_db_connect failed: %d", err);
db_handle = NULL;
return MS_MEDIA_ERR_DB_CONNECT_FAIL;
}
-#endif
return MS_MEDIA_ERR_NONE;
}
-int
-_media_thumb_db_disconnect()
+int _media_thumb_db_disconnect()
{
int err = MS_MEDIA_ERR_NONE;
-/*
- err = media_svc_disconnect(mb_svc_handle);
- if (err != MS_MEDIA_ERR_NONE) {
- thumb_err("media_svc_disconnect failed: %d", err);
- }
-
- mb_svc_handle = NULL;
-*/
-#ifndef _USE_MEDIA_UTIL_
- err = _media_thumb_sqlite_disconnect(db_handle);
- if (err != MS_MEDIA_ERR_NONE) {
- thumb_err("_media_thumb_sqlite_disconnect failed: %d", err);
- db_handle = NULL;
- return err;
- }
-#else
err = media_db_disconnect(db_handle);
if (err != MS_MEDIA_ERR_NONE) {
thumb_err("media_db_disconnect failed: %d", err);
db_handle = NULL;
return MS_MEDIA_ERR_DB_CONNECT_FAIL;
}
-#endif
db_handle = NULL;
return err;
@@ -525,40 +436,8 @@ int _media_thumb_update_db(const char *origin_path,
uid_t uid)
{
int err = MS_MEDIA_ERR_NONE;
-
-#if 0
- Mitem *item = NULL;
-
- err = minfo_get_item(mb_svc_handle, origin_path, &item);
- if (err != MS_MEDIA_ERR_NONE) {
- thumb_err("minfo_get_item (%s) failed: %d", origin_path, err);
- return err;
- }
-
- err = minfo_update_media_thumb(mb_svc_handle, item->uuid, thumb_path);
- if (err != MS_MEDIA_ERR_NONE) {
- thumb_err("minfo_update_media_thumb (ID:%s, %s) failed: %d",
- item->uuid, thumb_path, err);
- minfo_destroy_mtype_item(item);
- return err;
- }
-
- if (item->type == MINFO_ITEM_IMAGE) {
- err = minfo_update_image_meta_info_int(mb_svc_handle, item->uuid,
- MINFO_IMAGE_META_WIDTH, width,
- MINFO_IMAGE_META_HEIGHT, height, -1);
-
- if (err != MS_MEDIA_ERR_NONE) {
- thumb_err("minfo_update_image_meta_info_int failed: %d", err);
- minfo_destroy_mtype_item(item);
- return err;
- }
- }
-
- err = minfo_destroy_mtype_item(item);
-#endif
-
int media_type = THUMB_NONE_TYPE;
+
err = _media_thumb_get_type_from_db(db_handle, origin_path, &media_type);
if (err < 0) {
thumb_err("_media_thumb_get_type_from_db (%s) failed: %d", origin_path, err);
diff --git a/src/util/media-thumb-debug.c b/src/util/media-thumb-debug.c
index b684aa4..ab75286 100755
--- a/src/util/media-thumb-debug.c
+++ b/src/util/media-thumb-debug.c
@@ -109,4 +109,3 @@ thumb_print_debug_time_ex(long start, long end, const char *func_name,
totaltime);
#endif
}
-
diff --git a/src/util/media-thumb-util.c b/src/util/media-thumb-util.c
index 2f0fef0..ed9c0c7 100755
--- a/src/util/media-thumb-util.c
+++ b/src/util/media-thumb-util.c
@@ -169,14 +169,9 @@ _media_thumb_get_file_type(const char *file_full_path)
int _media_thumb_get_store_type_by_path(const char *full_path)
{
if (full_path != NULL) {
- if (strncmp
- (full_path, THUMB_PATH_PHONE,
- strlen(THUMB_PATH_PHONE)) == 0) {
+ if (strncmp(full_path, THUMB_PATH_PHONE, strlen(THUMB_PATH_PHONE)) == 0) {
return THUMB_PHONE;
- } else
- if (strncmp
- (full_path, THUMB_PATH_MMC,
- strlen(THUMB_PATH_MMC)) == 0) {
+ } else if (strncmp(full_path, THUMB_PATH_MMC, strlen(THUMB_PATH_MMC)) == 0) {
return THUMB_MMC;
}
}
@@ -292,8 +287,7 @@ static char* _media_thumb_phone_get_path(uid_t uid)
return result_psswd;
}
-int
-_media_thumb_get_hash_name(const char *file_full_path,
+int _media_thumb_get_hash_name(const char *file_full_path,
char *thumb_hash_path, size_t max_thumb_path, uid_t uid)
{
char *hash_name;