From: drh Date: Thu, 8 Dec 2016 19:04:36 +0000 (+0000) Subject: Fix a minor error in the cg_anno.tcl script causing the cycles-per-file counts X-Git-Tag: version-3.16.0~67 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5f00b9bea717fb3798fe30dd0e3694df76c50310;p=thirdparty%2Fsqlite.git Fix a minor error in the cg_anno.tcl script causing the cycles-per-file counts to be miscomputed. FossilOrigin-Name: b26df26e184ec6da4b5537526c10f42a293d09b5 --- diff --git a/manifest b/manifest index 85a244513e..767b0b5ba8 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Update\sthe\stool/cg_anno.tcl\sscript\sto\sgive\sa\ssummary\sof\scycle\scounts\sby\ncanonical\ssource\sfile\sname. -D 2016-12-08T18:36:19.891 +C Fix\sa\sminor\serror\sin\sthe\scg_anno.tcl\sscript\scausing\sthe\scycles-per-file\scounts\nto\sbe\smiscomputed. +D 2016-12-08T19:04:36.568 F Makefile.in 7639c6a09da11a9c7c6f2630fc981ee588d1072d F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da @@ -1453,7 +1453,7 @@ F tool/Replace.cs 02c67258801c2fb5f63231e0ac0f220b4b36ba91 F tool/addopcodes.tcl 10c889c4a65ec6c5604e4a47306fa77ff57ae189 F tool/build-all-msvc.bat 018c1b273458a90c8ba633c6f0c5654cfcb138bf x F tool/build-shell.sh 950f47c6174f1eea171319438b93ba67ff5bf367 -F tool/cg_anno.tcl ac9802cc0f6661beb3bf02dc8792151fdb2ce4a5 x +F tool/cg_anno.tcl f95b0006c52cf7f0496b506343415b6ee3cdcdd3 x F tool/checkSpacing.c 810e51703529a204fc4e1eb060e9ab663e3c06d2 F tool/dbhash.c a06228aa21ebc4e6ea8daa486601d938499238a5 F tool/extract.c 054069d81b095fbdc189a6f5d4466e40380505e2 @@ -1536,7 +1536,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 83bc5e40af9b20afeed008bf3e2669b7ac9e2dc8 -R 92154a53c8af746c5059d64a2c3e6ba6 +P 254a83bf30c15d6a355db309ccb97a8744675cc3 +R c83132c87ae23a23d263e8ee60d3c2ea U drh -Z cc8ee367bbd5864c12ba6ee49a8e2fe0 +Z c2b446af19201dba66c3a9f1ed9bef6f diff --git a/manifest.uuid b/manifest.uuid index b636c3a582..aa4fd7848a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -254a83bf30c15d6a355db309ccb97a8744675cc3 \ No newline at end of file +b26df26e184ec6da4b5537526c10f42a293d09b5 \ No newline at end of file diff --git a/tool/cg_anno.tcl b/tool/cg_anno.tcl index 0d2bd4dbd5..43d2b74fcd 100755 --- a/tool/cg_anno.tcl +++ b/tool/cg_anno.tcl @@ -28,7 +28,7 @@ while {![eof $in]} { set dest ! } append out($dest) $line\n - if {$cntlines && [regexp { *([0-9,]+) } $line all x]} { + if {$cntlines} { incr linenum if {[regexp {^ *([0-9,]+) } $line all x]} { set x [string map {, {}} $x]