Fix compiler warnings in analyze.c.

FossilOrigin-Name: 5bbd2ccb3d2d6286fd667dac2ab658d6b89640a6

diff --git a/manifest b/manifest
index 5348607766d0c56b6c8d18fbb30309aeb4cf6639..9b210d3d889806b93322da2821f6bbd38ece0645 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\scomment\stypo\sin\sanalyze.c.\sNo\schanges\sto\scode.
-D 2013-08-30T19:59:48.378
+C Fix\scompiler\swarnings\sin\sanalyze.c.
+D 2013-08-30T20:19:52.698
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -157,7 +157,7 @@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
 F src/alter.c 2af0330bb1b601af7a7789bf7229675fd772a083
-F src/analyze.c be10d32609e8228b14069aa879f259f3be5437b6
+F src/analyze.c 128f85d9bd7e79e93b8b27aa2bb54a43ad0c00f3
 F src/attach.c fea00cab11c854646a27641a263f5876569a51f9
 F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c 2f1987981139bd2f6d8c728d64bf09fb387443c3
@@ -1109,7 +1109,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 1e0b77cf0edf3d26f76d83aa5466e9ec0e60a710
-R 0c643291a27e5ba88460789684f4b782
-U mistachkin
-Z 1a1cfa9c3206e22f52ca4af3c75be88f
+P dbc31750440226702fbf88f1bf6140ef403c9be1
+R 5df52e9a380e1241cf1df8d1d5fbe7ea
+U dan
+Z 33fcbfc1bf7d299e3e7e4e929460c0cd

diff --git a/manifest.uuid b/manifest.uuid
index 3302345cb00cef83e9582cc58d71aec780953139..e0a1d443370aeef354e85dda2542d3e94d6176a8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dbc31750440226702fbf88f1bf6140ef403c9be1
\ No newline at end of file
+5bbd2ccb3d2d6286fd667dac2ab658d6b89640a6
\ No newline at end of file

diff --git a/src/analyze.c b/src/analyze.c
index 25bf5ca4a4a41bef314e9edeeb5c5da6fc244ca6..d70f77e779a82b7f0952e274910e68ed5104f475 100644 (file)
--- a/src/analyze.c
+++ b/src/analyze.c
@@ -345,7 +345,7 @@ static void statInit(
 
     p->iGet = -1;
     p->mxSample = mxSample;
-    p->nPSample = sqlite3_value_int64(argv[1])/(mxSample/3+1) + 1;
+    p->nPSample = (tRowcnt)(sqlite3_value_int64(argv[1])/(mxSample/3+1) + 1);
     p->current.anLt = &p->current.anEq[nColUp];
     sqlite3_randomness(sizeof(p->iPrn), &p->iPrn);
   
@@ -424,7 +424,7 @@ static void sampleInsert(Stat4Accum *p, Stat4Sample *pNew, int nEqZero){
   Stat4Sample *pSample;
   int i;
   i64 iSeq;
-  i64 iPos;
+  int iPos;
 
   assert( IsStat4 || nEqZero==0 );
 
@@ -1333,7 +1333,7 @@ static void initAvgEq(Index *pIdx){
     for(iCol=0; iCol<pIdx->nColumn; iCol++){
       int i;                    /* Used to iterate through samples */
       tRowcnt sumEq = 0;        /* Sum of the nEq values */
-      int nSum = 0;             /* Number of terms contributing to sumEq */
+      tRowcnt nSum = 0;         /* Number of terms contributing to sumEq */
       tRowcnt avgEq = 0;
       tRowcnt nDLt = pFinal->anDLt[iCol];