From: drh Date: Fri, 17 Jul 2015 01:16:10 +0000 (+0000) Subject: Avoid a harmless compiler warning. X-Git-Tag: version-3.8.11~27 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f6bff3f5d6c2f49bdee0b4a15f7677856b513c28;p=thirdparty%2Fsqlite.git Avoid a harmless compiler warning. FossilOrigin-Name: 2288842b8f191ff05a157db7f77af867bfa83c4f --- diff --git a/manifest b/manifest index 6a62491cb7..6cd163f25a 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\scompiler\swarnings\sin\sfts5\scode. -D 2015-07-16T20:17:57.553 +C Avoid\sa\sharmless\scompiler\swarning. +D 2015-07-17T01:16:10.825 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 6e8af213d49e6325bf283ebed7662254f8e15bda F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -401,7 +401,7 @@ F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0 F src/vtab.c 082b35a25a26e3d36f365ca8cd73c1922532f05e F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb -F src/wal.c 6c9354c72452ab5699a44381ae03004ee2893824 +F src/wal.c 590e85f3b24e8ed2f3263abd1f69f219a1f15ad2 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4 F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804 F src/where.c 909eba3b6db984eb2adfbca9de2c237ee7056adb @@ -1365,7 +1365,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 9a592cf91c74b369bacf6a0e69d45f3e73dfdbce -R 7a5b6f6204af419d579789c3ece1729c -U dan -Z a4633be21e523e4e841d0095eaa70845 +P e9bf275cd969eca6fb41384d3637528d6a19f819 +R 12f173b5d59b5ca59e2ddd738e75f068 +U drh +Z b458ca27129248b1d38d912e023bd41c diff --git a/manifest.uuid b/manifest.uuid index dbc4f5f578..76645404d7 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e9bf275cd969eca6fb41384d3637528d6a19f819 \ No newline at end of file +2288842b8f191ff05a157db7f77af867bfa83c4f \ No newline at end of file diff --git a/src/wal.c b/src/wal.c index 69f335d792..7f252baf02 100644 --- a/src/wal.c +++ b/src/wal.c @@ -648,9 +648,9 @@ static void walIndexWriteHdr(Wal *pWal){ pWal->hdr.isInit = 1; pWal->hdr.iVersion = WALINDEX_MAX_VERSION; walChecksumBytes(1, (u8*)&pWal->hdr, nCksum, 0, pWal->hdr.aCksum); - memcpy((void *)&aHdr[1], (void *)&pWal->hdr, sizeof(WalIndexHdr)); + memcpy((void*)&aHdr[1], (const void*)&pWal->hdr, sizeof(WalIndexHdr)); walShmBarrier(pWal); - memcpy((void *)&aHdr[0], (void *)&pWal->hdr, sizeof(WalIndexHdr)); + memcpy((void*)&aHdr[0], (const void*)&pWal->hdr, sizeof(WalIndexHdr)); } /*