From: drh <>
Date: Mon, 16 Jun 2025 13:51:09 +0000 (+0000)
Subject: Add an "#if 0" that can be changed to "1" to cause all %p output to render
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=67f708298f97bbbad6c824fb1d6dfe4e310dd176;p=thirdparty%2Fsqlite.git

Add an "#if 0" that can be changed to "1" to cause all %p output to render
as 0, thus making comparisons of .treetrace and .wheretrace output easier.

FossilOrigin-Name: 65e2704c0bc329f3dd248548a2d4edb7d3ace8ceaf0b82b8618b9b1b764884cd
---

diff --git a/manifest b/manifest
index bc123ab3c4..c59a999578 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Have\ssqlite3_setlk_timeout()\stake\sthe\sdatabase\shandle\smutex.\sThis\sfixes\san\sassert()\sfailure\sthat\scould\soccur\sif\ssqlite3_setlk_timeout()\swere\scalled\son\sa\sthreadsafe\shandle.
-D 2025-06-12T07:35:38.259
+C Add\san\s"#if\s0"\sthat\scan\sbe\schanged\sto\s"1"\sto\scause\sall\s%p\soutput\sto\srender\nas\s0,\sthus\smaking\scomparisons\sof\s.treetrace\sand\s.wheretrace\soutput\seasier.
+D 2025-06-16T13:51:09.523
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -781,7 +781,7 @@ F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5
 F src/pcache1.c 131ca0daf4e66b4608d2945ae76d6ed90de3f60539afbd5ef9ec65667a5f2fcd
 F src/pragma.c 30b535d0a66348df844ee36f890617b4cf45e9a22dcbc47ec3ca92909c50aaf1
 F src/prepare.c 1832be043fce7d489959aae6f994c452d023914714c4d5457beaed51c0f3d126
-F src/printf.c 3b91c334f528359145f4dde0dedd945bbb21044d0825ea064934d7222d61662c
+F src/printf.c b3f5d5985ad2ed7788f6b995b82eb5473ac85a4b2518928357e4c169bbc5036c
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c d40fe18d7c2fd0339f5846ffcf7d6809866e380acdf14c76fb2af87e9fe13f64
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
@@ -2208,8 +2208,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P badf3014bd1620fd3d4b8013f641fd820b249649fb93cc75b7b8df9dfd6f32a6
-R 7fdf393495e0e2303824909fb18b2ec1
-U dan
-Z 94b5809cfbb11f003ae05c3735568843
+P a95d126e1330e1b83f42b51f97c4c216622cf38062f3b5d72ccb76313187e850
+R 28a37efb7976a86b6b17f38b3f49ac71
+U drh
+Z 3c3ba90a348ba2f0f444843c76227e30
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 1b41af25f6..2b9f7e2060 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a95d126e1330e1b83f42b51f97c4c216622cf38062f3b5d72ccb76313187e850
+65e2704c0bc329f3dd248548a2d4edb7d3ace8ceaf0b82b8618b9b1b764884cd
diff --git a/src/printf.c b/src/printf.c
index 8cb5a43c5e..4064936770 100644
--- a/src/printf.c
+++ b/src/printf.c
@@ -416,6 +416,15 @@ void sqlite3_str_vappendf(
           }
           prefix = 0;
         }
+
+#if 0
+        /* Change the "#if 0" above to "#if 1" to cause all %p outputs
+        ** to be rendered as 0.  This is useful when comparing .treetrace
+        ** or .wheretrace outputs, as it means the  the pointer values
+        ** will compare equal. */
+        if( xtype==etPOINTER ) longvalue = 0;
+#endif
+
         if( longvalue==0 ) flag_alternateform = 0;
         if( flag_zeropad && precision<width-(prefix!=0) ){
           precision = width-(prefix!=0);