diff options
| author | Martijn Kaijser <machine.sanctum@gmail.com> | 2014-08-26 10:11:20 +0200 |
|---|---|---|
| committer | Martijn Kaijser <machine.sanctum@gmail.com> | 2014-08-26 10:11:20 +0200 |
| commit | 407eb40180221d27d16cc071fd63b86a1447d9aa (patch) | |
| tree | f3629bfdd489d3dcf4926d0d9158698e6c4d919e | |
| parent | f60bdf7715b6808f85a549a32d0e422e23bf765f (diff) | |
| parent | afac2ca1dae9021ab7d49bbc4139e86bd8f532c3 (diff) | |
Merge pull request #5281 from maksqwe/db_error_value_fix
Dbwrappers return error value fix
| -rw-r--r-- | xbmc/dbwrappers/mysqldataset.cpp | 2 | ||||
| -rw-r--r-- | xbmc/dbwrappers/sqlitedataset.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/xbmc/dbwrappers/mysqldataset.cpp b/xbmc/dbwrappers/mysqldataset.cpp index 9efb6f1c52..945d0804e4 100644 --- a/xbmc/dbwrappers/mysqldataset.cpp +++ b/xbmc/dbwrappers/mysqldataset.cpp @@ -431,7 +431,7 @@ long MysqlDatabase::nextid(const char* sname) { CLog::Log(LOGINFO,"Next id is [%.*s] ", (int) lengths[0], row[0]); sprintf(sqlcmd,"update %s set nextid=%d where seq_name = '%s'",seq_table,id,sname); mysql_free_result(res); - if ((last_err = query_with_reconnect(sqlcmd) != 0)) return DB_UNEXPECTED_RESULT; + if ((last_err = query_with_reconnect(sqlcmd)) != 0) return DB_UNEXPECTED_RESULT; return id; } return DB_UNEXPECTED_RESULT; diff --git a/xbmc/dbwrappers/sqlitedataset.cpp b/xbmc/dbwrappers/sqlitedataset.cpp index 505c3a4ff0..d0aad59429 100644 --- a/xbmc/dbwrappers/sqlitedataset.cpp +++ b/xbmc/dbwrappers/sqlitedataset.cpp @@ -328,7 +328,7 @@ int SqliteDatabase::drop_analytics(void) { for (size_t i=0; i < res.records.size(); i++) { sprintf(sqlcmd,"DROP INDEX '%s'", res.records[i]->at(0).get_asString().c_str()); - if ((last_err = sqlite3_exec(conn, sqlcmd, NULL, NULL, NULL) != SQLITE_OK)) return DB_UNEXPECTED_RESULT; + if ((last_err = sqlite3_exec(conn, sqlcmd, NULL, NULL, NULL)) != SQLITE_OK) return DB_UNEXPECTED_RESULT; } res.clear(); @@ -338,7 +338,7 @@ int SqliteDatabase::drop_analytics(void) { for (size_t i=0; i < res.records.size(); i++) { sprintf(sqlcmd,"DROP VIEW '%s'", res.records[i]->at(0).get_asString().c_str()); - if ((last_err = sqlite3_exec(conn, sqlcmd, NULL, NULL, NULL) != SQLITE_OK)) return DB_UNEXPECTED_RESULT; + if ((last_err = sqlite3_exec(conn, sqlcmd, NULL, NULL, NULL)) != SQLITE_OK) return DB_UNEXPECTED_RESULT; } res.clear(); @@ -348,7 +348,7 @@ int SqliteDatabase::drop_analytics(void) { for (size_t i=0; i < res.records.size(); i++) { sprintf(sqlcmd,"DROP TRIGGER '%s'", res.records[i]->at(0).get_asString().c_str()); - if ((last_err = sqlite3_exec(conn, sqlcmd, NULL, NULL, NULL) != SQLITE_OK)) return DB_UNEXPECTED_RESULT; + if ((last_err = sqlite3_exec(conn, sqlcmd, NULL, NULL, NULL)) != SQLITE_OK) return DB_UNEXPECTED_RESULT; } // res would be cleared on destruct @@ -383,7 +383,7 @@ long SqliteDatabase::nextid(const char* sname) { else { id = res.records[0]->at(0).get_asInt()+1; sprintf(sqlcmd,"update %s set nextid=%d where seq_name = '%s'",sequence_table.c_str(),id,sname); - if ((last_err = sqlite3_exec(conn,sqlcmd,NULL,NULL,NULL) != SQLITE_OK)) return DB_UNEXPECTED_RESULT; + if ((last_err = sqlite3_exec(conn,sqlcmd,NULL,NULL,NULL)) != SQLITE_OK) return DB_UNEXPECTED_RESULT; return id; } return DB_UNEXPECTED_RESULT; |