From: stephan <stephan@noemail.net>
Date: Fri, 21 Mar 2025 21:13:44 +0000 (+0000)
Subject: Fix a multi-arg expr call in proj-current-proc-name (must be single-arg for portability).
X-Git-Tag: major-release~170
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e02fade10bd2f8eea7259c16f49bdebe0893c4c4;p=thirdparty%2Fsqlite.git

Fix a multi-arg expr call in proj-current-proc-name (must be single-arg for portability).

FossilOrigin-Name: 914768f3f5d63a891e1cd578afc676960376fc28ee0fa452fcd32cec0ea5cdaf
---

diff --git a/autosetup/proj.tcl b/autosetup/proj.tcl
index d6d42678eb..68498fb301 100644
--- a/autosetup/proj.tcl
+++ b/autosetup/proj.tcl
@@ -1373,5 +1373,5 @@ proc proj-get-env {var {dflt ""}} {
 # 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}
+  uplevel [expr {$lvl + 1}] {lindex [info level 0] 0}
 }
diff --git a/manifest b/manifest
index 6b242f7484..26c8b3bb88 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Teach\sthe\sCLI\sthat\sVT100-escape\scodes\sthat\sdo\sthings\slike\schange\sfont\ncolors\shave\szero-width\sfor\sthe\spurpose\sof\slaying\sout\sthe\scolumns\sof\sa\ntable.
-D 2025-03-21T18:15:13.290
+C Fix\sa\smulti-arg\sexpr\scall\sin\sproj-current-proc-name\s(must\sbe\ssingle-arg\sfor\sportability).
+D 2025-03-21T21:13:44.763
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -49,7 +49,7 @@ 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 8282fd8f14fa94be79a2f832a1c36d919ce4465216ce209d96820c6eb9a864e4
+F autosetup/proj.tcl 60e46519d8fa5da2c8b0226195923543e91b20657c27d33227af2d843f1b3a2a
 F autosetup/sqlite-config.tcl ff39112eddc68e9505562c6aefc0b505190fe1fe93b2273e0b50ce5c7bbf6e64
 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9
 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x
@@ -2216,8 +2216,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 ba7f1ff0d7d1d3fb79fc298d99fd27b65f639fb1691a1a9cdc9c006b8ff41212
-R 8af62bb2e2dc8ccdf26ae7c0bc939029
-U drh
-Z cfacc14c0921c2b298dd0d24d3eebca7
+P 2d0a8a6c38981552748ff5fc2eeba86590e0f116abac260a7fc9318de0a0dbda
+R 8c92fc288e7af142732c8fe3f14cf5ee
+U stephan
+Z 96ac08c8317a7dd73f053a8770e6d9bf
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 0b4b998c42..857aa289ca 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2d0a8a6c38981552748ff5fc2eeba86590e0f116abac260a7fc9318de0a0dbda
+914768f3f5d63a891e1cd578afc676960376fc28ee0fa452fcd32cec0ea5cdaf