Clear a few more -Wall warnings and simplify dynaprompt feature keep/omit macros.

FossilOrigin-Name: 540e895d877fab1ea138786e56923a202018f68c78199a89adfc296c75735b30

diff --git a/manifest b/manifest
index 38783ac47e79de29132b19744cfcecc6df2f4b99..e0cc60735d2c769a179fa284e4d165750526e2f3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\scompiler\swarnings\sin\sthe\snew\sdynamic\scontinuation\sprompt\slogic\sof\nthe\sCLI.
-D 2022-12-06T15:11:13.637
+C Clear\sa\sfew\smore\s-Wall\swarnings\sand\ssimplify\sdynaprompt\sfeature\skeep/omit\smacros.
+D 2022-12-06T17:59:05.853
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -646,7 +646,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 56162cde2f71314826f831618eae853205628080afa25cd90faef7a9b761dee4
-F src/shell.c.in f37273af2d5cd2299091b3c1e260254ebd7cd16d7602426983b36009290e8577
+F src/shell.c.in 991eff7f819f96ae76671e7aa44597ac702274fd441d3b0d9297cbd3b9ce1284
 F src/sqlite.h.in 1fe1836879ecbb2e28f00f44eb6092db09a2a06bf072af351c6c2466bd515496
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h c4b9fa7a7e2bcdf850cfeb4b8a91d5ec47b7a00033bc996fd2ee96cbf2741f5f
@@ -2067,8 +2067,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P c0cfe0582add87981826d124a0763482f51fae4b105b5a970dd56919f1d04d60
-R 19f4ce887fdd7ce982932018e71e1a9d
-U drh
-Z 087fdbe4ee41c07ef7676876e727f795
+P 0d80500d358fa1c9b5867c2c8250d278ba813bf2ad81bb0bc3f820a71489b374
+R d2096b6607984433a4c4474baae68bae
+U larrybr
+Z 397638802057e8cab20b3ed1dff696d1
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 16c4d729e4af6e4fdc560cd0fde4ac2cd19eb8a3..873db8bc54183cbb3de3f72312cba4d6523d7231 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0d80500d358fa1c9b5867c2c8250d278ba813bf2ad81bb0bc3f820a71489b374
\ No newline at end of file
+540e895d877fab1ea138786e56923a202018f68c78199a89adfc296c75735b30
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 85e708551d93295bba6c0bb454f9f6a06e8b304a..a5c4c48c1543d1041e44466ef97e50b5a2a72dab 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -482,24 +482,26 @@ static char continuePrompt[PROMPT_LEN_MAX];
 */
 #ifdef SQLITE_OMIT_DYNAPROMPT
 # define CONTINUATION_PROMPT continuePrompt
-# define CONTINUE_PROMPT_RESET(p)
+# define CONTINUE_PROMPT_RESET
 # define CONTINUE_PROMPT_AWAITS(p,s)
 # define CONTINUE_PROMPT_AWAITC(p,c)
 # define CONTINUE_PAREN_INCR(p,n)
-# define CONTINUE_PROMPT_STATE 0
-# define SCAN_TRACKER_REFTYPE void*
+# define CONTINUE_PROMPT_PSTATE 0
+typedef void *t_NoDynaPrompt;
+# define SCAN_TRACKER_REFTYPE t_NoDynaPrompt
 #else
 # define CONTINUATION_PROMPT dynamicContinuePrompt()
-# define CONTINUE_PROMPT_RESET(p) \
-  if(p) (setLexemeOpen(p,0,0), trackParenLevel(p,0))
+# define CONTINUE_PROMPT_RESET \
+  do {setLexemeOpen(&dynPrompt,0,0); trackParenLevel(&dynPrompt,0);} while(0)
 # define CONTINUE_PROMPT_AWAITS(p,s) \
   if(p && stdin_is_interactive) setLexemeOpen(p, s, 0)
 # define CONTINUE_PROMPT_AWAITC(p,c) \
   if(p && stdin_is_interactive) setLexemeOpen(p, 0, c)
 # define CONTINUE_PAREN_INCR(p,n) \
   if(p && stdin_is_interactive) (trackParenLevel(p,n))
-# define SCAN_TRACKER_REFTYPE struct DynaPrompt *
-# define CONTINUE_PROMPT_STATE (pDynPrompt)
+# define CONTINUE_PROMPT_PSTATE (&dynPrompt)
+typedef struct DynaPrompt *t_DynaPromptRef;
+# define SCAN_TRACKER_REFTYPE t_DynaPromptRef
 
 static struct DynaPrompt {
   char dynamicPrompt[PROMPT_LEN_MAX];
@@ -507,7 +509,6 @@ static struct DynaPrompt {
   int inParenLevel;
   char *zScannerAwaits;
 } dynPrompt = { {0}, {0}, 0, 0 };
-static struct DynaPrompt *pDynPrompt = &dynPrompt;
 
 /* Record parenthesis nesting level change, or force level to 0. */
 static void trackParenLevel(struct DynaPrompt *p, int ni){
@@ -542,11 +543,11 @@ static char *dynamicContinuePrompt(void){
              PROMPT_LEN_MAX-4);
     }else{
       if( dynPrompt.inParenLevel>9 ){
-       strncpy(dynPrompt.dynamicPrompt, "(..", 3);
+       strncpy(dynPrompt.dynamicPrompt, "(..", 4);
       }else if( dynPrompt.inParenLevel<0 ){
-       strncpy(dynPrompt.dynamicPrompt, ")x!", 3);
+       strncpy(dynPrompt.dynamicPrompt, ")x!", 4);
       }else{
-       strncpy(dynPrompt.dynamicPrompt, "(x.", 3);
+       strncpy(dynPrompt.dynamicPrompt, "(x.", 4);
        dynPrompt.dynamicPrompt[2] = (char)('0'+dynPrompt.inParenLevel);
       }
       strncpy(dynPrompt.dynamicPrompt+3, continuePrompt+3, PROMPT_LEN_MAX-4);
@@ -11288,7 +11289,7 @@ static int process_input(ShellState *p){
   }
   ++p->inputNesting;
   p->lineno = 0;
-  CONTINUE_PROMPT_RESET(CONTINUE_PROMPT_STATE);
+  CONTINUE_PROMPT_RESET;
   while( errCnt==0 || !bail_on_error || (p->in==0 && stdin_is_interactive) ){
     fflush(p->out);
     zLine = one_input_line(p->in, zLine, nSql>0);
@@ -11307,7 +11308,7 @@ static int process_input(ShellState *p){
         && line_is_complete(zSql, nSql) ){
       memcpy(zLine,";",2);
     }
-    qss = quickscan(zLine, qss, CONTINUE_PROMPT_STATE);
+    qss = quickscan(zLine, qss, CONTINUE_PROMPT_PSTATE);
     if( QSS_PLAINWHITE(qss) && nSql==0 ){
       /* Just swallow single-line whitespace */
       echo_group_input(p, zLine);
@@ -11315,7 +11316,7 @@ static int process_input(ShellState *p){
       continue;
     }
     if( zLine && (zLine[0]=='.' || zLine[0]=='#') && nSql==0 ){
-      CONTINUE_PROMPT_RESET(CONTINUE_PROMPT_STATE);
+      CONTINUE_PROMPT_RESET;
       echo_group_input(p, zLine);
       if( zLine[0]=='.' ){
         rc = do_meta_command(zLine, p);
@@ -11351,7 +11352,7 @@ static int process_input(ShellState *p){
     if( nSql && QSS_SEMITERM(qss) && sqlite3_complete(zSql) ){
       echo_group_input(p, zSql);
       errCnt += runOneSqlLine(p, zSql, p->in, startline);
-      CONTINUE_PROMPT_RESET(CONTINUE_PROMPT_STATE);
+      CONTINUE_PROMPT_RESET;
       nSql = 0;
       if( p->outCount ){
         output_reset(p);
@@ -11371,7 +11372,7 @@ static int process_input(ShellState *p){
     /* This may be incomplete. Let the SQL parser deal with that. */
     echo_group_input(p, zSql);
     errCnt += runOneSqlLine(p, zSql, p->in, startline);
-    CONTINUE_PROMPT_RESET(CONTINUE_PROMPT_STATE);
+    CONTINUE_PROMPT_RESET;
   }
   free(zSql);
   free(zLine);