From 57fa71a9a2c17f2aa9b869f5ac8cb8b1f64fedd3 Mon Sep 17 00:00:00 2001 From: Habib Virji Date: Thu, 6 Oct 2016 14:33:25 +0100 Subject: [PATCH] Fix RD_SERVER flag Small fix for the build with RD_SERVER flag. Change-Id: I96eb60e05202635f595c3d1edc82aa634908c95b Signed-off-by: Habib Virji Reviewed-on: https://gerrit.iotivity.org/gerrit/12903 Tested-by: jenkins-iotivity Reviewed-by: Uze Choi Reviewed-on: https://gerrit.iotivity.org/gerrit/15705 Reviewed-by: Phil Coval Reviewed-by: Todd Malsbary Reviewed-by: Ziran Sun --- resource/csdk/resource-directory/src/internal/rd_database.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/resource/csdk/resource-directory/src/internal/rd_database.c b/resource/csdk/resource-directory/src/internal/rd_database.c index 2685219..024ffe0 100644 --- a/resource/csdk/resource-directory/src/internal/rd_database.c +++ b/resource/csdk/resource-directory/src/internal/rd_database.c @@ -142,7 +142,7 @@ OCStackResult OCRDDatabaseInit(const char *path) sqlite3_stmt *stmt = 0; VERIFY_SQLITE(sqlite3_prepare_v2 (gRDDB, "PRAGMA foreign_keys = ON;", -1, &stmt, NULL)); - if (sqlite3_step(stmt) != SQLITE_DONE) + if (SQLITE_DONE != sqlite3_step(stmt)) { sqlite3_finalize(stmt); return OC_STACK_ERROR; @@ -352,8 +352,10 @@ OCStackResult OCRDDatabaseStoreResources(OCRepPayload *payload, const OCDevAddr VERIFY_SQLITE(sqlite3_exec(gRDDB, "COMMIT", NULL, NULL, NULL)); int64_t rowid = sqlite3_last_insert_rowid(gRDDB); - VERIFY_SQLITE(storeLinkPayload(payload, rowid)); - + if (rowid) + { + VERIFY_SQLITE(storeLinkPayload(payload, rowid)); + } OICFree(deviceid); return OC_STACK_OK; } -- 2.7.4