From 78824b02a97188f012aaab41267551043766f58b Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 21 Aug 2017 09:29:05 +0200 Subject: [PATCH] fix(AbstractDb): unused variable when soci is not available --- src/db/abstract/abstract-db.cpp | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/src/db/abstract/abstract-db.cpp b/src/db/abstract/abstract-db.cpp index 158f76628..3235f0ec3 100644 --- a/src/db/abstract/abstract-db.cpp +++ b/src/db/abstract/abstract-db.cpp @@ -30,30 +30,25 @@ LINPHONE_BEGIN_NAMESPACE AbstractDb::AbstractDb (AbstractDbPrivate &p) : Object(*new AbstractDbPrivate) {} bool AbstractDb::connect (Backend backend, const std::string ¶meters) { - L_D(AbstractDb); - #ifdef SOCI_ENABLED + L_D(AbstractDb); + try { + if (d->isConnected) { + d->session.close(); + d->isConnected = false; + } - try { - if (d->isConnected) { - d->session.close(); - d->isConnected = false; + d->session.open(backend == Mysql ? "mysql" : "sqlite3", parameters); + init(); + } catch (const exception &e) { + return false; } - d->session.open(backend == Mysql ? "mysql" : "sqlite3", parameters); - init(); - } catch (const exception &e) { - return false; - } - - return true; - + return true; #else - - lWarning() << "Cannot use AbstractDb. Soci is not enabled."; - return false; - - #endif // ifndef SOCI_ENABLED + lWarning() << "Cannot use AbstractDb. Soci is not enabled."; + return false; + #endif // ifndef SOCI_ENABLED } bool AbstractDb::isConnected () const {