Fix error handling issues

Change-Id: I13a024b76a345b3fcb167009774a28fc2687e575
Signed-off-by: hyunho <hhstark.kang@samsung.com>

diff --git a/watchface-common/watchface-util.cc b/watchface-common/watchface-util.cc
index 1816ca7..4493fd7 100644 (file)
--- a/watchface-common/watchface-util.cc
+++ b/watchface-common/watchface-util.cc
@@ -555,9 +555,7 @@ out:
       return false;
     }
     db_.reset(db);
-    Exec("PRAGMA foreign_keys = ON");
-
-    return true;
+    return Exec("PRAGMA foreign_keys = ON");
   }
 
   bool DBHelper::Open(int mode) {
@@ -572,9 +570,7 @@ out:
       return false;
     }
     db_.reset(db);
-    Exec("PRAGMA foreign_keys = ON");
-
-    return true;
+    return Exec("PRAGMA foreign_keys = ON");
   }
 
   void DBHelper::Close() {
@@ -608,7 +604,7 @@ out:
 
   int DBHelper::Step() const {
     int ret = sqlite3_step(stmt_.get());
-    if (ret != SQLITE_DONE || ret != SQLITE_ROW)
+    if (ret != SQLITE_DONE && ret != SQLITE_ROW)
       LOGE("step error: %s", sqlite3_errmsg(db_.get()));
     return ret;
   }