From: stephan <stephan@noemail.net>
Date: Thu, 6 Mar 2025 07:48:45 +0000 (+0000)
Subject: Additional 'array index is signed char' warning cleanups for the shell and its embedd... 
X-Git-Tag: major-release~204
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba6510a3999b4cdaba961108a77812506a585525;p=thirdparty%2Fsqlite.git

Additional 'array index is signed char' warning cleanups for the shell and its embedded extensions, analog to [44bd44532d].

FossilOrigin-Name: f31042595b8f8a378db9778c9a8223b07ec02cf2f528581ba43bf72b5b03c964
---

diff --git a/ext/misc/completion.c b/ext/misc/completion.c
index 54abc0ae15..0a6db1a224 100644
--- a/ext/misc/completion.c
+++ b/ext/misc/completion.c
@@ -41,6 +41,11 @@ SQLITE_EXTENSION_INIT1
 
 #ifndef SQLITE_OMIT_VIRTUALTABLE
 
+#ifndef IsAlnum
+#define IsAlnum(X)  isalnum((unsigned char)X)
+#endif
+
+
 /* completion_vtab is a subclass of sqlite3_vtab which will
 ** serve as the underlying representation of a completion virtual table
 */
@@ -377,7 +382,7 @@ static int completionFilter(
   }
   if( pCur->zLine!=0 && pCur->zPrefix==0 ){
     int i = pCur->nLine;
-    while( i>0 && (isalnum(pCur->zLine[i-1]) || pCur->zLine[i-1]=='_') ){
+    while( i>0 && (IsAlnum(pCur->zLine[i-1]) || pCur->zLine[i-1]=='_') ){
       i--;
     }
     pCur->nPrefix = pCur->nLine - i;
diff --git a/ext/misc/decimal.c b/ext/misc/decimal.c
index b0eeb96e33..60488a0012 100644
--- a/ext/misc/decimal.c
+++ b/ext/misc/decimal.c
@@ -27,6 +27,9 @@ SQLITE_EXTENSION_INIT1
 # define UNUSED_PARAMETER(X)  (void)(X)
 #endif
 
+#ifndef IsSpace
+#define IsSpace(X)  isspace((unsigned char)X)
+#endif
 
 /* A decimal object */
 typedef struct Decimal Decimal;
@@ -76,7 +79,7 @@ static Decimal *decimalNewFromText(const char *zIn, int n){
   p->nFrac = 0;
   p->a = sqlite3_malloc64( n+1 );
   if( p->a==0 ) goto new_from_text_failed;
-  for(i=0; isspace(zIn[i]); i++){}
+  for(i=0; IsSpace(zIn[i]); i++){}
   if( zIn[i]=='-' ){
     p->sign = 1;
     i++;
diff --git a/manifest b/manifest
index 5c3ca854a0..7ffe563f07 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\stcl\stypo\sin\sthe\sprevious\scheckin\swhich\striggers\san\serror\son\sone\smachine\sbut\snot\sanother.
-D 2025-03-06T07:09:50.571
+C Additional\s'array\sindex\sis\ssigned\schar'\swarning\scleanups\sfor\sthe\sshell\sand\sits\sembedded\sextensions,\sanalog\sto\s[44bd44532d].
+D 2025-03-06T07:48:45.490
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -409,11 +409,11 @@ F ext/misc/carray.c 34fac63770971611c5285de0a9f0ac67d504eaf66be891f637add9290f1c
 F ext/misc/carray.h 503209952ccf2431c7fd899ebb92bf46bf7635b38aace42ec8aa1b8d7b6e98a5
 F ext/misc/cksumvfs.c 3a7931dd30667be6348af919f3f9e6188dfd7646b42af8e399a499b327f5bd63
 F ext/misc/closure.c 87e0967772e0087e709887ce7ca9cf13aa32d2096e33b5d3382c8b8d477c6cb1
-F ext/misc/completion.c cb978c88d5577821323617a8ea775ce1b920e02dcdb593858f02044a4d008eea
+F ext/misc/completion.c c3c8b3cc1293c34f04f8746a3adfbfedb43f00d113f8c984a1ed09433317e507
 F ext/misc/compress.c 2c79a74330e0e0ba6cb3f7397f8ba5af12d46377ef5d3ee075e12dd8a6ed57f0
 F ext/misc/csv.c 7cae8c2666a058a58fb8994ed2457339a06c97d31c251d9a8445cdd966629890
 F ext/misc/dbdump.c b8592f6f2da292c62991a13864a60d6c573c47a9cc58362131b9e6a64f823e01
-F ext/misc/decimal.c 0e6edab8b055230e0ad0787d2e4b84b01f302168c7621042f7e6d7a3c1d98230
+F ext/misc/decimal.c 228d47e9ef4de60daf5851da19e3ac9ac1eda9e94432816914469501db6a1129
 F ext/misc/eval.c 04bc9aada78c888394204b4ed996ab834b99726fb59603b0ee3ed6e049755dc1
 F ext/misc/explain.c 606100185fb90d6a1eade1ed0414d53503c86820d8956a06e3b0a56291894f2b
 F ext/misc/fileio.c 07cf3109ec6452789e3a989a010234e2a17b599ce82ea29212c948572456abac
@@ -782,7 +782,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 626c24b258b111f75c22107aa5614ad89810df3026f5ca071116d3fe75925c75
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c a076f7db3a0fcbd9f710d7746cfc07e0b3baadee45eb3136bedc29c598ef8f1c
-F src/shell.c.in 4847cc7b4adf3f010c15ced5ea1251de4b7b39018c8cd5d77b3b0929985a04e5
+F src/shell.c.in 28aa1f70e95f132f20931678aa619f09f96ff53f5c3d45abe6721e52172f1c05
 F src/sqlite.h.in 3db05f6603c78d9e6fe035e9e12bed4ca8140135d05ff092becc2cf7d7d1fefb
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
@@ -2213,8 +2213,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 5c28a17253e2fe56d7fd97cc43345b3fd8bd59fccea3fb1547ed87f7902f76f5
-R 69b2dc5181f91b28e045d77bf201e61f
+P 646c2821ad434058db7760e699d21a47c7feb5976199cbe4b58d54c902720cbf
+R 67dd6bb095c5f2b086dad74a4db7fec9
 U stephan
-Z 245e74461c56d58b017c2aa12d2e1a90
+Z e25cfbe93e0978fd4ecc97c073e66d34
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 0e725f3d95..518f8878dc 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-646c2821ad434058db7760e699d21a47c7feb5976199cbe4b58d54c902720cbf
+f31042595b8f8a378db9778c9a8223b07ec02cf2f528581ba43bf72b5b03c964
diff --git a/src/shell.c.in b/src/shell.c.in
index f4451d292e..1f8ff62070 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -2789,12 +2789,12 @@ static int shell_callback(
           }else if( (c=='w' || c=='W')
                  && nParen==0 && isIndex
                  && sqlite3_strnicmp("WHERE",&z[i],5)==0
-                 && !isalnum(z[i+5]) && z[i+5]!='_' ){
+                 && !IsAlnum(z[i+5]) && z[i+5]!='_' ){
             isWhere = 1;
           }else if( isWhere && (c=='A' || c=='a')
                  && nParen==0
                  && sqlite3_strnicmp("AND",&z[i],3)==0
-                 && !isalnum(z[i+3]) && z[i+3]!='_' ){
+                 && !IsAlnum(z[i+3]) && z[i+3]!='_' ){
             printSchemaLineN(p->out, z, j, "\n    ");
             j = 0;
           }