Refactor db code to increase SAM score

Change-Id: I080dc2c315851b5f0166c20ef8bf9ac856ae6b3b
Signed-off-by: Abhay agarwal <ay.agarwal@samsung.com>

diff --git a/ua-daemon/include/ua-manager-database.h b/ua-daemon/include/ua-manager-database.h
index b579017..b022d2e 100644 (file)
--- a/ua-daemon/include/ua-manager-database.h
+++ b/ua-daemon/include/ua-manager-database.h
@@ -68,17 +68,6 @@ extern "C" {
        } \
 } while (0)
 
-#define DB_CHECK(expr) do { \
-       if (expr) { \
-               UAM_ERR("(%s) return", #expr); \
-               unlink(DATABASE_FULL_PATH); \
-               database = NULL; \
-               /* Reopen database */ \
-               retv_if(SQLITE_OK != __uam_db_open(), UAM_ERROR_DB_FAILED); \
-               __uam_db_prepare_table(); \
-       } \
-} while (0)
-
 /* Helper Functions */
 int _uam_db_initialize_once(void);
 

diff --git a/ua-daemon/src/.ua-manager-db.c.swp b/ua-daemon/src/.ua-manager-db.c.swp
deleted file mode 100644 (file)
index 97ebf61..0000000
Binary files a/ua-daemon/src/.ua-manager-db.c.swp and /dev/null differ

diff --git a/ua-daemon/src/ua-manager-common.c b/ua-daemon/src/ua-manager-common.c
index 7989aae..ae8a26e 100644 (file)
--- a/ua-daemon/src/ua-manager-common.c
+++ b/ua-daemon/src/ua-manager-common.c
@@ -214,9 +214,12 @@ const char *_uam_get_sensor_str(uas_plugin_id_e ids)
 size_t _uam_get_file_size(const char* filename)
 {
        struct stat st;
+       size_t size;
 
        if (stat(filename, &st) != 0)
                return 0;
+       size = st.st_size;
+       UAM_DBG("File size: %zd", size);
 
-       return st.st_size;
+       return size;
 }