Cure many warnings from gcc, clang and CL.exe.

FossilOrigin-Name: 29ea2a3aadd34facc45a2e9f9a567bac16fca76beb019b879e2611433c85bbb3
2025-08-05 15:55:57 +03:00 · 2023-11-13 15:59:27 +00:00
parent 41d4b7bdee
commit 5ed4ba0f7d
5 changed files with 88 additions and 51 deletions
--- a/ext/consio/console_io.c
+++ b/ext/consio/console_io.c
@@ -77,13 +77,14 @@ typedef struct PerStreamTags {
 #endif

 #if SHELL_CON_TRANSLATE
-# define CI_INITIALIZER { INVALID_HANDLE_VALUE, SHELL_INVALID_CONS_MODE, \
+# define PST_INITIALIZER { INVALID_HANDLE_VALUE, SHELL_INVALID_CONS_MODE, \
      {0,0,0,0}, SHELL_INVALID_FILE_PTR }
 #else
-# define CI_INITIALIZER { 0, SHELL_INVALID_FILE_PTR }
+# define PST_INITIALIZER { 0, SHELL_INVALID_FILE_PTR }
 #endif

 /* Quickly say whether a known output is going to the console. */
+#if SHELL_CON_TRANSLATE
 static short pstReachesConsole(PerStreamTags *ppst){
 # if SHELL_CON_TRANSLATE
  return (ppst->hx != INVALID_HANDLE_VALUE);
@@ -91,6 +92,9 @@ static short pstReachesConsole(PerStreamTags *ppst){
  return (ppst->reachesConsole != 0);
 # endif
 }
+#else
+# define pstReachesConsole(ppst) 0
+#endif

 #if SHELL_CON_TRANSLATE
 static void restoreConsoleArb(PerStreamTags *ppst){
@@ -140,26 +144,23 @@ static short isValidStreamInfo(PerStreamTags *ppst){
 }

 static ConsoleInfo consoleInfo = {
-  { /* pstSetup */ CI_INITIALIZER, CI_INITIALIZER, CI_INITIALIZER },
-  { /* pstDesignated[] */ CI_INITIALIZER, CI_INITIALIZER, CI_INITIALIZER },
+  { /* pstSetup */ PST_INITIALIZER, PST_INITIALIZER, PST_INITIALIZER },
+  { /* pstDesignated[] */ PST_INITIALIZER, PST_INITIALIZER, PST_INITIALIZER },
  SAC_NoConsole /* sacSetup */
 };
-#undef SHELL_INVALID_FILE_PTR
-#undef CI_INITIALIZER

 SQLITE_INTERNAL_LINKAGE FILE* invalidFileStream = (FILE *)~0;

-static void maybeSetupAsConsole(PerStreamTags *ppst, short odir){
 #if SHELL_CON_TRANSLATE
+static void maybeSetupAsConsole(PerStreamTags *ppst, short odir){
  if( pstReachesConsole(ppst) ){
    DWORD cm = odir? SHELL_CONO_MODE : SHELL_CONI_MODE;
    SetConsoleMode(ppst->hx, cm);
  }
-#else
-  (void)ppst;
-  (void)odir;
-#endif
 }
+#else
+# define maybeSetupAsConsole(ppst,odir)
+#endif

 SQLITE_INTERNAL_LINKAGE void consoleRenewSetup(void){
 #if SHELL_CON_TRANSLATE
@@ -206,6 +207,7 @@ SQLITE_INTERNAL_LINKAGE void SQLITE_CDECL consoleRestore( void ){
 #endif
 }

+#ifdef CONSIO_INPUT_REDIR
 /* Say whether given FILE* is among those known, via either
 ** consoleClassifySetup() or set{Output,Error}Stream, as
 ** readable, and return an associated PerStreamTags pointer
@@ -221,6 +223,7 @@ static PerStreamTags * isKnownReadable(FILE *pf){
  } while( apst[++ix] != 0 );
  return apst[ix];
 }
+#endif

 /* Say whether given FILE* is among those known, via either
 ** consoleClassifySetup() or set{Output,Error}Stream, as
@@ -256,9 +259,11 @@ static FILE *designateEmitStream(FILE *pf, unsigned chix){
 SQLITE_INTERNAL_LINKAGE FILE *setOutputStream(FILE *pf){
  return designateEmitStream(pf, 1);
 }
+#ifdef CONSIO_SET_ERROR_STREAM
 SQLITE_INTERNAL_LINKAGE FILE *setErrorStream(FILE *pf){
  return designateEmitStream(pf, 2);
 }
+#endif

 #if SHELL_CON_TRANSLATE
 static void setModeFlushQ(FILE *pf, short bFlush, int mode){
@@ -312,7 +317,7 @@ static int conioVmPrintf(PerStreamTags *ppst, const char *zFormat, va_list ap){
 }
 #endif /* SHELL_CON_TRANSLATE */

-
+#ifdef CONSIO_GET_EMIT_STREAM
 static PerStreamTags * getDesignatedEmitStream(FILE *pf, unsigned chix,
                                               PerStreamTags *ppst){
  PerStreamTags *rv = isKnownWritable(pf);
@@ -321,6 +326,7 @@ static PerStreamTags * getDesignatedEmitStream(FILE *pf, unsigned chix,
  streamOfConsole(pf, ppst);
  return ppst;
 }
+#endif

 /* Get stream info, either for designated output or error stream when
 ** chix equals 1 or 2, or for an arbitrary stream when chix == 0.
@@ -359,9 +365,12 @@ SQLITE_INTERNAL_LINKAGE int oPrintfUtf8(const char *zFormat, ...){
  va_list ap;
  int rv;
  FILE *pfOut;
-  PerStreamTags pst; /* Needed only for heretofore unknown streams. */
+  PerStreamTags pst = PST_INITIALIZER; /* for unknown streams */
+#if SHELL_CON_TRANSLATE
  PerStreamTags *ppst = getEmitStreamInfo(1, &pst, &pfOut);
-
+#else
+  getEmitStreamInfo(1, &pst, &pfOut);
+#endif
  va_start(ap, zFormat);
 #if SHELL_CON_TRANSLATE
  if( pstReachesConsole(ppst) ){
@@ -380,9 +389,12 @@ SQLITE_INTERNAL_LINKAGE int ePrintfUtf8(const char *zFormat, ...){
  va_list ap;
  int rv;
  FILE *pfErr;
-  PerStreamTags pst; /* Needed only for heretofore unknown streams. */
+  PerStreamTags pst = PST_INITIALIZER; /* for unknown streams */
+#if SHELL_CON_TRANSLATE
  PerStreamTags *ppst = getEmitStreamInfo(2, &pst, &pfErr);
-
+#else
+  getEmitStreamInfo(2, &pst, &pfErr);
+#endif
  va_start(ap, zFormat);
 #if SHELL_CON_TRANSLATE
  if( pstReachesConsole(ppst) ){
@@ -400,9 +412,11 @@ SQLITE_INTERNAL_LINKAGE int ePrintfUtf8(const char *zFormat, ...){
 SQLITE_INTERNAL_LINKAGE int fPrintfUtf8(FILE *pfO, const char *zFormat, ...){
  va_list ap;
  int rv;
+  PerStreamTags pst = PST_INITIALIZER; /* for unknown streams */
 #if SHELL_CON_TRANSLATE
-  PerStreamTags pst; /* Needed only for heretofore unknown streams. */
  PerStreamTags *ppst = getEmitStreamInfo(0, &pst, &pfO);
+#else
+  getEmitStreamInfo(0, &pst, &pfO);
 #endif

  va_start(ap, zFormat);
@@ -422,9 +436,13 @@ SQLITE_INTERNAL_LINKAGE int fPrintfUtf8(FILE *pfO, const char *zFormat, ...){
 }

 SQLITE_INTERNAL_LINKAGE int fPutsUtf8(const char *z, FILE *pfO){
+  PerStreamTags pst = PST_INITIALIZER; /* for unknown streams */
 #if SHELL_CON_TRANSLATE
-  PerStreamTags pst; /* Needed only for heretofore unknown streams. */
  PerStreamTags *ppst = getEmitStreamInfo(0, &pst, &pfO);
+#else
+  getEmitStreamInfo(0, &pst, &pfO);
+#endif
+#if SHELL_CON_TRANSLATE
  if( pstReachesConsole(ppst) ){
    int rv;
    maybeSetupAsConsole(ppst, 1);
@@ -441,8 +459,12 @@ SQLITE_INTERNAL_LINKAGE int fPutsUtf8(const char *z, FILE *pfO){

 SQLITE_INTERNAL_LINKAGE int ePutsUtf8(const char *z){
  FILE *pfErr;
-  PerStreamTags pst; /* Needed only for heretofore unknown streams. */
+  PerStreamTags pst = PST_INITIALIZER; /* for unknown streams */
+#if SHELL_CON_TRANSLATE
  PerStreamTags *ppst = getEmitStreamInfo(2, &pst, &pfErr);
+#else
+  getEmitStreamInfo(2, &pst, &pfErr);
+#endif
 #if SHELL_CON_TRANSLATE
  if( pstReachesConsole(ppst) ) return conZstrEmit(ppst, z, (int)strlen(z));
  else {
@@ -455,8 +477,12 @@ SQLITE_INTERNAL_LINKAGE int ePutsUtf8(const char *z){

 SQLITE_INTERNAL_LINKAGE int oPutsUtf8(const char *z){
  FILE *pfOut;
-  PerStreamTags pst; /* Needed only for heretofore unknown streams. */
+  PerStreamTags pst = PST_INITIALIZER; /* for unknown streams */
+#if SHELL_CON_TRANSLATE
  PerStreamTags *ppst = getEmitStreamInfo(1, &pst, &pfOut);
+#else
+  getEmitStreamInfo(1, &pst, &pfOut);
+#endif
 #if SHELL_CON_TRANSLATE
  if( pstReachesConsole(ppst) ) return conZstrEmit(ppst, z, (int)strlen(z));
  else {
@@ -506,7 +532,7 @@ fPutbUtf8(FILE *pfO, const char *cBuf, int nAccept, long ctrlMask){
  int ncConsume = (int)(zPast - cBuf);
  if( pfO == 0 ) return ncConsume;
 #if SHELL_CON_TRANSLATE
-  PerStreamTags pst; /* Needed only for heretofore unknown streams. */
+  PerStreamTags pst = PST_INITIALIZER; /* for unknown streams */
  PerStreamTags *ppst = getEmitStreamInfo(0, &pst, &pfO);
  if( pstReachesConsole(ppst) ){
    int rv;
@@ -527,8 +553,12 @@ oPutbUtf8(const char *cBuf, int nAccept, long ctrlMask){
  FILE *pfOut;
  const char *zPast = zSkipValidUtf8(cBuf, nAccept, ctrlMask);
  int ncConsume = (int)(zPast - cBuf);
-  PerStreamTags pst; /* Needed only for heretofore unknown streams. */
+  PerStreamTags pst = PST_INITIALIZER; /* for unknown streams */
+#if SHELL_CON_TRANSLATE
  PerStreamTags *ppst = getEmitStreamInfo(1, &pst, &pfOut);
+#else
+  getEmitStreamInfo(1, &pst, &pfOut);
+#endif
 #if SHELL_CON_TRANSLATE
  if( pstReachesConsole(ppst) ){
    return conZstrEmit(ppst, cBuf, ncConsume);
@@ -540,12 +570,13 @@ oPutbUtf8(const char *cBuf, int nAccept, long ctrlMask){
 #endif
 }

+#ifdef CONSIO_EPUTB
 SQLITE_INTERNAL_LINKAGE int
 ePutbUtf8(const char *cBuf, int nAccept, long ctrlMask){
  FILE *pfErr;
  const char *zPast = zSkipValidUtf8(cBuf, nAccept, ctrlMask);
  int ncConsume = (int)(zPast - cBuf);
-  PerStreamTags pst; /* Needed only for heretofore unknown streams. */
+  PerStreamTags pst = PST_INITIALIZER; /* for unknown streams */
  PerStreamTags *ppst = getEmitStreamInfo(2, &pst, &pfErr);
 # if SHELL_CON_TRANSLATE
  if( pstReachesConsole(ppst) ){
@@ -557,6 +588,7 @@ ePutbUtf8(const char *cBuf, int nAccept, long ctrlMask){
  }
 # endif
 }
+#endif /* defined(CONSIO_EPUTB) */

 SQLITE_INTERNAL_LINKAGE char* fGetsUtf8(char *cBuf, int ncMax, FILE *pfIn){
  if( pfIn==0 ) pfIn = stdin;
@@ -622,3 +654,5 @@ SQLITE_INTERNAL_LINKAGE char* fGetsUtf8(char *cBuf, int ncMax, FILE *pfIn){
  }
 #endif
 }
+
+#undef SHELL_INVALID_FILE_PTR
--- a/ext/consio/console_io.h
+++ b/ext/consio/console_io.h
@@ -108,7 +108,9 @@ SQLITE_INTERNAL_LINKAGE void SQLITE_CDECL consoleRestore( void );
 */
 SQLITE_INTERNAL_LINKAGE FILE *invalidFileStream;
 SQLITE_INTERNAL_LINKAGE FILE *setOutputStream(FILE *pf);
+#ifdef CONSIO_SET_ERROR_STREAM
 SQLITE_INTERNAL_LINKAGE FILE *setErrorStream(FILE *pf);
+#endif

 /*
 ** Emit output like fprintf(). If the output is going to the
@@ -167,8 +169,10 @@ fPutbUtf8(FILE *pfOut, const char *cBuf, int nAccept, long ctrlMask);
 SQLITE_INTERNAL_LINKAGE int
 oPutbUtf8(const char *cBuf, int nAccept, long ctrlMask);
 /* Like fPutbUtf8 except stream is always the designated error. */
+#ifdef CONSIO_EPUTB
 SQLITE_INTERNAL_LINKAGE int
 ePutbUtf8(const char *cBuf, int nAccept, long ctrlMask);
+#endif

 /*
 ** Collect input like fgets(...) with special provisions for input
@@ -179,7 +183,7 @@ ePutbUtf8(const char *cBuf, int nAccept, long ctrlMask);
 */
 SQLITE_INTERNAL_LINKAGE char* fGetsUtf8(char *cBuf, int ncMax, FILE *pfIn);
 /* Like fGetsUtf8 except stream is always the designated input. */
-SQLITE_INTERNAL_LINKAGE char* iGetsUtf8(char *cBuf, int ncMax);
+/* SQLITE_INTERNAL_LINKAGE char* iGetsUtf8(char *cBuf, int ncMax); */

 /*
 ** Set given stream for binary mode, where newline translation is
--- a/16
+++ b/16
@@ -1,5 +1,5 @@
-C Fix\svar-intro\safter\sexecutable\scode\sdeparture\sfrom\sold\sC.
-D 2023-11-13T13:01:01.956
+C Cure\smany\swarnings\sfrom\sgcc,\sclang\sand\sCL.exe.
+D 2023-11-13T15:59:27.593
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -50,8 +50,8 @@ F ext/README.md fd5f78013b0a2bc6f0067afb19e6ad040e89a10179b4f6f03eee58fac5f169bd
 F ext/async/README.txt e12275968f6fde133a80e04387d0e839b0c51f91
 F ext/async/sqlite3async.c 6f247666b495c477628dd19364d279c78ea48cd90c72d9f9b98ad1aff3294f94
 F ext/async/sqlite3async.h 46b47c79357b97ad85d20d2795942c0020dc20c532114a49808287f04aa5309a
-F ext/consio/console_io.c 41fd57d99340dd51efa3a61af12eedbb90a62ff5db31c5f9d3e665134bc09353 x
-F ext/consio/console_io.h 3a2ad14e8adcca431fe9bd12e8ebb5ecfe30002cfa190b2be1479048a441e6ec
+F ext/consio/console_io.c b59dac1eb138339fcef6da8feae2f3a9a4397b7362ef52b4dca630ef5f848f23 x
+F ext/consio/console_io.h 515d27ca9e5a5d36e12ff2b85977b5931fdeba0ce142f40178d94dc8638b4c81
 F ext/expert/README.md b321c2762bb93c18ea102d5a5f7753a4b8bac646cb392b3b437f633caf2020c3
 F ext/expert/expert.c d548d603a4cc9e61f446cc179c120c6713511c413f82a4a32b1e1e69d3f086a4
 F ext/expert/expert1.test 0dd5cb096d66bed593e33053a3b364f6ef52ed72064bf5cf298364636dbf3cd6
@@ -728,7 +728,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c d017bad7ba8e778617701a0e986fdeb393d67d6afa84fb28ef4e8b8ad2acf916
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c 503331aca8785254a7bf3d74ab338a99118fa297e1184a4dde33b3cdf7a9d341
-F src/shell.c.in 6317180fce95b4d994423047648676e9d8c4bd7b82ab8ad98644a9e9a81ff24c
+F src/shell.c.in 187da23da7601bfb225d0efadf77cbf766d9cee7574323a25a3d42dc29cd27fe
 F src/sqlite.h.in 4f841d3d117b830ee5ee45e8d89ceff1195f3ebb72d041ace8d116ba4c103b35
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
@@ -2142,8 +2142,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 97e2c9621e3e01048e33da63ca4146ededa33cf6adefa996fa49b8c6a8d555b5
-R 9e09f295654f16b3a3c0e5e6e0bcae0d
+P 08996f4fd52f5742e77225ce3da2ac43ea5cc44bb0d8d21126b6d624273842a5
+R ab417e4721f6826c6db3c6522006d6a5
 U larrybr
-Z 4863af021829bb44bd729f706b66926d
+Z 401b90e437fbd22102bf23dbdae3a8b4
 # Remove this line to create a well-formed Fossil manifest.
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-08996f4fd52f5742e77225ce3da2ac43ea5cc44bb0d8d21126b6d624273842a5
+29ea2a3aadd34facc45a2e9f9a567bac16fca76beb019b879e2611433c85bbb3
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -1483,7 +1483,7 @@ static void shellPutsFunc(
  int nVal,
  sqlite3_value **apVal
 ){
-  ShellState *p = (ShellState*)sqlite3_user_data(pCtx);
+  /* Unused: (ShellState*)sqlite3_user_data(pCtx); */
  (void)nVal;
  oputf("%s\n", sqlite3_value_text(apVal[0]));
  sqlite3_result_value(pCtx, apVal[0]);
@@ -1825,7 +1825,7 @@ static void output_quoted_escaped_string(const char *z){
 */
 static const char *anyOfInStr(const char *s, const char *zAny, size_t ns){
  const char *pcFirst = 0;
-  if( ns == ~0 ) ns = strlen(s);
+  if( ns == ~(size_t)0 ) ns = strlen(s);
  while(*zAny){
    const char *pc = (const char*)memchr(s, *zAny&0xff, ns);
    if( pc ){
@@ -1848,7 +1848,7 @@ static void output_c_string(const char *z){
  char cbsSay;
  oputz(zq);
  while( *z!=0 ){
-    const char *pcDQBSRO = anyOfInStr(z, zDQBSRO, ~0);
+    const char *pcDQBSRO = anyOfInStr(z, zDQBSRO, ~(size_t)0);
    const char *pcPast = z + fPutbUtf8(0, z, INT_MAX, ctrlMask);
    const char *pcEnd = (pcDQBSRO && pcDQBSRO < pcPast)? pcDQBSRO : pcPast;
    if( pcEnd > z ) oPutbUtf8(z, (int)(pcEnd-z), 0);
@@ -3001,7 +3001,6 @@ static void displayLinuxIoStats(void){
 ** Display a single line of status using 64-bit values.
 */
 static void displayStatLine(
-  ShellState *p,            /* The shell context */
  char *zLabel,             /* Label for this one line */
  char *zFormat,            /* Format for the result */
  int iStatusCtrl,          /* Which status to display */
@@ -3067,22 +3066,22 @@ static int display_stats(
    return 0;
  }

-  displayStatLine(pArg, "Memory Used:",
+  displayStatLine("Memory Used:",
     "%lld (max %lld) bytes", SQLITE_STATUS_MEMORY_USED, bReset);
-  displayStatLine(pArg, "Number of Outstanding Allocations:",
+  displayStatLine("Number of Outstanding Allocations:",
     "%lld (max %lld)", SQLITE_STATUS_MALLOC_COUNT, bReset);
  if( pArg->shellFlgs & SHFLG_Pagecache ){
-    displayStatLine(pArg, "Number of Pcache Pages Used:",
+    displayStatLine("Number of Pcache Pages Used:",
       "%lld (max %lld) pages", SQLITE_STATUS_PAGECACHE_USED, bReset);
  }
-  displayStatLine(pArg, "Number of Pcache Overflow Bytes:",
+  displayStatLine("Number of Pcache Overflow Bytes:",
     "%lld (max %lld) bytes", SQLITE_STATUS_PAGECACHE_OVERFLOW, bReset);
-  displayStatLine(pArg, "Largest Allocation:",
+  displayStatLine("Largest Allocation:",
     "%lld bytes", SQLITE_STATUS_MALLOC_SIZE, bReset);
-  displayStatLine(pArg, "Largest Pcache Allocation:",
+  displayStatLine("Largest Pcache Allocation:",
     "%lld bytes", SQLITE_STATUS_PAGECACHE_SIZE, bReset);
 #ifdef YYTRACKMAXSTACKDEPTH
-  displayStatLine(pArg, "Deepest Parser Stack:",
+  displayStatLine("Deepest Parser Stack:",
     "%lld (max %lld)", SQLITE_STATUS_PARSER_STACK, bReset);
 #endif