Fix harmless compiler warnings.

FossilOrigin-Name: 1a1cf5aa86734c832d845e07780262a178188d56

diff --git a/ext/fts3/fts3_tokenize_vtab.c b/ext/fts3/fts3_tokenize_vtab.c
index 0f2cef83c397614ca677d608456192647d1ab83d..9ec3b32aada2fb5a8bcb1d565e3cc4259d473eeb 100644 (file)
--- a/ext/fts3/fts3_tokenize_vtab.c
+++ b/ext/fts3/fts3_tokenize_vtab.c
@@ -121,7 +121,7 @@ static int fts3tokDequoteArray(
     *pazDequote = 0;
   }else{
     int i;
-    int nByte;
+    int nByte = 0;
     char **azDequote;
 
     for(i=0; i<argc; i++){
@@ -175,6 +175,7 @@ static int fts3tokConnectMethod(
   int rc;
   char **azDequote = 0;
   int nDequote;
+  UNUSED_PARAMETER(pUnused);
 
   rc = sqlite3_declare_vtab(db, FTS3_TOK_SCHEMA);
   if( rc!=SQLITE_OK ) return rc;
@@ -244,6 +245,7 @@ static int fts3tokBestIndexMethod(
   sqlite3_index_info *pInfo
 ){
   int i;
+  UNUSED_PARAMETER(pVTab);
 
   for(i=0; i<pInfo->nConstraint; i++){
     if( pInfo->aConstraint[i].usable 
@@ -269,6 +271,7 @@ static int fts3tokBestIndexMethod(
 */
 static int fts3tokOpenMethod(sqlite3_vtab *pVTab, sqlite3_vtab_cursor **ppCsr){
   Fts3tokCursor *pCsr;
+  UNUSED_PARAMETER(pVTab);
 
   pCsr = (Fts3tokCursor *)sqlite3_malloc(sizeof(Fts3tokCursor));
   if( pCsr==0 ){
@@ -346,6 +349,8 @@ static int fts3tokFilterMethod(
   int rc = SQLITE_ERROR;
   Fts3tokCursor *pCsr = (Fts3tokCursor *)pCursor;
   Fts3tokTable *pTab = (Fts3tokTable *)(pCursor->pVtab);
+  UNUSED_PARAMETER(idxStr);
+  UNUSED_PARAMETER(nVal);
 
   fts3tokResetCursor(pCsr);
   if( idxNum==1 ){

diff --git a/manifest b/manifest
index 7c003c6acd5ea74a2b18458331eae4b35e5cf03b..f702eb82f2b9e37bda48ac863e7f9fe0d2b9928b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\sallow\sa\svirtual\stable\sto\scancel\sthe\sORDER\sBY\sclause\sunless\sall\nouter\sloops\sare\sguaranteed\sto\sreturn\sno\smore\sthan\sone\srow\sresult.\nCandidate\sfix\sfor\sticket\s[ba82a4a41eac1].
-D 2013-04-22T19:56:12.702
+C Fix\sharmless\scompiler\swarnings.
+D 2013-04-22T23:38:50.007
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 87591ea5bf7d6ed521ad42d5bc69c124debe11a5
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -67,7 +67,7 @@ F ext/fts3/fts3_porter.c a465b49fcb8249a755792f87516eff182efa42b3
 F ext/fts3/fts3_snippet.c 5fcfcafff46a2a3a63b8e59fcb51987d01c74695
 F ext/fts3/fts3_term.c a521f75132f9a495bdca1bdd45949b3191c52763
 F ext/fts3/fts3_test.c f9a1a1702db1bfad3e2d0064746eeb808f125489
-F ext/fts3/fts3_tokenize_vtab.c e097c2e19126249b812a4002e76309d5fef3495b
+F ext/fts3/fts3_tokenize_vtab.c a29f126b9e6c6a6f1021a8f7440bf125e68af1f9
 F ext/fts3/fts3_tokenizer.c bbdc731bc91338050675c6d1da9ab82147391e16
 F ext/fts3/fts3_tokenizer.h 64c6ef6c5272c51ebe60fc607a896e84288fcbc3
 F ext/fts3/fts3_tokenizer1.c 5c98225a53705e5ee34824087478cf477bdb7004
@@ -157,7 +157,7 @@ F src/mem1.c 437c7c4af964895d4650f29881df63535caaa1fa
 F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf
 F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
 F src/mem5.c c2c63b7067570b00bf33d751c39af24182316f7f
-F src/memjournal.c 0ebce851677a7ac035ba1512a7e65851b34530c6
+F src/memjournal.c 41a598445c8f249bd9b26ecae700c60dcf34cbf3
 F src/mutex.c d3b66a569368015e0fcb1ac15f81c119f504d3bc
 F src/mutex.h 5bc526e19dccc412b7ff04642f6fdad3fdfdabea
 F src/mutex_noop.c 7682796b7d8d39bf1c138248858efcd10c9e1553
@@ -167,7 +167,7 @@ F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
 F src/os.c b4ad71336fd96f97776f75587cd9e8218288f5be
 F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
-F src/os_unix.c 0a561eae5965c9371300b0419027f5ae9f847af2
+F src/os_unix.c 5a9ac4a566fb566a2ff9b9e3a9d723075d9d26a7
 F src/os_win.c 673b3e3d1fa3040d8d95a7f1f5e0e553aed56cfb
 F src/pager.c 6c3a8a5d665498b0344395a2c9f82d5abc4cc771
 F src/pager.h 5cb78b8e1adfd5451e600be7719f5a99d87ac3b1
@@ -254,7 +254,7 @@ F src/vdbeaux.c ecb43014bcd3019e5aa2b5561e5c3a447f007a08
 F src/vdbeblob.c 5dc79627775bd9a9b494dd956e26297946417d69
 F src/vdbemem.c 833005f1cbbf447289f1973dba2a0c2228c7b8ab
 F src/vdbesort.c 4fad64071ae120c25f39dcac572d716b9cadeb7f
-F src/vdbetrace.c a22263ab47f6ba4fcd176515cec1e732866b25f0
+F src/vdbetrace.c 3ad1b4e92b60c082a02ac563da4a2735cc7d297c
 F src/vtab.c b05e5f1f4902461ba9f5fc49bb7eb7c3a0741a83
 F src/wal.c 436bfceb141b9423c45119e68e444358ee0ed35d
 F src/wal.h a4d3da523d55a226a0b28e9058ef88d0a8051887
@@ -1054,7 +1054,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 2b3fed09eb89f1e9d6a5f7487ef526b46eb51490
-R c15aea6fcd9f9126da1de54ee794b8c9
+P 49cfa14fceeef2d55b449eb927c283ce6f650c07
+R 83c630a254d9cc209b10e1a83d85002b
 U drh
-Z 5c7507bd8ad3ff74a1cf8b492f137aec
+Z a7a8588b07b6fce1e57eced049fe41f1

diff --git a/manifest.uuid b/manifest.uuid
index 5a0d3a7ebcb2348512c5a86dbcce25c51053998e..fa38fa5b2c5dd67a661ab73c63ad4e664ddf5012 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-49cfa14fceeef2d55b449eb927c283ce6f650c07
\ No newline at end of file
+1a1cf5aa86734c832d845e07780262a178188d56
\ No newline at end of file

diff --git a/src/memjournal.c b/src/memjournal.c
index 3e66e215b2a84af474fa7fee9084c7ff6c3c4f6c..05725948f65d427b07f7f929aca3ff224b1753df 100644 (file)
--- a/src/memjournal.c
+++ b/src/memjournal.c
@@ -230,7 +230,9 @@ static const struct sqlite3_io_methods MemJournalMethods = {
   0,                /* xShmMap */
   0,                /* xShmLock */
   0,                /* xShmBarrier */
-  0                 /* xShmUnlock */
+  0,                /* xShmUnmap */
+  0,                /* xFetch */
+  0                 /* xUnfetch */
 };
 
 /* 

diff --git a/src/os_unix.c b/src/os_unix.c
index 8dfbe6181406e2b6a7e4b3086a87ca1e017d2d89..7448afe4c74e3caeb17b65f4ebd65a11878c630a 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -4782,6 +4782,7 @@ static int unixFetch(sqlite3_file *fd, i64 iOff, int nAmt, void **pp){
 */
 static int unixUnfetch(sqlite3_file *fd, i64 iOff, void *p){
   unixFile *pFd = (unixFile *)fd;   /* The underlying database file */
+  UNUSED_PARAMETER(iOff);
 
   /* If p==0 (unmap the entire file) then there must be no outstanding 
   ** xFetch references. Or, if p!=0 (meaning it is an xFetch reference),

diff --git a/src/vdbetrace.c b/src/vdbetrace.c
index 91554d671741f088a2c4c659360eb0dfd27cfa6a..88935beeac96240598c9df0afca34e1f656545fd 100644 (file)
--- a/src/vdbetrace.c
+++ b/src/vdbetrace.c
@@ -128,7 +128,7 @@ char *sqlite3VdbeExpandSql(
       }else if( pVar->flags & MEM_Real ){
         sqlite3XPrintf(&out, "%!.15g", pVar->r);
       }else if( pVar->flags & MEM_Str ){
-        int n;  /* Number of bytes of the string text to include in output */
+        int nOut;  /* Number of bytes of the string text to include in output */
 #ifndef SQLITE_OMIT_UTF16
         u8 enc = ENC(db);
         Mem utf8;
@@ -140,16 +140,16 @@ char *sqlite3VdbeExpandSql(
           pVar = &utf8;
         }
 #endif
-        n = pVar->n;
+        nOut = pVar->n;
 #ifdef SQLITE_TRACE_SIZE_LIMIT
         if( n>SQLITE_TRACE_SIZE_LIMIT ){
-          n = SQLITE_TRACE_SIZE_LIMIT;
-          while( n<pVar->n && (pVar->z[n]&0xc0)==0x80 ){ n++; }
+          nOut = SQLITE_TRACE_SIZE_LIMIT;
+          while( nOut<pVar->n && (pVar->z[n]&0xc0)==0x80 ){ n++; }
         }
 #endif    
-        sqlite3XPrintf(&out, "'%.*q'", n, pVar->z);
+        sqlite3XPrintf(&out, "'%.*q'", nOut, pVar->z);
 #ifdef SQLITE_TRACE_SIZE_LIMIT
-        if( n<pVar->n ) sqlite3XPrintf(&out, "/*+%d bytes*/", pVar->n-n);
+        if( nOut<pVar->n ) sqlite3XPrintf(&out, "/*+%d bytes*/", pVar->n-n);
 #endif
 #ifndef SQLITE_OMIT_UTF16
         if( enc!=SQLITE_UTF8 ) sqlite3VdbeMemRelease(&utf8);
@@ -157,19 +157,19 @@ char *sqlite3VdbeExpandSql(
       }else if( pVar->flags & MEM_Zero ){
         sqlite3XPrintf(&out, "zeroblob(%d)", pVar->u.nZero);
       }else{
-        int n;  /* Number of bytes of the blob to include in output */
+        int nOut;  /* Number of bytes of the blob to include in output */
         assert( pVar->flags & MEM_Blob );
         sqlite3StrAccumAppend(&out, "x'", 2);
-        n = pVar->n;
+        nOut = pVar->n;
 #ifdef SQLITE_TRACE_SIZE_LIMIT
-        if( n>SQLITE_TRACE_SIZE_LIMIT ) n = SQLITE_TRACE_SIZE_LIMIT;
+        if( nOut>SQLITE_TRACE_SIZE_LIMIT ) nOut = SQLITE_TRACE_SIZE_LIMIT;
 #endif
-        for(i=0; i<n; i++){
+        for(i=0; i<nOut; i++){
           sqlite3XPrintf(&out, "%02x", pVar->z[i]&0xff);
         }
         sqlite3StrAccumAppend(&out, "'", 1);
 #ifdef SQLITE_TRACE_SIZE_LIMIT
-        if( n<pVar->n ) sqlite3XPrintf(&out, "/*+%d bytes*/", pVar->n-n);
+        if( nOut<pVar->n ) sqlite3XPrintf(&out, "/*+%d bytes*/", pVar->n-n);
 #endif
       }
     }