Some renaming, warnings cured, and more coding convention conformance.

FossilOrigin-Name: 58815f0ad259599a674e7d0fe0d4676a1c4fb8e118c08b619580ff655fb3be40

diff --git a/manifest b/manifest
index 22d3223f7ec8761e9ec03102a15f64f220ae3147..34234276c13b04d7891ca751ded8836ec741cd30 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\san\sfputs()\sequivalent\sto\sconsole\sI/O\slib,\sand\suse\sin\sCLI.
-D 2023-11-06T13:24:07.790
+C Some\srenaming,\swarnings\scured,\sand\smore\scoding\sconvention\sconformance.
+D 2023-11-06T15:15:58.179
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -669,8 +669,8 @@ F src/btreeInt.h ef12a72b708677e48d6bc8dcd66fed25434740568b89e2cfa368093cfc5b9d1
 F src/build.c 189e4517d67f09f0a3e0d8e1faa6e2ef0c2e95f6ac82e33c912cb7efa2a359cc
 F src/callback.c db3a45e376deff6a16c0058163fe0ae2b73a2945f3f408ca32cf74960b28d490
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
-F src/console_io.c 6bc9b7f00dd29873519f650e52de974d811c9c36c3a2914fb65d8764c6fbabeb x
-F src/console_io.h cf7a58e120603a16ea15cf5f32a5aa3012ee2def26a610b763009d3b266d15ad
+F src/console_io.c 7c9d44ae378855778b7c4bb171df336e5f0e629107e56d93fcaaa41b512d253d x
+F src/console_io.h 92a765da11922b57c899132fd31fb9f6a54802d9ca2489e618a66b7d5334acb9
 F src/ctime.c 23331529e654be40ca97d171cbbffe9b3d4c71cc53b78fe5501230675952da8b
 F src/date.c eebc54a00e888d3c56147779e9f361b77d62fd69ff2008c5373946aa1ba1d574
 F src/dbpage.c 80e46e1df623ec40486da7a5086cb723b0275a6e2a7b01d9f9b5da0f04ba2782
@@ -727,7 +727,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c d017bad7ba8e778617701a0e986fdeb393d67d6afa84fb28ef4e8b8ad2acf916
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c a19daa26e95f7245106a31f288b2f50c72d1f2cc156703f04c8c91450e111515
-F src/shell.c.in 18440bb3296508bc92673c10e4293c97aa11bc3d3a6bb0ed0c16c0c73b6ec558
+F src/shell.c.in d1fdac3c508f939554c1e11694d36ce30645febfc653a91a2bdb78a75b65bb7a
 F src/sqlite.h.in ef0e41e83ad1ac0dcc9ec9939bf541a44b1c5de821bee2d6c61754c3252f3276
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
@@ -2144,8 +2144,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 bf66a7c1d330b04fd3c3e50f43ebe1e41307db59d7189798acafb3de77e0c8b2
-R 873651c11fd34fdadd7d1e7335c5cb89
+P d661f90724b1bd31948169841bacb80ba4ae91b52191a0b0021a89a22d932a02
+R 51e773e98c65b583317374019e2b48c6
 U larrybr
-Z 556f0a6b391897986638a1109b2be8a2
+Z 7c8e9716e1490034796ed7b1b7236e3d
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 45db515f6fcd223a70ac5310a1140d2c88a21f4b..90ab247018124790ce88220cdf13633e23102657 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d661f90724b1bd31948169841bacb80ba4ae91b52191a0b0021a89a22d932a02
\ No newline at end of file
+58815f0ad259599a674e7d0fe0d4676a1c4fb8e118c08b619580ff655fb3be40
\ No newline at end of file

diff --git a/src/console_io.c b/src/console_io.c
index 2c62c7049e2921accd14c51b4d7ce3a77647b810..06db83aaccd699b50005d4beb9bd0a0c7a5db28f 100755 (executable)
--- a/src/console_io.c
+++ b/src/console_io.c
@@ -122,7 +122,7 @@ static ConsoleInfo consoleInfo = {
 };
 #undef CI_INITIALIZER
 
-INT_LINKAGE ConsoleStdConsStreams
+SQLITE_INTERNAL_LINKAGE ConsoleStdConsStreams
 consoleClassifySetup( FILE *pfIn, FILE *pfOut, FILE *pfErr ){
   ConsoleStdConsStreams rv = CSCS_NoConsole;
   FILE *apf[3] = { pfIn, pfOut, pfErr };
@@ -152,7 +152,7 @@ consoleClassifySetup( FILE *pfIn, FILE *pfOut, FILE *pfErr ){
   return rv;
 }
 
-INT_LINKAGE void SQLITE_CDECL consoleRestore( void ){
+SQLITE_INTERNAL_LINKAGE void SQLITE_CDECL consoleRestore( void ){
   if( consoleInfo.cscs ){
     int ix;
     for( ix=0; ix<3; ++ix ){
@@ -199,15 +199,15 @@ static void setModeFlushQ(FILE *pf, short bFlush, int mode){
 # define setModeFlushQ(f, b, m) if(isConOut(f)>0||b) fflush(f)
 #endif
 
-INT_LINKAGE void setBinaryMode(FILE *pf, short bFlush){
+SQLITE_INTERNAL_LINKAGE void setBinaryMode(FILE *pf, short bFlush){
   setModeFlushQ(pf, bFlush, _O_BINARY);
 }
-INT_LINKAGE void setTextMode(FILE *pf, short bFlush){
+SQLITE_INTERNAL_LINKAGE void setTextMode(FILE *pf, short bFlush){
   setModeFlushQ(pf, bFlush, _O_TEXT);
 }
 #undef setModeFlushQ
 
-INT_LINKAGE int fprintfUtf8(FILE *pfO, const char *zFormat, ...){
+SQLITE_INTERNAL_LINKAGE int fprintfUtf8(FILE *pfO, const char *zFormat, ...){
   va_list ap;
   int rv = 0;
 #if SHELL_CON_TRANSLATE
@@ -255,7 +255,7 @@ INT_LINKAGE int fprintfUtf8(FILE *pfO, const char *zFormat, ...){
   return rv;
 }
 
-INT_LINKAGE int fputsUtf8(const char *z, FILE *pfO){
+SQLITE_INTERNAL_LINKAGE int fputsUtf8(const char *z, FILE *pfO){
 #if SHELL_CON_TRANSLATE
   return fprintfUtf8(pfO, "%s", z);
 #else
@@ -263,7 +263,7 @@ INT_LINKAGE int fputsUtf8(const char *z, FILE *pfO){
 #endif
 }
 
-INT_LINKAGE char* fgetsUtf8(char *cBuf, int ncMax, FILE *pfIn){
+SQLITE_INTERNAL_LINKAGE char* fgetsUtf8(char *cBuf, int ncMax, FILE *pfIn){
   if( pfIn==0 ) pfIn = stdin;
 #if SHELL_CON_TRANSLATE
   if( pfIn == consoleInfo.pst[0].pf ){

diff --git a/src/console_io.h b/src/console_io.h
index a46e69aa46e6ba562a1cda1bc15b87675c36c75e..2cbc2c1f977d9d8eaf7701a9468adfbbfb26ef85 100644 (file)
--- a/src/console_io.h
+++ b/src/console_io.h
@@ -24,8 +24,8 @@
 ** This code may change in tandem with other project code as needed.
 */
 
-#ifndef INT_LINKAGE
-# define INT_LINKAGE extern /* Linkage external to translation unit. */
+#ifndef SQLITE_INTERNAL_LINKAGE
+# define SQLITE_INTERNAL_LINKAGE extern /* external to translation unit */
 # include <stdio.h>
 # include <stdlib.h>
 # include <limits.h>
@@ -71,7 +71,7 @@ typedef enum ConsoleStdConsStreams {
 ** inherits the same I/O streams may call this function after
 ** such a process exits to guard against console mode changes.
 */
-INT_LINKAGE ConsoleStdConsStreams
+SQLITE_INTERNAL_LINKAGE ConsoleStdConsStreams
 consoleClassifySetup( FILE *pfIn, FILE *pfOut, FILE *pfErr );
 
 /*
@@ -88,7 +88,7 @@ consoleClassifySetup( FILE *pfIn, FILE *pfOut, FILE *pfErr );
 ** before so that said process will have a console setup
 ** however users have configured it or come to expect.
 */
-INT_LINKAGE void SQLITE_CDECL consoleRestore( void );
+SQLITE_INTERNAL_LINKAGE void SQLITE_CDECL consoleRestore( void );
 
 /*
 ** Render output like fprintf(). If the output is going to the
@@ -97,7 +97,7 @@ INT_LINKAGE void SQLITE_CDECL consoleRestore( void );
 ** to the provided stream almost as-is, possibly with newline
 ** translation as specified by set{Binary,Text}Mode().
 */
-INT_LINKAGE int fprintfUtf8(FILE *pfO, const char *zFormat, ...);
+SQLITE_INTERNAL_LINKAGE int fprintfUtf8(FILE *pfO, const char *zFormat, ...);
 
 /*
 ** Render output like fputs(). If the output is going to the
@@ -106,7 +106,7 @@ INT_LINKAGE int fprintfUtf8(FILE *pfO, const char *zFormat, ...);
 ** provided stream almost as-is, possibly with newline
 ** translation as specified by set{Binary,Text}Mode().
 */
-INT_LINKAGE int fputsUtf8(const char *z, FILE *pfO);
+SQLITE_INTERNAL_LINKAGE int fputsUtf8(const char *z, FILE *pfO);
 
 /*
 ** Collect input like fgets(...) with special provisions for input
@@ -115,7 +115,7 @@ INT_LINKAGE int fputsUtf8(const char *z, FILE *pfO);
 ** translation may be done as set by set{Binary,Text}Mode(). As a
 ** convenience, pfIn==NULL is treated as stdin.
 */
-INT_LINKAGE char* fgetsUtf8(char *cBuf, int ncMax, FILE *pfIn);
+SQLITE_INTERNAL_LINKAGE char* fgetsUtf8(char *cBuf, int ncMax, FILE *pfIn);
 
 /*
 ** Set given stream for binary mode, where newline translation is
@@ -130,8 +130,8 @@ INT_LINKAGE char* fgetsUtf8(char *cBuf, int ncMax, FILE *pfIn);
 ** translation. On all platforms, newline to the console starts
 ** a new line and CR,LF chars from the console become a newline.
 */
-INT_LINKAGE void setBinaryMode(FILE *, short bFlush);
-INT_LINKAGE void setTextMode(FILE *, short bFlush);
+SQLITE_INTERNAL_LINKAGE void setBinaryMode(FILE *, short bFlush);
+SQLITE_INTERNAL_LINKAGE void setTextMode(FILE *, short bFlush);
 
 typedef struct Prompts {
   int numPrompts;
@@ -177,10 +177,11 @@ typedef struct Prompts {
 ** This function may call upon services of a line-editing
 ** library to interactively collect line edited input.
 */
-INT_LINKAGE char *
+#if 0 /* not yet implemented */
+SQLITE_INTERNAL_LINKAGE char *
 shellGetLine(FILE *pfIn, char *zBufPrior, int nLen,
              short isContinuation, Prompts azPrompt);
-
+#endif
 /*
 ** TBD: Define an interface for application(s) to generate
 ** completion candidates for use by the line-editor.

diff --git a/src/shell.c.in b/src/shell.c.in
index 5b1275e7b4993d0f6338aeaddb610759df9eb2da..009b9d43182cbfcf9a68b62c22e583c0b8016267 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -237,7 +237,7 @@ extern char *sqlite3_win32_unicode_to_utf8(LPCWSTR);
 extern LPWSTR sqlite3_win32_utf8_to_unicode(const char *zText);
 #endif
 
-#define INT_LINKAGE static
+#define SQLITE_INTERNAL_LINKAGE static
 
 INCLUDE console_io.h
 INCLUDE console_io.c
@@ -557,7 +557,8 @@ static char *dynamicContinuePrompt(void){
         shell_strncpy(dynPrompt.dynamicPrompt, "(x.", 4);
         dynPrompt.dynamicPrompt[2] = (char)('0'+dynPrompt.inParenLevel);
       }
-      shell_strncpy(dynPrompt.dynamicPrompt+3, continuePrompt+3, PROMPT_LEN_MAX-4);
+      shell_strncpy(dynPrompt.dynamicPrompt+3, continuePrompt+3,
+                    PROMPT_LEN_MAX-4);
     }
   }
   return dynPrompt.dynamicPrompt;
@@ -568,7 +569,7 @@ static char *dynamicContinuePrompt(void){
 #define fgets(b,n,f) fgetsUtf8(b,n,f)
 /* And, (varargs) utf8_printf(f,z,...) is redirected to the same. */
 #define utf8_printf fprintfUtf8
-/* And, rfprintf(f,z) is redirected to fputsUtf8(z,f) in the library. */
+/* And, utf8_print(f,z) is redirected to fputsUtf8(z,f) in the library. */
 #define utf8_print(f,z) fputsUtf8(z,f)
 
 /* Indicate out-of-memory and exit. */
@@ -3340,7 +3341,7 @@ static void display_scanstats(
   UNUSED_PARAMETER(pArg);
 #else
   if( pArg->scanstatsOn==3 ){
-    const char *zSql = 
+    const char *zSql =
       "  SELECT addr, opcode, p1, p2, p3, p4, p5, comment, nexec,"
       "   round(ncycle*100.0 / (sum(ncycle) OVER ()), 2)||'%' AS cycles"
       "   FROM bytecode(?)";
@@ -4026,7 +4027,7 @@ static int expertFinish(
         const char *zEQP = sqlite3_expert_report(p, i, EXPERT_REPORT_PLAN);
         if( zIdx==0 ) zIdx = "(no new indexes)\n";
         if( bVerbose ){
-          utf8_printf(out, "-- Query %d --------------------------------\n",i+1);
+          utf8_printf(out,"-- Query %d --------------------------------\n",i+1);
           utf8_printf(out, "%s\n\n", zSql);
         }
         utf8_printf(out, "%s\n", zIdx);
@@ -9990,7 +9991,7 @@ static int do_meta_command(char *zLine, ShellState *p){
       }else{
         rc = sqlite3session_attach(pSession->p, azCmd[1]);
         if( rc ){
-          utf8_printf(stderr, "ERROR: sqlite3session_attach() returns %d\n", rc);
+          utf8_printf(stderr, "ERROR: sqlite3session_attach() returns %d\n",rc);
           rc = 0;
         }
       }
@@ -10729,7 +10730,7 @@ static int do_meta_command(char *zLine, ShellState *p){
     {"seek_count",         SQLITE_TESTCTRL_SEEK_COUNT,  0, ""               },
     {"sorter_mmap",        SQLITE_TESTCTRL_SORTER_MMAP, 0, "NMAX"           },
     {"tune",               SQLITE_TESTCTRL_TUNE,        1, "ID VALUE"       },
-    {"uselongdouble",    SQLITE_TESTCTRL_USELONGDOUBLE,0,"?BOOLEAN|\"default\"?"},
+    {"uselongdouble",  SQLITE_TESTCTRL_USELONGDOUBLE,0,"?BOOLEAN|\"default\"?"},
     };
     int testctrl = -1;
     int iCtrl = -1;
@@ -11737,9 +11738,6 @@ static const char zOptions[] =
   "   -multiplex           enable the multiplexor VFS\n"
 #endif
   "   -newline SEP         set output row separator. Default: '\\n'\n"
-#if SHELL_WIN_UTF8_OPT
-  "   -no-utf8             do not try to set up UTF-8 output (for legacy)\n"
-#endif
   "   -nofollow            refuse to open symbolic links to database files\n"
   "   -nonce STRING        set the safe-mode escape nonce\n"
   "   -nullvalue TEXT      set text string for NULL values. Default ''\n"
@@ -12177,15 +12175,6 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
       exit(1);
     }
   }
-#if SHELL_WIN_UTF8_OPT
-  /* Get indicated Windows console setup done before running invocation commands. */
-  if( in_console || out_console ){
-    console_prepare_utf8();
-  }
-  if( !in_console ){
-    setBinaryMode(stdin, 0);
-  }
-#endif
 
   if( data.pAuxDb->zDbFilename==0 ){
 #ifndef SQLITE_OMIT_MEMORYDB