Fix minor compiler warnings.

FossilOrigin-Name: 139eecbe1b072711a36128f1eeb24fc3e3bacc1c

diff --git a/manifest b/manifest
index 5407a84c2fb2fc6eb9e55d0bc8b27e1ecc741634..882e6dc35612e95f10db06fb49904753520ce986 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sthe\suri\sbranch\swith\sthe\strunk.
-D 2011-05-06T18:55:31.561
+C Fix\sminor\scompiler\swarnings.
+D 2011-05-07T14:40:29.349
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -117,7 +117,7 @@ F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
 F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad
 F src/alter.c 280f5c04b11b492703a342222b3de0a999445280
 F src/analyze.c a425d62e8fa9ebcb4359ab84ff0c62c6563d2e2a
-F src/attach.c 79f8e5d286a2873e78d2068f35c4d6270572728f
+F src/attach.c 77caa25fb9d16a030438674f16b77844078d18ed
 F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c 986c15232757f2873dff35ee3b35cbf935fc573c
 F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
@@ -144,7 +144,7 @@ F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
 F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
 F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
 F src/loadext.c 3ae0d52da013a6326310655be6473fd472347b85
-F src/main.c 2f46bf58a6092d19c25109135a385aed65ce81e1
+F src/main.c 35bce9d0c201d35f8398716c04be7fb616c600b3
 F src/malloc.c 591aedb20ae40813f1045f2ef253438a334775d9
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206
@@ -181,7 +181,7 @@ F src/select.c d9d440809025a58547e39f4f268c2a296bfb56ff
 F src/shell.c 72e7e176bf46d5c6518d15ac4ad6847c4bb5df79
 F src/sqlite.h.in 41a0e4bc842917226e170273f64b95717a63270a
 F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
-F src/sqliteInt.h 88704cb43f5266981726c7aebe4fab15331fae9e
+F src/sqliteInt.h b34bd64a7ade4808fcc301e0bb67ef5051ea49c6
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
 F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@ -935,7 +935,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 2e5c0ed724060388b97e0c0881bb1b68ec1a23b4 aa90b943254cf348aa2d23ac05e1895b188e2101
-R c22e979da3dd966376ac72fa0b40e97e
-U dan
-Z b712e33d0a07bca3b809872e2e7a1ec4
+P 88df33c45fd5875ea82bc757b239fe3e61663c12
+R 60bd58714af3d9085d800460facedd20
+U drh
+Z 41f26c68b9bef2dce351bff5509fd9e2

diff --git a/manifest.uuid b/manifest.uuid
index c42c56cef9652ec18dbca3b1903fabe9de022379..e005b5342cd20098c6e2c315824f2a00030da98b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-88df33c45fd5875ea82bc757b239fe3e61663c12
\ No newline at end of file
+139eecbe1b072711a36128f1eeb24fc3e3bacc1c
\ No newline at end of file

diff --git a/src/attach.c b/src/attach.c
index 7c546a5c1b76ba6adfb0d6e615509c76468aafae..7e6f7c1fbb45dc935ffec0ad1018e08b155db2c0 100644 (file)
--- 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 adaa6c662a5ef1363be60cbc961cc643d5862320..1515d7d2acf3bb147f6a1d938c93501f57a82eb7 100644 (file)
--- 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 72a96a601b6f0a5831944f5edfdd74a564f45daf..4a3e45d7c04c2a0d0f58c9764cd534e00cf9300c 100644 (file)
--- 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);