Move db initialize func and make deinit func

Change-Id: Ice552ae31b75f2533a1c995990feb50c788ce0f1
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>

diff --git a/vcore/server/include/cert-server-db.h b/vcore/server/include/cert-server-db.h
index 29e8531..f73ec9e 100644 (file)
--- a/vcore/server/include/cert-server-db.h
+++ b/vcore/server/include/cert-server-db.h
@@ -23,12 +23,13 @@
 #ifndef CERT_SERVER_DB_H_
 #define CERT_SERVER_DB_H_
 
-#include <db-util.h>
-
+#include <sqlite3.h>
 #include <cert-svc/cerror.h>
 
 extern sqlite3 *cert_store_db;
 
+int initialize_db(void);
+void deinitialize_db(void);
 int execute_insert_update_query(const char *query);
 int execute_select_query(const char *query, sqlite3_stmt **stmt);
 

diff --git a/vcore/server/src/cert-server-db.c b/vcore/server/src/cert-server-db.c
index f0fd863..e5ff2ed 100644 (file)
--- a/vcore/server/src/cert-server-db.c
+++ b/vcore/server/src/cert-server-db.c
@@ -14,18 +14,44 @@
  *  limitations under the License.
  */
 /**
- * @file     cert-server-main.c
+ * @file     cert-server-db.c
  * @author   Kyungwook Tak (k.tak@samsung.com)
  * @version  1.0
  * @brief    cert server db utils.
  */
 
+#include <db-util.h>
 #include <cert-server-debug.h>
-
 #include <cert-server-db.h>
 
 sqlite3 *cert_store_db = NULL;
 
+int initialize_db(void)
+{
+       int result = CERTSVC_SUCCESS;
+
+       if (cert_store_db != NULL)
+               return CERTSVC_SUCCESS;
+
+       result = db_util_open(CERTSVC_SYSTEM_STORE_DB, &cert_store_db, 0);
+       if (result != SQLITE_OK) {
+               SLOGE("opening %s failed!", CERTSVC_SYSTEM_STORE_DB);
+               cert_store_db = NULL;
+               return CERTSVC_FAIL;
+       }
+
+       return CERTSVC_SUCCESS;
+}
+
+void deinitialize_db(void)
+{
+       if (cert_store_db == NULL)
+               return;
+
+       db_util_close(cert_store_db);
+       cert_store_db = NULL;
+}
+
 int execute_insert_update_query(const char *query)
 {
        if (!cert_store_db) {

diff --git a/vcore/server/src/cert-server-logic.c b/vcore/server/src/cert-server-logic.c
index 6c705f8..02a43e0 100644 (file)
--- a/vcore/server/src/cert-server-logic.c
+++ b/vcore/server/src/cert-server-logic.c
@@ -21,6 +21,8 @@
  * @brief    cert-server logic.
  */
 
+#include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git a/vcore/server/src/cert-server-main.c b/vcore/server/src/cert-server-main.c
index 208285f..aa11454 100644 (file)
--- a/vcore/server/src/cert-server-main.c
+++ b/vcore/server/src/cert-server-main.c
@@ -21,6 +21,7 @@
  * @brief    cert-svc server.
  */
 
+#include <stdlib.h>
 #include <signal.h>
 #include <unistd.h>
 #include <errno.h>
@@ -40,66 +41,12 @@
 #include <cert-server-logic.h>
 #include <cert-server-db.h>
 
-int initialize_db(void)
-{
-       int result = CERTSVC_SUCCESS;
-
-       if (cert_store_db != NULL)
-               return CERTSVC_SUCCESS;
-
-       result = db_util_open(CERTSVC_SYSTEM_STORE_DB, &cert_store_db, 0);
-       if (result != SQLITE_OK) {
-               SLOGE("connect certs-meta db failed!");
-               cert_store_db = NULL;
-               return CERTSVC_FAIL;
-       }
-
-       return CERTSVC_SUCCESS;
-}
-
-int evaluate_query(sqlite3 *db_handle, char *query)
-{
-       int result = CERTSVC_SUCCESS;
-       sqlite3_stmt *stmt = NULL;
-
-       if (!db_handle) {
-               SLOGE("Database not initialized.");
-               return CERTSVC_WRONG_ARGUMENT;
-       }
-
-       if (!query) {
-               SLOGE("Query is NULL.");
-               return CERTSVC_WRONG_ARGUMENT;
-       }
-
-       result = sqlite3_prepare_v2(db_handle, query, strlen(query), &stmt, NULL);
-       if (result != SQLITE_OK) {
-               SLOGE("Sqlite3 error [%d] : <%s> preparing <%s> query.", result, sqlite3_errmsg(db_handle), query);
-               return CERTSVC_FAIL;
-       }
-
-       result = sqlite3_step(stmt);
-       if (result != SQLITE_DONE) {
-               SLOGE("Sqlite3 error [%d] : <%s> executing <%s> statement.", result, sqlite3_errmsg(db_handle), query);
-               return CERTSVC_FAIL;
-       }
-
-       result = sqlite3_finalize(stmt);
-       if (result != SQLITE_OK) {
-               SLOGE("Sqlite3 error [%d] : <%s> finalising <%s> statement.", result, sqlite3_errmsg(db_handle), query);
-               return CERTSVC_FAIL;
-       }
-
-       return CERTSVC_SUCCESS;
-}
-
 void CertSigHandler(int signo)
 {
        SLOGD("Got Signal %d, exiting now.", signo);
-       if (cert_store_db != NULL) {
-               sqlite3_close(cert_store_db);
-               cert_store_db = NULL;
-       }
+
+       deinitialize_db();
+
        exit(1);
 }
 
@@ -348,10 +295,7 @@ void CertSvcServerComm(void)
 Error_close_exit:
        close(server_sockfd);
 
-       if (cert_store_db) {
-               sqlite3_close(cert_store_db);
-               cert_store_db = NULL;
-       }
+       deinitialize_db();
 
        free(certListBuffer);
        free(certBlockBuffer);