1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00

Fix compiler harmless warnings in tclsqlite.c that appeared with GCC 4.8.x.

FossilOrigin-Name: d93ae6833a7fca0672caf902a7b48846e54242cd
This commit is contained in:
drh
2013-12-20 18:57:44 +00:00
parent d42ef839bc
commit a47941fe42
3 changed files with 11 additions and 12 deletions

View File

@@ -1,5 +1,5 @@
C Code\ssimplification\sin\ssqlite3GenerateIndexKey()\sby\smaking\suse\sof\sa\ssubroutine\nfound\sover\sin\sexpr.c. C Fix\scompiler\sharmless\swarnings\sin\stclsqlite.c\sthat\sappeared\swith\sGCC\s4.8.x.
D 2013-12-20T18:44:35.386 D 2013-12-20T18:57:44.631
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -228,7 +228,7 @@ F src/sqliteInt.h d0815177df125e900056e1e692504435e7610793
F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158 F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
F src/tclsqlite.c 651b10698c87bbc3ae5772e2491e3444c5bbf153 F src/tclsqlite.c c43379f77f90399802b0e215faa71c0adc3a4d2e
F src/test1.c 633e5e6a116acf4473b9289240bcceb5320a9d93 F src/test1.c 633e5e6a116acf4473b9289240bcceb5320a9d93
F src/test2.c 7355101c085304b90024f2261e056cdff13c6c35 F src/test2.c 7355101c085304b90024f2261e056cdff13c6c35
F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
@@ -1147,7 +1147,7 @@ F tool/vdbe-compress.tcl 0cf56e9263a152b84da86e75a5c0cdcdb7a47891
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
P 2ae22dc0cbed2feca4baf89d02aaace0331971d6 P 0026d3355340d66687a3fd4cbece28811ef1b505
R 5c55bdf162e02aeda0ecbd1279176bdc R 1e7ba7ea1368145f32bc284eea0efbfc
U drh U drh
Z da74200164ac95fa24bb1bb84f137616 Z b38a5e6618ad563a8f912c35a2908336

View File

@@ -1 +1 @@
0026d3355340d66687a3fd4cbece28811ef1b505 d93ae6833a7fca0672caf902a7b48846e54242cd

View File

@@ -1530,9 +1530,9 @@ static int DbUseNre(void){
*/ */
# define SQLITE_TCL_NRE 0 # define SQLITE_TCL_NRE 0
# define DbUseNre() 0 # define DbUseNre() 0
# define Tcl_NRAddCallback(a,b,c,d,e,f) 0 # define Tcl_NRAddCallback(a,b,c,d,e,f) (void)0
# define Tcl_NREvalObj(a,b,c) 0 # define Tcl_NREvalObj(a,b,c) 0
# define Tcl_NRCreateCommand(a,b,c,d,e,f) 0 # define Tcl_NRCreateCommand(a,b,c,d,e,f) (void)0
#endif #endif
/* /*
@@ -2770,7 +2770,7 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
** or savepoint. */ ** or savepoint. */
if( DbUseNre() ){ if( DbUseNre() ){
Tcl_NRAddCallback(interp, DbTransPostCmd, cd, 0, 0, 0); Tcl_NRAddCallback(interp, DbTransPostCmd, cd, 0, 0, 0);
Tcl_NREvalObj(interp, pScript, 0); (void)Tcl_NREvalObj(interp, pScript, 0);
}else{ }else{
rc = DbTransPostCmd(&cd, interp, Tcl_EvalObjEx(interp, pScript, 0)); rc = DbTransPostCmd(&cd, interp, Tcl_EvalObjEx(interp, pScript, 0));
} }
@@ -3371,8 +3371,7 @@ static void MD5Final(unsigned char digest[16], MD5Context *ctx){
byteReverse(ctx->in, 14); byteReverse(ctx->in, 14);
/* Append length in bits and transform */ /* Append length in bits and transform */
((uint32 *)ctx->in)[ 14 ] = ctx->bits[0]; memcpy(ctx->in + 14*4, ctx->bits, 8);
((uint32 *)ctx->in)[ 15 ] = ctx->bits[1];
MD5Transform(ctx->buf, (uint32 *)ctx->in); MD5Transform(ctx->buf, (uint32 *)ctx->in);
byteReverse((unsigned char *)ctx->buf, 4); byteReverse((unsigned char *)ctx->buf, 4);