Fix compiler warnings in the new dynamic continuation prompt logic of

the CLI.

FossilOrigin-Name: 0d80500d358fa1c9b5867c2c8250d278ba813bf2ad81bb0bc3f820a71489b374

diff --git a/manifest b/manifest
index c7b2bd3bb1141fa25fb312761f85167148f36864..38783ac47e79de29132b19744cfcecc6df2f4b99 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sthe\sunix\sbackend,\swhen\simplementing\sthe\sdefenses\sagainst\ssmall\sfile\ndescriptors,\sdelete\sa\sfile\sjust\screated\sif\sit\swas\sopened\swith\nO_EXCL|O_CREAT\sso\sthat\sit\scan\sbe\screated\sagain\sthe\snext\stime\sthrough\sthe\nloop.\s\sFix\sfor\sthe\sproblem\sdescribed\sby\n[forum:/forumpost/699af709ab3a8ccf|forum\spost\s699af709ab3a8ccf].
-D 2022-12-06T13:12:33.146
+C Fix\scompiler\swarnings\sin\sthe\snew\sdynamic\scontinuation\sprompt\slogic\sof\nthe\sCLI.
+D 2022-12-06T15:11:13.637
 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 f4ef4c6bca35bcab91041c2e10ac9b53440c37d5751563713cc7feaa8c1ac880
+F src/shell.c.in f37273af2d5cd2299091b3c1e260254ebd7cd16d7602426983b36009290e8577
 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 d3f6a207fd1b3f53688fa1ff35eb71e1c5bcc4115c0c35bb187d22ccf7100b71
-R a4b71026bbbedf9b7ee6a91d6a043bd8
+P c0cfe0582add87981826d124a0763482f51fae4b105b5a970dd56919f1d04d60
+R 19f4ce887fdd7ce982932018e71e1a9d
 U drh
-Z d5e50db849cd86cf21ff12c0ca4a2cbc
+Z 087fdbe4ee41c07ef7676876e727f795
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 132ad427f2681b5be5c4209e207cc1a4d8a805a2..16c4d729e4af6e4fdc560cd0fde4ac2cd19eb8a3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c0cfe0582add87981826d124a0763482f51fae4b105b5a970dd56919f1d04d60
\ No newline at end of file
+0d80500d358fa1c9b5867c2c8250d278ba813bf2ad81bb0bc3f820a71489b374
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 78e681c02225c275044ec80527b3f003f9d18de1..85e708551d93295bba6c0bb454f9f6a06e8b304a 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -499,7 +499,7 @@ static char continuePrompt[PROMPT_LEN_MAX];
 # define CONTINUE_PAREN_INCR(p,n) \
   if(p && stdin_is_interactive) (trackParenLevel(p,n))
 # define SCAN_TRACKER_REFTYPE struct DynaPrompt *
-# define CONTINUE_PROMPT_STATE ((SCAN_TRACKER_REFTYPE)&dynPrompt)
+# define CONTINUE_PROMPT_STATE (pDynPrompt)
 
 static struct DynaPrompt {
   char dynamicPrompt[PROMPT_LEN_MAX];
@@ -507,6 +507,7 @@ 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){