From: drh <drh@noemail.net>
Date: Fri, 25 Jan 2013 15:31:44 +0000 (+0000)
Subject: Further improvements to showwal.c:  Reset the checksum after each frame so that
X-Git-Tag: version-3.7.16~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03c41c0bc94996df7a289e2009ad5ad6263d86f4;p=thirdparty%2Fsqlite.git

Further improvements to showwal.c:  Reset the checksum after each frame so that
only individual checksum failures are shown.  And only show failures, not
correct checksums.

FossilOrigin-Name: 4e2bf57549a8d50fc0993386c724eb4a2b35c9fe
---

diff --git a/manifest b/manifest
index 51a92ffab4..1986fa9616 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sthe\s"showwal"\sutility\sprogram\sto\sshow\schecksum\sfailures\son\sframes.
-D 2013-01-25T15:09:41.890
+C Further\simprovements\sto\sshowwal.c:\s\sReset\sthe\schecksum\safter\seach\sframe\sso\sthat\nonly\sindividual\schecksum\sfailures\sare\sshown.\s\sAnd\sonly\sshow\sfailures,\snot\ncorrect\schecksums.
+D 2013-01-25T15:31:44.708
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in a48faa9e7dd7d556d84f5456eabe5825dd8a6282
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -1016,7 +1016,7 @@ F tool/restore_jrnl.tcl 6957a34f8f1f0f8285e07536225ec3b292a9024a
 F tool/rollback-test.c 9fc98427d1e23e84429d7e6d07d9094fbdec65a5
 F tool/showdb.c aca2644aa4de7c0cad5821e50bbd55397e0974b8
 F tool/showjournal.c b62cecaab86a4053d944c276bb5232e4d17ece02
-F tool/showwal.c 2ef22ea67806f0e9fdba8083989c30e4bf4002e3
+F tool/showwal.c 0c98daec7f4152de1bc2712ba555d107638d43ac
 F tool/soak1.tcl 8d407956e1a45b485a8e072470a3e629a27037fe
 F tool/space_used.tcl f714c41a59e326b8b9042f415b628b561bafa06b
 F tool/spaceanal.tcl 76f583a246a0b027f423252339e711f13198932e
@@ -1034,7 +1034,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P f1127e87b90c7ba049404ec68cb4e99009c22185
-R 20e35b503c10c06065f1e1625b37816e
+P a7f6d19816cbfc50060a9d1c0c402cdd23bd16de
+R 993105ee6da40f7d0b83454a29ef235d
 U drh
-Z fa08d05e69180548469496ecb5ae134e
+Z 6c8cb359469cd78d4ad182442780b54d
diff --git a/manifest.uuid b/manifest.uuid
index 4d78dcc71a..0e111fe8a6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a7f6d19816cbfc50060a9d1c0c402cdd23bd16de
\ No newline at end of file
+4e2bf57549a8d50fc0993386c724eb4a2b35c9fe
\ No newline at end of file
diff --git a/tool/showwal.c b/tool/showwal.c
index 681291a7db..599d011647 100644
--- a/tool/showwal.c
+++ b/tool/showwal.c
@@ -231,8 +231,13 @@ static void print_oneline_frame(int iFrame, Cksum *pCksum){
           getInt32(aData+12),
           s0,
           s1,
-          (s0==pCksum->s0 && s1==pCksum->s1) ? "cksum-ok" : "cksum-fail"
+          (s0==pCksum->s0 && s1==pCksum->s1) ? "" : "cksum-fail"
   );
+
+  /* Reset the checksum so that a single frame checksum failure will not
+  ** cause all subsequent frames to also show a failure. */
+  pCksum->s0 = s0;
+  pCksum->s1 = s1;
   free(aData);
 }