Remove dependecy on libslp-db-util

DB open & close replaced with regular sqlite3 calls.

Change-Id: Idbfea53ec1a2f6140fa3db4544a0d7f4b6daddc0

diff --git a/packaging/cert-svc.spec b/packaging/cert-svc.spec
index 49459f0..41af415 100644 (file)
--- a/packaging/cert-svc.spec
+++ b/packaging/cert-svc.spec
@@ -18,7 +18,6 @@ BuildRequires: pkgconfig(libpcrecpp)
 BuildRequires: pkgconfig(xmlsec1)
 BuildRequires: pkgconfig(libxml-2.0)
 BuildRequires: pkgconfig(libxslt)
-BuildRequires: pkgconfig(db-util)
 BuildRequires: pkgconfig(libsystemd-daemon)
 BuildRequires: pkgconfig(key-manager)
 BuildRequires: pkgconfig(libtzplatform-config)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 94a9a59..b52cfe8 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -107,7 +107,6 @@ PKG_CHECK_MODULES(CERT_SERVER_DEP
     REQUIRED
     dlog
     sqlite3
-    db-util
     libsystemd-daemon
     key-manager
     )

diff --git a/src/server/src/cert-server-db.c b/src/server/src/cert-server-db.c
index aa8caa9..4943c24 100644 (file)
--- a/src/server/src/cert-server-db.c
+++ b/src/server/src/cert-server-db.c
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2016 - 2018 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.
@@ -20,7 +20,6 @@
  * @brief    cert server db utils.
  */
 
-#include <db-util.h>
 #include <cert-server-debug.h>
 #include <cert-server-db.h>
 
@@ -31,7 +30,7 @@ int initialize_db(void)
        if (cert_store_db != NULL)
                return CERTSVC_SUCCESS;
 
-       int result = db_util_open(CERTSVC_SYSTEM_STORE_DB, &cert_store_db, 0);
+       int result = sqlite3_open(CERTSVC_SYSTEM_STORE_DB, &cert_store_db);
 
        if (result != SQLITE_OK) {
                SLOGE("opening %s failed!", CERTSVC_SYSTEM_STORE_DB);
@@ -47,7 +46,7 @@ void deinitialize_db(void)
        if (cert_store_db == NULL)
                return;
 
-       db_util_close(cert_store_db);
+       sqlite3_close(cert_store_db);
        cert_store_db = NULL;
 }