mirrors
/
sqlite
mirror of https://github.com/sqlite/sqlite
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix harmless compiler warnings for MSVC. 

FossilOrigin-Name: 3ef3246120d72dffe469733bb21667a548af0a44
This commit is contained in:
mistachkin 2014-09-01 01:16:49 +00:00
parent 44dec87538
commit 31970cca38
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@ -1,5 +1,5 @@
C In\sthe\scommand-line\sshell,\sadded\soptions\s--lookaside,\s--pagecache,\sand\n--scratch\sused\sto\sconfigure\sauxiliary\smemories.
D 2014-08-30T15:49:25.923
C Fix\sharmless\scompiler\swarnings\sfor\sMSVC.
D 2014-09-01T01:16:49.641
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -224,7 +224,7 @@ F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
F src/resolve.c 0ea356d32a5e884add23d1b9b4e8736681dd5697
F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
F src/select.c 1c4667571f2c9e339b5a5c5b152a9ea7b0bc4163
F src/shell.c 10b3bbf929aca5f33815444f03c9eac17e3c6daf
F src/shell.c 713cef4d73c05fc8e12f4960072329d767a05d50
F src/sqlite.h.in ed9d35990c61f0388ca6405706455c4095310553
F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
@ -1188,7 +1188,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P 2a74129a21f9745f1363f844807e2d10201a3f40
R 3444e463c529c6a0145dadfcb31aa003
U drh
Z 5a770ceaa0af97ce932adfe78ff7c68a
P f61db04be4d7fb21b7f721647c37c45e283ffbea
R fb90b1156ce26645b130e94c9528a286
U mistachkin
Z ab89ed2842a9e03f7299dfc1fb42f5cb

2
manifest.uuid
View File

@ -1 +1 @@
f61db04be4d7fb21b7f721647c37c45e283ffbea
3ef3246120d72dffe469733bb21667a548af0a44

12
src/shell.c
View File

@ -3942,28 +3942,28 @@ int main(int argc, char **argv){
#endif
}else if( strcmp(z,"-scratch")==0 ){
int n, sz;
sz = integerValue(cmdline_option_value(argc,argv,++i));
sz = (int)integerValue(cmdline_option_value(argc,argv,++i));
if( sz>400000 ) sz = 400000;
if( sz<2500 ) sz = 2500;
n = integerValue(cmdline_option_value(argc,argv,++i));
n = (int)integerValue(cmdline_option_value(argc,argv,++i));
if( n>10 ) n = 10;
if( n<1 ) n = 1;
sqlite3_config(SQLITE_CONFIG_SCRATCH, malloc(n*sz+1), sz, n);
data.shellFlgs |= SHFLG_Scratch;
}else if( strcmp(z,"-pagecache")==0 ){
int n, sz;
sz = integerValue(cmdline_option_value(argc,argv,++i));
sz = (int)integerValue(cmdline_option_value(argc,argv,++i));
if( sz>70000 ) sz = 70000;
if( sz<800 ) sz = 800;
n = integerValue(cmdline_option_value(argc,argv,++i));
n = (int)integerValue(cmdline_option_value(argc,argv,++i));
if( n<10 ) n = 10;
sqlite3_config(SQLITE_CONFIG_PAGECACHE, malloc(n*sz+1), sz, n);
data.shellFlgs |= SHFLG_Pagecache;
}else if( strcmp(z,"-lookaside")==0 ){
int n, sz;
sz = integerValue(cmdline_option_value(argc,argv,++i));
sz = (int)integerValue(cmdline_option_value(argc,argv,++i));
if( sz<0 ) sz = 0;
n = integerValue(cmdline_option_value(argc,argv,++i));
n = (int)integerValue(cmdline_option_value(argc,argv,++i));
if( n<0 ) n = 0;
sqlite3_config(SQLITE_CONFIG_LOOKASIDE, sz, n);
if( sz*n==0 ) data.shellFlgs &= ~SHFLG_Lookaside;