Update code to reduce Cyclomatic Complexity and DC

Change-Id: I9e6636d2c1f5ecc8878ae2c28760ee808a6a00d0

diff --git a/include/dcm_svc_main.h b/include/dcm_svc_main.h
deleted file mode 100755 (executable)
index 7021af4..0000000
--- a/include/dcm_svc_main.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#ifndef _DCM_MAIN_SVC_H_
-#define _DCM_MAIN_SVC_H_
-
-#include <glib.h>
-
-#ifndef EXPORT_API
-#define EXPORT_API __attribute__ ((visibility("default")))
-#endif
-
-#endif /* _DCM_MAIN_SVC_H_ */
-

diff --git a/libdcm-face/dcm-face.c b/libdcm-face/dcm-face.c
index 92784b739f03e7ffa29dc333e4e8baa4ddaa4e3e..e02e42950986e84cbb692fd60c9561c05b8b849f 100755 (executable)
--- a/libdcm-face/dcm-face.c
+++ b/libdcm-face/dcm-face.c
@@ -22,7 +22,7 @@
 #define FACE_MAGIC_VALID       (0xFF993311)
 #define FACE_MAGIC_INVALID     (0x393A3B3C)
 
-EXPORT_API int dcm_face_create(__inout dcm_face_h *handle)
+int dcm_face_create(__inout dcm_face_h *handle)
 {
        int ret = MS_MEDIA_ERR_NONE;
 
@@ -47,7 +47,7 @@ EXPORT_API int dcm_face_create(__inout dcm_face_h *handle)
        return ret;
 }
 
-EXPORT_API int dcm_face_destroy(__in dcm_face_h handle)
+int dcm_face_destroy(__in dcm_face_h handle)
 {
        int ret = MS_MEDIA_ERR_NONE;
        dcm_info("face destroy. handle=%p", handle);
@@ -70,7 +70,7 @@ EXPORT_API int dcm_face_destroy(__in dcm_face_h handle)
        return ret;
 }
 
-EXPORT_API int dcm_face_set_image_info(dcm_face_h handle, face_image_colorspace_e colorspace, unsigned char *buffer, unsigned int width, unsigned int height, size_t size)
+int dcm_face_set_image_info(dcm_face_h handle, face_image_colorspace_e colorspace, unsigned char *buffer, unsigned int width, unsigned int height, size_t size)
 {
        FaceHandleT *_handle = (FaceHandleT *)handle;
        unsigned char *data = NULL;
@@ -120,7 +120,7 @@ EXPORT_API int dcm_face_set_image_info(dcm_face_h handle, face_image_colorspace_
        return MS_MEDIA_ERR_NONE;
 }
 
-EXPORT_API int dcm_face_get_face_info(__in dcm_face_h handle, __out face_info_s *face_info)
+int dcm_face_get_face_info(__in dcm_face_h handle, __out face_info_s *face_info)
 {
        int ret = MS_MEDIA_ERR_NONE;
 
@@ -138,7 +138,7 @@ EXPORT_API int dcm_face_get_face_info(__in dcm_face_h handle, __out face_info_s
        return ret;
 }
 
-EXPORT_API int dcm_face_destroy_face_info(face_info_s *face_info)
+int dcm_face_destroy_face_info(face_info_s *face_info)
 {
        dcm_retvm_if(face_info == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid face_info");
 

diff --git a/src/dcm_svc_db.c b/src/dcm_svc_db.c
index ecf8544c630398a5ecec4b96e1b5bc809902aecb..ead50545461dc350b7a0af7914fcbc6a8400a68d 100755 (executable)
--- a/src/dcm_svc_db.c
+++ b/src/dcm_svc_db.c
@@ -33,7 +33,6 @@
 #define INSERT_FACE_ITEM_TO_DB "INSERT OR IGNORE INTO " DB_TABLE_FACE" (" FACE_ITEM") VALUES ('%q', %d, %d, %d, %d, %d);"
 #define SELECT_FACE_COUNT_BY_MEDIA_ID          "SELECT COUNT(*) FROM " DB_TABLE_FACE" WHERE media_id = '%q';"
 
-static GMutex gMutexLock;
 static sqlite3 *db_handle;
 static uid_t dcm_uid;
 
@@ -145,57 +144,51 @@ int dcm_svc_db_get_scan_image_info_by_path(const char *file_path, dcm_svc_item_s
        return ret;
 }
 
-int dcm_svc_db_insert_face_to_db(const char *media_uuid, unsigned int x, unsigned int y, unsigned int w, unsigned int h, int orientation)
+static int __request_update_db(const char* query_string)
 {
        int ret = MS_MEDIA_ERR_NONE;
-       char* query_string = NULL;
-
-       dcm_debug_fenter();
 
-       dcm_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid db_handle");
-       dcm_retvm_if(media_uuid == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid media_uuid");
+       dcm_retvm_if(!db_handle, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid db_handle");
+       dcm_retvm_if(!query_string, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid query_string");
 
-       query_string = sqlite3_mprintf(INSERT_FACE_ITEM_TO_DB, media_uuid, x, y, w, h, orientation);
-       dcm_debug("query[%s]", query_string);
+       dcm_sec_debug("query[%s]", query_string);
 
-       g_mutex_trylock(&gMutexLock);
        ret = media_db_request_update_db(query_string, dcm_uid);
        if (ret != MS_MEDIA_ERR_NONE)
-               dcm_error("media_db_request_update_db fail = %d, %s", ret, sqlite3_errmsg((sqlite3 *)db_handle));
-
-       g_mutex_unlock(&gMutexLock);
-
-       DCM_SQLITE3_FREE(query_string);
+               dcm_error("fail to media_db_request_update_db[%d] [%s]", ret, sqlite3_errmsg((sqlite3 *)db_handle));
 
        dcm_debug_fleave();
 
        return ret;
 }
 
-int dcm_svc_db_insert_face_to_face_scan_list(dcm_svc_item_s *scan_item)
+int dcm_svc_db_insert_face_to_db(const char *media_uuid, unsigned int x, unsigned int y, unsigned int w, unsigned int h, int orientation)
 {
        int ret = MS_MEDIA_ERR_NONE;
        char* query_string = NULL;
 
-       dcm_debug_fenter();
+       dcm_retvm_if(!media_uuid, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid media_uuid");
 
-       dcm_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid db_handle");
-       dcm_retvm_if(scan_item == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid scan_item");
-       dcm_retvm_if(scan_item->media_uuid == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid media_uuid");
+       query_string = sqlite3_mprintf(INSERT_FACE_ITEM_TO_DB, media_uuid, x, y, w, h, orientation);
 
-       query_string = sqlite3_mprintf("INSERT OR REPLACE INTO %s (media_id, modified_time) values('%q', %d)", DB_TABLE_FACE_SCAN_LIST, scan_item->media_uuid, scan_item->modified_time);
-       dcm_debug("query[%s]", query_string);
+       ret = __request_update_db(query_string);
+       DCM_SQLITE3_FREE(query_string);
 
-       g_mutex_trylock(&gMutexLock);
-       ret = media_db_request_update_db(query_string, dcm_uid);
-       if (ret != MS_MEDIA_ERR_NONE)
-               dcm_error("media_db_request_update_db is failed: %d, %s", ret, sqlite3_errmsg((sqlite3 *)db_handle));
+       return ret;
+}
 
-       g_mutex_unlock(&gMutexLock);
+int dcm_svc_db_insert_face_to_face_scan_list(dcm_svc_item_s *scan_item)
+{
+       int ret = MS_MEDIA_ERR_NONE;
+       char* query_string = NULL;
 
-       DCM_SQLITE3_FREE(query_string);
+       dcm_retvm_if(!scan_item, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid scan_item");
+       dcm_retvm_if(!scan_item->media_uuid, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid media_uuid");
 
-       dcm_debug_fleave();
+       query_string = sqlite3_mprintf("INSERT OR REPLACE INTO %s (media_id, modified_time) values('%q', %d)", DB_TABLE_FACE_SCAN_LIST, scan_item->media_uuid, scan_item->modified_time);
+
+       ret = __request_update_db(query_string);
+       DCM_SQLITE3_FREE(query_string);
 
        return ret;
 }
@@ -205,25 +198,13 @@ int dcm_svc_db_delete_face_from_db(const char *media_uuid)
        int ret = MS_MEDIA_ERR_NONE;
        char* query_string = NULL;
 
-       dcm_debug_fenter();
-
-       dcm_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid db_handle");
-       dcm_retvm_if(media_uuid == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid media_uuid");
+       dcm_retvm_if(!media_uuid, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid media_uuid");
 
        query_string = sqlite3_mprintf("DELETE FROM %s WHERE media_id='%q'", DB_TABLE_FACE, media_uuid);
-       dcm_sec_debug("query[%s]", query_string);
-
-       g_mutex_trylock(&gMutexLock);
-       ret = media_db_request_update_db(query_string, dcm_uid);
-       if (ret != MS_MEDIA_ERR_NONE)
-               dcm_error("media_db_request_update_db is failed: %d, %s", ret, sqlite3_errmsg((sqlite3 *)db_handle));
-
-       g_mutex_unlock(&gMutexLock);
 
+       ret = __request_update_db(query_string);
        DCM_SQLITE3_FREE(query_string);
 
-       dcm_debug_fleave();
-
        return ret;
 }
 

diff --git a/svc/dcm_svc_main.c b/svc/dcm_svc_main.c
index 2c759816bdccdaf91d55ec0eedd60bc51e838f9c..89f2492e727bb429bfd2b48412f86c48d61e9b77 100755 (executable)
--- a/svc/dcm_svc_main.c
+++ b/svc/dcm_svc_main.c
@@ -19,13 +19,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include <dcm_svc_main.h>
 #include <dcm_svc_ipc.h>
 #include <dcm_svc_internal.h>
 #include <dcm_svc_debug.h>
 #include <dcm_svc_detect_face.h>
 
-GMainLoop *g_dcm_svc_mainloop;
+static GMainLoop *g_dcm_svc_mainloop;
 
 gboolean __dcm_svc_kill_service()
 {
@@ -98,7 +97,7 @@ gboolean dcm_service_recieve_request(GIOChannel *src, GIOCondition condition, gp
        return TRUE;
 }
 
-EXPORT_API int main(int argc, char *argv[])
+int main(int argc, char *argv[])
 {
        int sockfd = -1;
        GSource *source = NULL;