From: stephan <stephan@noemail.net>
Date: Fri, 21 Mar 2025 16:49:32 +0000 (+0000)
Subject: Flesh out the new proc-debug and its infrastructure a bit.
X-Git-Tag: major-release~172
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=11d5bea2108f51f5aefd2fc2748e6916cce362ca;p=thirdparty%2Fsqlite.git

Flesh out the new proc-debug and its infrastructure a bit.

FossilOrigin-Name: ba7f1ff0d7d1d3fb79fc298d99fd27b65f639fb1691a1a9cdc9c006b8ff41212
---

diff --git a/autosetup/proj.tcl b/autosetup/proj.tcl
index 3698c8c1f4..d6d42678eb 100644
--- a/autosetup/proj.tcl
+++ b/autosetup/proj.tcl
@@ -1369,8 +1369,9 @@ proc proj-get-env {var {dflt ""}} {
 ########################################################################
 # @proj-current-proc-name
 #
-# Returns the name of the _calling_ proc from $lvl levels up the call
-# stack. Derived from: https://stackoverflow.com/questions/10012851
-proc proj-current-proc-name {{lvl 1}} {
-  uplevel $lvl {lindex [info level 0] 0}
+# Returns the name of the _calling_ proc from ($lvl + 1) levels up the
+# call stack (where the caller's level will be 1 below _this_
+# call). It is not legal to call this from the top scope.
+proc proj-current-proc-name {{lvl 0}} {
+  uplevel [expr $lvl + 1] {lindex [info level 0] 0}
 }
diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl
index 48155af496..5bf9e34c4b 100644
--- a/autosetup/sqlite-config.tcl
+++ b/autosetup/sqlite-config.tcl
@@ -486,7 +486,7 @@ proc msg-debug {msg} {
 # the debug message. It is not legal to call this from the global
 # scope.
 proc proc-debug {msg} {
-  msg-debug "\[[proj-current-proc-name 2]\]: $msg"
+  msg-debug "\[[proj-current-proc-name 1]\]: $msg"
 }
 
 ########################################################################
diff --git a/manifest b/manifest
index b02a1c56e5..aa6df8a09f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Proxy\sconfigure's\smsg-debug\swith\sproc-debug,\swhich\sworks\sthe\ssame\sexcept\sthat\sit\sprepends\sthe\sname\sof\sthe\scalling\sproc\sto\sthe\sdebug\smessage.\sNo\sfunctional\schanges.
-D 2025-03-21T16:06:16.983
+C Flesh\sout\sthe\snew\sproc-debug\sand\sits\sinfrastructure\sa\sbit.
+D 2025-03-21T16:49:32.629
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -49,8 +49,8 @@ F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1d
 F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e45f
 F autosetup/jimsh0.c a57c16e65dcffc9c76e496757cb3f7fb47e01ecbd1631a0a5e01751fc856f049
 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
-F autosetup/proj.tcl 2753b2ca95d3f91d4facc447b61a3090a0aea86a41c33ef8ad9db8d0bb0d464d
-F autosetup/sqlite-config.tcl 27ac8b7634a4d54e93a61bc13d56985b890e58e24c77c4bab93b53a5d1843973
+F autosetup/proj.tcl 8282fd8f14fa94be79a2f832a1c36d919ce4465216ce209d96820c6eb9a864e4
+F autosetup/sqlite-config.tcl ff39112eddc68e9505562c6aefc0b505190fe1fe93b2273e0b50ce5c7bbf6e64
 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9
 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x
 F contrib/sqlitecon.tcl eb4c6578e08dd353263958da0dc620f8400b869a50d06e271ab0be85a51a08d3
@@ -2215,8 +2215,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 260e9884118172ef76457a34042ace301f20abab4ced172f6b6135010c446a68
-R e20098aa98dd2dc6f5c975996659e451
+P f0298c773d3490ad3a5b53d2ceeff1bd90e1a7bb5deeba2d24f681ec1bc10510
+R 3cc891ff71296fb59fcd1fa5eb66bbd2
 U stephan
-Z eacd552cb3abab15f251e0a9034bd2ad
+Z 05c9795d3fb61aee80553fe96bed0bc9
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index c77f3fbe4b..8597b0b793 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f0298c773d3490ad3a5b53d2ceeff1bd90e1a7bb5deeba2d24f681ec1bc10510
+ba7f1ff0d7d1d3fb79fc298d99fd27b65f639fb1691a1a9cdc9c006b8ff41212