From: drh <>
Date: Tue, 21 Oct 2025 20:10:44 +0000 (+0000)
Subject: Simplify the set of formatting choices.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ce3d809d6299dfb628ba81907803989906396a50;p=thirdparty%2Fsqlite.git

Simplify the set of formatting choices.

FossilOrigin-Name: 1f364ea3c08badd555a9ce70bb96cb8f862d6cc6425e9ff41da228fdd2f29361
---

diff --git a/ext/misc/resfmt.h b/ext/misc/resfmt.h
index 0de5b4a742..c13c077e84 100644
--- a/ext/misc/resfmt.h
+++ b/ext/misc/resfmt.h
@@ -58,24 +58,19 @@ int sqlite3_resfmt_finish(sqlite3_resfmt*,int*,char**);
 /*
 ** Output styles:
 */
-#define RESFMT_Line      0 /* One column per line. */
-#define RESFMT_Column    1 /* One record per line in neat columns */
-#define RESFMT_List      2 /* One record per line with a separator */
-#define RESFMT_Html      3 /* Generate an XHTML table */
-#define RESFMT_Insert    4 /* Generate SQL "insert" statements */
-#define RESFMT_Tcl       5 /* Generate ANSI-C or TCL quoted elements */
-#define RESFMT_Csv       6 /* Quote strings, numbers are plain */
-#define RESFMT_Explain   7 /* Like RESFMT_Column, but do not truncate data */
-#define RESFMT_Pretty    8 /* Pretty-print schemas */
-#define RESFMT_EQP       9 /* Converts EXPLAIN QUERY PLAN output into a graph */
-#define RESFMT_Json     10 /* Output JSON */
-#define RESFMT_Markdown 11 /* Markdown formatting */
-#define RESFMT_Table    12 /* MySQL-style table formatting */
-#define RESFMT_Box      13 /* Unicode box-drawing characters */
-#define RESFMT_Count    14 /* Output only a count of the rows of output */
-#define RESFMT_Off      15 /* No query output shown */
-#define RESFMT_ScanExp  16 /* Like RESFMT_Explain, but for ".scanstats vm" */
-#define RESFMT_Www      17 /* Full web-page output */
+#define RESFMT_List      0 /* One record per line with a separator */
+#define RESFMT_Line      1 /* One column per line. */
+#define RESFMT_Html      2 /* Generate an XHTML table */
+#define RESFMT_Insert    3 /* Generate SQL "insert" statements */
+#define RESFMT_Explain   4 /* EXPLAIN output */
+#define RESFMT_ScanExp   5 /* EXPLAIN output with vm stats */
+#define RESFMT_EQP       6 /* Converts EXPLAIN QUERY PLAN output into a graph */
+#define RESFMT_Markdown  7 /* Markdown formatting */
+#define RESFMT_Column    8 /* One record per line in neat columns */
+#define RESFMT_Table     9 /* MySQL-style table formatting */
+#define RESFMT_Box      10 /* Unicode box-drawing characters */
+#define RESFMT_Count    11 /* Output only a count of the rows of output */
+#define RESFMT_Off      12 /* No query output shown */
 
 /*
 ** Quoting styles for text.
diff --git a/manifest b/manifest
index 4e86603990..aabdd8d3c9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sTCL\sand\sJSON\soutput\sformatting.\s\sAdd\sthe\sability\sto\stest\sthe\sxRender.
-D 2025-10-21T19:56:13.695
+C Simplify\sthe\sset\sof\sformatting\schoices.
+D 2025-10-21T20:10:44.822
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -391,7 +391,7 @@ F ext/misc/regexp.c 548151f3e57506fda678e6a65e85a763f4eece653287e1ad44e167f9485e
 F ext/misc/remember.c add730f0f7e7436cd15ea3fd6a90fd83c3f706ab44169f7f048438b7d6baa69c
 F ext/misc/resfmt-tester.c 64b799da88145f7bd1b70635ffc629b2058dfa31e33d04c266ebeae36d1381a0
 F ext/misc/resfmt.c aedb80cf3eae75d85457b116c840c7a834aef867ae4efa1b45926656f13d4c4d
-F ext/misc/resfmt.h 0abf02956c5f03ff7823861d0134e541e435426ed5ba7209bf6dfb8b61e0cd0e
+F ext/misc/resfmt.h 35b86324479f51ac0a5a2e39ffb7ca0ca4663667b2892583a393c8a8fc6c6264
 F ext/misc/resfmt.md 6f6cefd95fa11ce30e4f34ea84052e7a8291dd48b7e666352bd7cf2e22c22ec4
 F ext/misc/rot13.c 51ac5f51e9d5fd811db58a9c23c628ad5f333c173f1fc53c8491a3603d38556c
 F ext/misc/scrub.c 2a44b0d44c69584c0580ad2553f6290a307a49df4668941d2812135bfb96a946
@@ -2175,8 +2175,8 @@ F tool/version-info.c 33d0390ef484b3b1cb685d59362be891ea162123cea181cb8e6d2cf6dd
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P ea69f1f81f867fe058889effdc128e8cc358b61b9121c1932bba8895bd709adb
-R a641b717f8c863cfe9f7783b03a1fbbf
+P 1a28eae74ed354d556f5ba45c716b03ff36d26b8a6729a5428d7895d8337af78
+R 6892d861551a00de62fd7fcb651f12e2
 U drh
-Z c54771a88c36058ccf9d5655df2db29b
+Z 7c407302cce92000d1b62ee6c390d8da
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 22776700e3..f8322532f6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1a28eae74ed354d556f5ba45c716b03ff36d26b8a6729a5428d7895d8337af78
+1f364ea3c08badd555a9ce70bb96cb8f862d6cc6425e9ff41da228fdd2f29361