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

Fix harmless compiler warnings in mptest.c.

Browse Source 
FossilOrigin-Name: 59bdbb10ed67bf79e0991e2ad58a28321dedb959
This commit is contained in:
drh 2013-04-08 13:59:11 +00:00
parent 1bf44c7acb
commit 841810cef6
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@ -1,5 +1,5 @@
C Add\sthe\svfsname()\sand\seval()\sSQL\sfunctions\sto\smptest.c.\s\nEnhancements\sto\sthe\stest/config01.test\sscript.
D 2013-04-08T13:48:29.192
C Fix\sharmless\scompiler\swarnings\sin\smptest.c.
D 2013-04-08T13:59:11.021
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in aafa71d66bab7e87fb2f348152340645f79f0244
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -111,7 +111,7 @@ F mkopcodec.awk f6fccee29e68493bfd90a2e0466ede5fa94dd2fc
F mkopcodeh.awk 29b84656502eee5f444c3147f331ee686956ab0e
F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
F mptest/config01.test 3f4ddeb152a4f83872f0fa7fcb48d9fd609893da
F mptest/mptest.c 6614ad2110ce44a78b4745036880275ef939bc6e
F mptest/mptest.c fb46946df7d6f2e8be8c028b21a580a977326f24
F mptest/multiwrite01.test aef0af17f1ce1beacd158e403a45a21008d7a70c
F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
@ -1047,7 +1047,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 51265acae3088a51ac0ce6ab8731e6e15a48d4ae
R 70ae859a3e60d8d3ce14cc3f23701768
P 91397a147ce4f67a7ea1182f06a7dda3a96ec465
R ede2c5555feb77dd0a5488dbe1f8d502
U drh
Z 17c730545a4fcc3406090d39f090bdb3
Z 8e0fdcf5a1bb9a273c7156627676f7a5

2
manifest.uuid
View File

@ -1 +1 @@
91397a147ce4f67a7ea1182f06a7dda3a96ec465
59bdbb10ed67bf79e0991e2ad58a28321dedb959

12
mptest/mptest.c
View File

@ -41,6 +41,9 @@
#include <assert.h>
#include <ctype.h>
/* Mark a parameter as unused to suppress compiler warnings */
#define UNUSED_PARAMETER(x) (void)x
/* Global data
*/
static struct Global {
@ -279,6 +282,8 @@ static void vfsNameFunc(
){
sqlite3 *db = sqlite3_context_db_handle(context);
char *zVfs = 0;
UNUSED_PARAMETER(argc);
UNUSED_PARAMETER(argv);
sqlite3_file_control(db, "main", SQLITE_FCNTL_VFSNAME, &zVfs);
if( zVfs ){
sqlite3_result_text(context, zVfs, -1, sqlite3_free);
@ -289,6 +294,7 @@ static void vfsNameFunc(
** Busy handler with a g.iTimeout-millisecond timeout
*/
static int busyHandler(void *pCD, int count){
UNUSED_PARAMETER(pCD);
if( count*10>g.iTimeout ){
if( g.iTimeout>0 ) errorMessage("timeout after %dms", g.iTimeout);
return 0;
@ -301,6 +307,7 @@ static int busyHandler(void *pCD, int count){
** SQL Trace callback
*/
static void sqlTraceCallback(void *NotUsed1, const char *zSql){
UNUSED_PARAMETER(NotUsed1);
logMessage("[%.*s]", clipLength(zSql), zSql);
}
@ -308,6 +315,7 @@ static void sqlTraceCallback(void *NotUsed1, const char *zSql){
** SQL error log callback
*/
static void sqlErrorCallback(void *pArg, int iErrCode, const char *zMsg){
UNUSED_PARAMETER(pArg);
if( (iErrCode&0xff)==SQLITE_SCHEMA && g.iTrace<3 ) return;
errorMessage("(errcode=%d) %s", iErrCode, zMsg);
}
@ -435,6 +443,7 @@ static void stringAppendTerm(String *p, const char *z){
static int evalCallback(void *pCData, int argc, char **argv, char **azCol){
String *p = (String*)pCData;
int i;
UNUSED_PARAMETER(azCol);
for(i=0; i<argc; i++) stringAppendTerm(p, argv[i]);
return 0;
}
@ -479,6 +488,7 @@ static void evalFunc(
String res;
char *zErrMsg = 0;
int rc;
UNUSED_PARAMETER(argc);
memset(&res, 0, sizeof(res));
rc = sqlite3_exec(db, zSql, evalCallback, &res, &zErrMsg);
if( zErrMsg ){
@ -619,7 +629,7 @@ static void startClient(int iClient){
}else{
argv[6] = 0;
}
_spawnv(_P_NOWAIT, g.argv0, argv);
_spawnv(_P_NOWAIT, g.argv0, (const char*const*)argv);
#endif
}
}