database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-14 00:22:38 +03:00
Code Activity

Take out the incomplete initializer on the constant "dummy" in

Browse Source 
sqlite3VdbeGetOp().  Add a comment that the MSVC warning there should
be ignored.

FossilOrigin-Name: 452ccaa9080e42657b5f0908bf40dbd834cd39f6
This commit is contained in:
drh
2010-07-02 18:44:37 +00:00
parent 8a300f8095
commit a0b75da197
3 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
manifest
View File

@@ -1,5 +1,8 @@
C Fix\sa\scouple\smore\scompiler\swarnings\sunder\sMSVC. -----BEGIN PGP SIGNED MESSAGE-----
D 2010-07-02T18:15:31 Hash: SHA1
C Take\sout\sthe\sincomplete\sinitializer\son\sthe\sconstant\s"dummy"\sin\nsqlite3VdbeGetOp().\s\sAdd\sa\scomment\sthat\sthe\sMSVC\swarning\sthere\sshould\nbe\signored.
D 2010-07-02T18:44:37
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -221,7 +224,7 @@ F src/vdbe.c 8b3bae957a874891361e4b5ada373e6f49e18630
F src/vdbe.h 471f6a3dcec4817ca33596fe7f6654d56c0e75f3 F src/vdbe.h 471f6a3dcec4817ca33596fe7f6654d56c0e75f3
F src/vdbeInt.h 19ebc8c2a2e938340051ee65af3f377fb99102d1 F src/vdbeInt.h 19ebc8c2a2e938340051ee65af3f377fb99102d1
F src/vdbeapi.c dc3138f10afbc95ed3c21dd25abb154504b1db9d F src/vdbeapi.c dc3138f10afbc95ed3c21dd25abb154504b1db9d
F src/vdbeaux.c 10d14b40a19e1aef3a271f78f7a55ecaca7e4c41 F src/vdbeaux.c 7f99c1f00e4b31e8b28d8a87ecc2322bb46ae99c
F src/vdbeblob.c 258a6010ba7a82b72b327fb24c55790655689256 F src/vdbeblob.c 258a6010ba7a82b72b327fb24c55790655689256
F src/vdbemem.c 5e579abf6532001dfbee0e640dc34eae897a9807 F src/vdbemem.c 5e579abf6532001dfbee0e640dc34eae897a9807
F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2 F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
@@ -830,7 +833,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P 26c7689cfedf03e65bcd51df68d128101ed2c1ec P 26bc27e3f4c8a666f3358f73fc21eccdec3508f6
R ecac527da519d1e7dd4890e5f5130a3c R 39cd87522d4297ecca3b1e4ddddaeddd
U shaneh U drh
Z 30d6c92ca3ce1f48ef2b3c7f2015e303 Z c6e5f114cd6e8dfd396b7e796b35af20
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFMLjOYoxKgR168RlERAgYoAJ9587SBvTUlAm/u8/8JhujITmHj/QCeLV0e
Qq6zbAicDsnHPAymP3sFmLI=
=re33
-----END PGP SIGNATURE-----

2
manifest.uuid
View File

@@ -1 +1 @@
26bc27e3f4c8a666f3358f73fc21eccdec3508f6 452ccaa9080e42657b5f0908bf40dbd834cd39f6

4
src/vdbeaux.c
View File

@@ -830,7 +830,9 @@ void sqlite3VdbeNoopComment(Vdbe *p, const char *zFormat, ...){
** check the value of p->nOp-1 before continuing. ** check the value of p->nOp-1 before continuing.
*/ */
VdbeOp *sqlite3VdbeGetOp(Vdbe *p, int addr){ VdbeOp *sqlite3VdbeGetOp(Vdbe *p, int addr){
static const VdbeOp dummy = { 0 }; /* C89 specifies that the constant "dummy" will be initialized to all
** zeros, which is correct. MSVC generates a warning, nevertheless. */
static const VdbeOp dummy; /* Ignore the MSVC warning about no initializer */
assert( p->magic==VDBE_MAGIC_INIT ); assert( p->magic==VDBE_MAGIC_INIT );
if( addr<0 ){ if( addr<0 ){
#ifdef SQLITE_OMIT_TRACE #ifdef SQLITE_OMIT_TRACE