From: drh Date: Thu, 10 Oct 2013 13:41:04 +0000 (+0000) Subject: Another fix to the hash signature algorithm in vfslog.c. X-Git-Tag: version-3.8.1~36 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=919e3b39089e3a946874451ca307d55bdfde79b1;p=thirdparty%2Fsqlite.git Another fix to the hash signature algorithm in vfslog.c. FossilOrigin-Name: 34212aa8c405c4ff3f8045ec0cf2a860af61540f --- diff --git a/ext/misc/vfslog.c b/ext/misc/vfslog.c index 222a8d1fae..8136dadadc 100644 --- a/ext/misc/vfslog.c +++ b/ext/misc/vfslog.c @@ -327,7 +327,7 @@ static void vlogSignature(unsigned char *p, int n, char *zCksum){ pI += 2; } for(i=0; i<8; i++) sqlite3_snprintf(3, zCksum+i*2, "%02x", p[i]); - sqlite3_snprintf(18, zCksum+i*2, "-%08x08x", s0, s1); + sqlite3_snprintf(18, zCksum+i*2, "-%08x%08x", s0, s1); } } diff --git a/manifest b/manifest index 907fe12c07..7ddb1370bd 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sthe\shash\ssignature\salgorithm\sin\svfslog.c.\s\sAdd\sa\sutility\sprogram\sto\nshow\sthe\shash\ssignatures\sfor\severy\spage\sof\sa\sdatabase\sfile. -D 2013-10-10T13:38:51.770 +C Another\sfix\sto\sthe\shash\ssignature\salgorithm\sin\svfslog.c. +D 2013-10-10T13:41:04.179 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -115,7 +115,7 @@ F ext/misc/percentile.c bcbee3c061b884eccb80e21651daaae8e1e43c63 F ext/misc/regexp.c af92cdaa5058fcec1451e49becc7ba44dba023dc F ext/misc/rot13.c 1ac6f95f99b575907b9b09c81a349114cf9be45a F ext/misc/spellfix.c 5e1d547e9a2aed13897fa91bac924333f62fd2d9 -F ext/misc/vfslog.c 9e66605f1c01ec4f7c1b25d07982e1989d7e2eee +F ext/misc/vfslog.c efd4f0b2205f8ae19096b8938551bc55ba7967cc F ext/misc/vtshim.c babb0dc2bf116029e3e7c9a618b8a1377045303e F ext/misc/wholenumber.c 784b12543d60702ebdd47da936e278aa03076212 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761 @@ -1100,7 +1100,7 @@ F tool/mkvsix.tcl f3312df26fd9938a27fa0a845ec96bea84b0c16b F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091 F tool/omittest.tcl 4665982e95a6e5c1bd806cf7bc3dea95be422d77 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c -F tool/pagesig.c d8a672401b593726d5dfcadf1b04d37310e4ef94 +F tool/pagesig.c ff0ca355fd3c2398e933da5e22439bbff89b803b F tool/restore_jrnl.tcl 6957a34f8f1f0f8285e07536225ec3b292a9024a F tool/rollback-test.c 9fc98427d1e23e84429d7e6d07d9094fbdec65a5 F tool/showdb.c 525ecc443578647703051308ad50a93de6ba2c4b @@ -1123,7 +1123,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff -P 24a827b87666670c56d68a18685f4f712852fa92 -R 50c7090bf0272806264dd351e41bc40a +P eaf4de13a63b2294ae575432a022493308a4313a +R 7399da52f6ed2debec27f345b5bf4b89 U drh -Z e3109387d8d252ace6094f69ea11a6f0 +Z 0fe8f99aa362e7a957a710b2ebcec893 diff --git a/manifest.uuid b/manifest.uuid index 9cf0644a19..5de9c156df 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -eaf4de13a63b2294ae575432a022493308a4313a \ No newline at end of file +34212aa8c405c4ff3f8045ec0cf2a860af61540f \ No newline at end of file diff --git a/tool/pagesig.c b/tool/pagesig.c index f4205c86fb..540c9d7226 100644 --- a/tool/pagesig.c +++ b/tool/pagesig.c @@ -42,7 +42,7 @@ static void vlogSignature(unsigned char *p, int n, char *zCksum){ pI += 2; } for(i=0; i<8; i++) sprintf(zCksum+i*2, "%02x", p[i]); - sprintf(zCksum+i*2, "-%08x08x", s0, s1); + sprintf(zCksum+i*2, "-%08x%08x", s0, s1); } }