Use macros for the default values for QRF limits in the CLI, rather than

hard-coded magic numbers.

FossilOrigin-Name: 4ef66da15bfe69d940cfbeff2be2b7e13da156495b349b453d68e70f4dcca36a

diff --git a/manifest b/manifest
index f448e298aab5a121e888063971855a4638008c42..74f44cc2d1e48a981a171c573cff767aa7ce1c01 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Various\simprovements\sto\sthe\s.mode\scommand\sof\sthe\sCLI,\sand\sespecially\sto\show\nit\shandles\sthe\s--limits\soption.
-D 2025-12-10T19:04:49.444
+C Use\smacros\sfor\sthe\sdefault\svalues\sfor\sQRF\slimits\sin\sthe\sCLI,\srather\sthan\nhard-coded\smagic\snumbers.
+D 2025-12-10T19:43:06.818
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -737,7 +737,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 8d53771eb51a4ab5f970150c3a70969d8db79cd04a8774c2d296bbcf471a0dd0
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c 344518c1bba9c4636bf651b7642304abd2e7075ba35feb4bae42a51e5efe991f
-F src/shell.c.in bc997c6f1b642eb1b9bbfbbb3bebe640c92bd9c657307f7ae944d48dbc94eaa0
+F src/shell.c.in be8dc6e392cb16eb6b52cc950cc45d14bd1dc0f46aaa4eb33bb0f7b38e991205
 F src/sqlite.h.in 706cacea5308b0244fb6cec92e08310fb427a125375c64137cc1f878ae4cf5c0
 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
 F src/sqlite3ext.h 5d5330f5f8461f5ce74960436ddcfa53ecd09c2b8b23901e22ae38aec3243998
@@ -2184,8 +2184,8 @@ F tool/version-info.c 33d0390ef484b3b1cb685d59362be891ea162123cea181cb8e6d2cf6dd
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 27b6aeda5d70e3480b1448b06277a19395b30a205f3f3bac5ce0e4102e3849ed
-R 18c9a9871ac7348fc8fa3c2691559943
+P f883b854976d2aa679c87edce3b577f38b5fa518f707706320d1ddb38365e2dd
+R 24498b37569a2ae0c2c4ec1e4e3d901c
 U drh
-Z 9f2923d3fed41ec33bf29c12acaf6248
+Z ecafff39bd33cce7916df7333bda9286
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index e9140b6ec4d8c06e3490c6c5f45f5089d3321bd0..ac25b71436821eef138dfeb9a9920709f5bb7f7b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f883b854976d2aa679c87edce3b577f38b5fa518f707706320d1ddb38365e2dd
+4ef66da15bfe69d940cfbeff2be2b7e13da156495b349b453d68e70f4dcca36a

diff --git a/src/shell.c.in b/src/shell.c.in
index 30c9ceda10983eb728bf5865228b6c703cc3aaa5..ccf3cd2c19f3618c1ce119cf07b99959e7c13360 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -1506,6 +1506,19 @@ static const ModeInfo aModeInfo[] = {
 #define SEP_Unit      "\x1F"
 #define SEP_Record    "\x1E"
 
+/*
+** Default values for the various QRF limits
+*/
+#ifndef DFLT_CHAR_LIMIT
+# define DFLT_CHAR_LIMIT  300
+#endif
+#ifndef DFLT_LINE_LIMIT
+# define DFLT_LINE_LIMIT  5
+#endif
+#ifndef DFLT_TITLE_LIMIT
+# define DFLT_TITLE_LIMIT 20
+#endif
+
 /*
 ** Limit input nesting via .read or any other input redirect.
 ** It's not too expensive, so a generous allowance can be made.
@@ -1626,10 +1639,10 @@ static void modeChange(ShellState *p, unsigned char eMode){
     modeChange(p, MODE_QBox);
     p->mode.bAutoScreenWidth = 1;
     p->mode.spec.eText = QRF_TEXT_Relaxed;
-    p->mode.spec.nCharLimit = 300;
-    p->mode.spec.nLineLimit = 5;
+    p->mode.spec.nCharLimit = DFLT_CHAR_LIMIT;
+    p->mode.spec.nLineLimit = DFLT_LINE_LIMIT;
     p->mode.spec.bTextJsonb = QRF_Yes;
-    p->mode.spec.nTitleLimit = 20;
+    p->mode.spec.nTitleLimit = DFLT_TITLE_LIMIT;
     p->mode.mFlags = mFlags;
   }
 }
@@ -7855,11 +7868,13 @@ static int dotCmdMode(ShellState *p){
       }
       k = pickStr(azArg[i],0,"on","off","");
       if( k==0 ){
-        p->mode.spec.nLineLimit = 5;
-        p->mode.spec.nCharLimit = 300;
+        p->mode.spec.nLineLimit = DFLT_LINE_LIMIT;
+        p->mode.spec.nCharLimit = DFLT_CHAR_LIMIT;
+        p->mode.spec.nTitleLimit = DFLT_TITLE_LIMIT;
       }else if( k==1 ){
         p->mode.spec.nLineLimit = 0;
         p->mode.spec.nCharLimit = 0;
+        p->mode.spec.nTitleLimit = 0;
       }else{
         int L, C, T = 0;
         int nNum = sscanf(azArg[i], "%d,%d,%d", &L, &C, &T);
@@ -8145,9 +8160,9 @@ static int dotCmdMode(ShellState *p){
        && p->mode.spec.nTitleLimit==0
       ){
         sqlite3_str_appendf(pDesc, " --limits off");
-      }else if( p->mode.spec.nLineLimit==5
-       && p->mode.spec.nCharLimit==300
-       && p->mode.spec.nTitleLimit==20
+      }else if( p->mode.spec.nLineLimit==DFLT_LINE_LIMIT
+       && p->mode.spec.nCharLimit==DFLT_CHAR_LIMIT
+       && p->mode.spec.nTitleLimit==DFLT_TITLE_LIMIT
       ){
         sqlite3_str_appendf(pDesc, " --limits on");
       }else{