mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Alternate compiler warning fix for sqlite3StatusHighwater.

Browse Source 
FossilOrigin-Name: 4315d20200d578c9252dcb26e60739063a8eff1d
This commit is contained in:
mistachkin 2015-10-22 18:06:40 +00:00
parent 16158eeb49
commit 7ef855f156
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@ -1,5 +1,5 @@
C Fix\sharmless\scompiler\swarnings\sin\sFTS5. C Alternate\scompiler\swarning\sfix\sfor\ssqlite3StatusHighwater.
D 2015-10-21T22:08:36.772 D 2015-10-22T18:06:40.381
F Makefile.in 2ea961bc09e441874eb3d1bf7398e04feb24f3ee F Makefile.in 2ea961bc09e441874eb3d1bf7398e04feb24f3ee
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc 702d3e98f3afc6587a78481257f3c4c900efc3a4 F Makefile.msc 702d3e98f3afc6587a78481257f3c4c900efc3a4
@ -345,7 +345,7 @@ F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
F src/sqlite3ext.h 4b66e3e3435da4b4c8c83696d0349f0c503b3924 F src/sqlite3ext.h 4b66e3e3435da4b4c8c83696d0349f0c503b3924
F src/sqliteInt.h 1ad779ee62efee60494af0a75d8d45592f9f53c3 F src/sqliteInt.h 1ad779ee62efee60494af0a75d8d45592f9f53c3
F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46 F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
F src/status.c 286f6398a4d2cd1e8ff0771e3d30f8dddb4768ea F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
F src/tclsqlite.c d9439b6a910985b7fff43ba6756bcef00de22649 F src/tclsqlite.c d9439b6a910985b7fff43ba6756bcef00de22649
F src/test1.c 8fff9c5aa63d6490f516d018b70c12a9cb9a4d8a F src/test1.c 8fff9c5aa63d6490f516d018b70c12a9cb9a4d8a
@ -1391,7 +1391,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P e31aa97a9298e49507256036cfb8fa7517a48461 P aa4e01ea1af327d1f8398ebea1c5bacc46698c3d
R 606f7dfef62137a51a41fcb520dc155f R a22db3919509c137f252ea9c4c395816
U mistachkin U mistachkin
Z be7e8557e6be3b3a5f61a53f0769e842 Z cd96591ebe18ee957344d1fc4f75aaa9

2
manifest.uuid
View File

@ -1 +1 @@
aa4e01ea1af327d1f8398ebea1c5bacc46698c3d 4315d20200d578c9252dcb26e60739063a8eff1d

21
src/status.c
View File

@ -19,15 +19,15 @@
/* /*
** Variables in which to record status information. ** Variables in which to record status information.
*/ */
#if SQLITE_PTRSIZE>4
typedef sqlite3_int64 sqlite3StatValueType;
#else
typedef u32 sqlite3StatValueType;
#endif
typedef struct sqlite3StatType sqlite3StatType; typedef struct sqlite3StatType sqlite3StatType;
static SQLITE_WSD struct sqlite3StatType { static SQLITE_WSD struct sqlite3StatType {
#if SQLITE_PTRSIZE>4 sqlite3StatValueType nowValue[10]; /* Current value */
sqlite3_int64 nowValue[10]; /* Current value */ sqlite3StatValueType mxValue[10]; /* Maximum value */
sqlite3_int64 mxValue[10]; /* Maximum value */
#else
u32 nowValue[10]; /* Current value */
u32 mxValue[10]; /* Maximum value */
#endif
} sqlite3Stat = { {0,}, {0,} }; } sqlite3Stat = { {0,}, {0,} };
/* /*
@ -112,7 +112,10 @@ void sqlite3StatusDown(int op, int N){
** The caller must hold the appropriate mutex. ** The caller must hold the appropriate mutex.
*/ */
void sqlite3StatusHighwater(int op, int X){ void sqlite3StatusHighwater(int op, int X){
sqlite3StatValueType newValue;
wsdStatInit; wsdStatInit;
assert( X>=0 );
newValue = (sqlite3StatValueType)X;
assert( op>=0 && op<ArraySize(wsdStat.nowValue) ); assert( op>=0 && op<ArraySize(wsdStat.nowValue) );
assert( op>=0 && op<ArraySize(statMutex) ); assert( op>=0 && op<ArraySize(statMutex) );
assert( sqlite3_mutex_held(statMutex[op] ? sqlite3Pcache1Mutex() assert( sqlite3_mutex_held(statMutex[op] ? sqlite3Pcache1Mutex()
@ -121,8 +124,8 @@ void sqlite3StatusHighwater(int op, int X){
|| op==SQLITE_STATUS_PAGECACHE_SIZE || op==SQLITE_STATUS_PAGECACHE_SIZE
|| op==SQLITE_STATUS_SCRATCH_SIZE || op==SQLITE_STATUS_SCRATCH_SIZE
|| op==SQLITE_STATUS_PARSER_STACK ); || op==SQLITE_STATUS_PARSER_STACK );
if( X>wsdStat.mxValue[op] ){ if( newValue>wsdStat.mxValue[op] ){
wsdStat.mxValue[op] = X; wsdStat.mxValue[op] = newValue;
} }
} }