1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-07 02:42:48 +03:00

Changes to prevent various compiler warnings. (CVS 2750)

FossilOrigin-Name: e261b8b09a529a3e67dc27c3b83b660bcb32e195
This commit is contained in:
drh
2005-10-20 07:28:17 +00:00
parent b37df7b928
commit d9cb6ac02f
10 changed files with 32 additions and 36 deletions

View File

@@ -14,7 +14,7 @@
** other files are for internal use by SQLite and should not be
** accessed by users of the library.
**
** $Id: main.c,v 1.302 2005/09/17 15:20:27 drh Exp $
** $Id: main.c,v 1.303 2005/10/20 07:28:18 drh Exp $
*/
#include "sqliteInt.h"
#include "os.h"
@@ -741,7 +741,7 @@ static int openDatabase(
*/
if( sqlite3_create_collation(db, "BINARY", SQLITE_UTF8, 0,binCollFunc) ||
sqlite3_create_collation(db, "BINARY", SQLITE_UTF16, 0,binCollFunc) ||
!(db->pDfltColl = sqlite3FindCollSeq(db, db->enc, "BINARY", 6, 0)) ){
(db->pDfltColl = sqlite3FindCollSeq(db, db->enc, "BINARY", 6, 0))==0 ){
rc = db->errCode;
assert( rc!=SQLITE_OK );
db->magic = SQLITE_MAGIC_CLOSED;
@@ -1020,7 +1020,7 @@ int sqlite3_global_recover(){
sqlite3ExpirePreparedStatements(db);
for(i=0; i<db->nDb; i++){
Btree *pBt = db->aDb[i].pBt;
if( pBt && (rc=sqlite3BtreeReset(pBt)) ){
if( pBt && (rc=sqlite3BtreeReset(pBt))!=0 ){
goto recover_out;
}
}