diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/attach.c | 2 | ||||
| -rw-r--r-- | src/main.c | 10 | ||||
| -rw-r--r-- | src/sqliteInt.h | 5 |
3 files changed, 9 insertions, 8 deletions
diff --git a/src/attach.c b/src/attach.c index 7c546a5c1..7e6f7c1fb 100644 --- a/src/attach.c +++ b/src/attach.c @@ -72,7 +72,7 @@ static void attachFunc( const char *zFile; char *zPath = 0; char *zErr = 0; - int flags; + unsigned int flags; Db *aNew; char *zErrDyn = 0; sqlite3_vfs *pVfs; diff --git a/src/main.c b/src/main.c index adaa6c662..1515d7d2a 100644 --- a/src/main.c +++ b/src/main.c @@ -1817,13 +1817,13 @@ int sqlite3_limit(sqlite3 *db, int limitId, int newLimit){ int sqlite3ParseUri( const char *zDefaultVfs, /* VFS to use if no "vfs=xxx" query option */ const char *zUri, /* Nul-terminated URI to parse */ - int *pFlags, /* IN/OUT: SQLITE_OPEN_XXX flags */ + unsigned int *pFlags, /* IN/OUT: SQLITE_OPEN_XXX flags */ sqlite3_vfs **ppVfs, /* OUT: VFS to use */ char **pzFile, /* OUT: Filename component of URI */ char **pzErrMsg /* OUT: Error message (if rc!=SQLITE_OK) */ ){ int rc = SQLITE_OK; - int flags = *pFlags; + unsigned int flags = *pFlags; const char *zVfs = zDefaultVfs; char *zFile; int nUri = sqlite3Strlen30(zUri); @@ -1972,7 +1972,7 @@ int sqlite3ParseUri( int mode = 0; for(i=0; aMode[i].z; i++){ const char *z = aMode[i].z; - if( nVal==strlen(z) && 0==memcmp(zVal, z, nVal) ){ + if( nVal==sqlite3Strlen30(z) && 0==memcmp(zVal, z, nVal) ){ mode = aMode[i].mode; break; } @@ -2025,7 +2025,7 @@ int sqlite3ParseUri( static int openDatabase( const char *zFilename, /* Database filename UTF-8 encoded */ sqlite3 **ppDb, /* OUT: Returned database handle */ - unsigned flags, /* Operational flags */ + unsigned int flags, /* Operational flags */ const char *zVfs /* Name of the VFS to use */ ){ sqlite3 *db; /* Store allocated handle here */ @@ -2294,7 +2294,7 @@ int sqlite3_open_v2( int flags, /* Flags */ const char *zVfs /* Name of VFS module to use */ ){ - return openDatabase(filename, ppDb, flags, zVfs); + return openDatabase(filename, ppDb, (unsigned int)flags, zVfs); } #ifndef SQLITE_OMIT_UTF16 diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 72a96a601..4a3e45d7c 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -803,7 +803,7 @@ struct sqlite3 { int nDb; /* Number of backends currently in use */ Db *aDb; /* All backends */ int flags; /* Miscellaneous flags. See below */ - int openFlags; /* Flags passed to sqlite3_vfs.xOpen() */ + unsigned int openFlags; /* Flags passed to sqlite3_vfs.xOpen() */ int errCode; /* Most recent error code (SQLITE_*) */ int errMask; /* & result codes with this before returning */ u8 autoCommit; /* The auto-commit flag. */ @@ -2673,7 +2673,8 @@ void sqlite3AddColumnType(Parse*,Token*); void sqlite3AddDefaultValue(Parse*,ExprSpan*); void sqlite3AddCollateType(Parse*, Token*); void sqlite3EndTable(Parse*,Token*,Token*,Select*); -int sqlite3ParseUri(const char*,const char*,int*,sqlite3_vfs**,char**,char **); +int sqlite3ParseUri(const char*,const char*,unsigned int*, + sqlite3_vfs**,char**,char **); Bitvec *sqlite3BitvecCreate(u32); int sqlite3BitvecTest(Bitvec*, u32); |