Compare commits

...

1 Commits

Author SHA1 Message Date
mistachkin cee51b4b3a Fix compiler warnings.
FossilOrigin-Name: 12e869bbac4308f859baf6c6cbf051128b7308ec
2015-10-20 23:40:19 +00:00
4 changed files with 19 additions and 11 deletions
+10 -7
View File
@@ -1,5 +1,5 @@
C Fix\sharmless\scompiler\swarnings\sin\sFTS5.
D 2015-10-20T23:27:14.365
C Fix\scompiler\swarnings.
D 2015-10-20T23:40:19.437
F Makefile.in 2ea961bc09e441874eb3d1bf7398e04feb24f3ee
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc 4eb750e0fdf52050a06d881e1b060f4bb116ed7e
@@ -345,7 +345,7 @@ F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
F src/sqlite3ext.h 4b66e3e3435da4b4c8c83696d0349f0c503b3924
F src/sqliteInt.h 1ad779ee62efee60494af0a75d8d45592f9f53c3
F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
F src/status.c 286f6398a4d2cd1e8ff0771e3d30f8dddb4768ea
F src/status.c 7005932757445183b0439cd0343ce7391a23b6df
F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
F src/tclsqlite.c d9439b6a910985b7fff43ba6756bcef00de22649
F src/test1.c 8fff9c5aa63d6490f516d018b70c12a9cb9a4d8a
@@ -401,7 +401,7 @@ F src/update.c aa10336a2719bd1b9f89004f3d7ba6d566623a49
F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
F src/util.c fc612367108b74573c5fd13a85d0a23027f438bd
F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
F src/vdbe.c e9315575bed64f9aa559151283c873be34143914
F src/vdbe.c ca0bbae502784e57a3d7a22f58aeb69ecf22b75b
F src/vdbe.h 4bc88bd0e06f8046ee6ab7487c0015e85ad949ad
F src/vdbeInt.h 777dd76d513347acb1a71d94df2be00516add637
F src/vdbeapi.c 020681b943e77766b32ae1cddf86d7831b7374ca
@@ -1391,7 +1391,10 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P b8fb263ed1b36d085437131795505e53af103d26
R 95702bd1633e56deaa7f0c8cd9294ab7
P 0a903ec26bfbbe9bfd18bc34934e689ffdb01ce5
R 6c382e4c78016ecd57806c65884973bc
T *branch * noWarn
T *sym-noWarn *
T -sym-trunk *
U mistachkin
Z 2868708b35b26115fe25354e42651fac
Z ca4478407fbab500452d21bb1a48b6b7
+1 -1
View File
@@ -1 +1 @@
0a903ec26bfbbe9bfd18bc34934e689ffdb01ce5
12e869bbac4308f859baf6c6cbf051128b7308ec
+7 -2
View File
@@ -112,6 +112,11 @@ void sqlite3StatusDown(int op, int N){
** The caller must hold the appropriate mutex.
*/
void sqlite3StatusHighwater(int op, int X){
#if SQLITE_PTRSIZE>4
sqlite3_int64 newValue = (sqlite3_int64)X;
#else
u32 newValue = (u32)X;
#endif
wsdStatInit;
assert( op>=0 && op<ArraySize(wsdStat.nowValue) );
assert( op>=0 && op<ArraySize(statMutex) );
@@ -121,8 +126,8 @@ void sqlite3StatusHighwater(int op, int X){
|| op==SQLITE_STATUS_PAGECACHE_SIZE
|| op==SQLITE_STATUS_SCRATCH_SIZE
|| op==SQLITE_STATUS_PARSER_STACK );
if( X>wsdStat.mxValue[op] ){
wsdStat.mxValue[op] = X;
if( newValue>wsdStat.mxValue[op] ){
wsdStat.mxValue[op] = newValue;
}
}
+1 -1
View File
@@ -2370,7 +2370,7 @@ case OP_Column: {
u32 offset; /* Offset into the data */
u64 offset64; /* 64-bit offset */
u32 avail; /* Number of bytes of available data */
u32 t; /* A type code from the record header */
u32 t = 0; /* A type code from the record header */
u16 fx; /* pDest->flags value */
Mem *pReg; /* PseudoTable input register */