Work around a bug (an incorrect warning) in Clang-8.

FossilOrigin-Name: 067291143a63db924ead4810defb4bc6f195557412f5d1c22299f30d2d9f2a79

diff --git a/manifest b/manifest
index d147ab034b11292da619a1e8c77595f39fd24bce..6ad5a71c9dbb05dc8943b38dec06e0dc816290e5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,11 +1,12 @@
 B 7a876209a678a34c198b54ceef9e3c041f128a14dc73357f6a57cadadaa6cf7b
-C Reverse\sunintentional\sspacing\schange\sin\sthe\sprevious\scheck-in.
-D 2020-06-19T15:35:07.493
+C Work\saround\sa\sbug\s(an\sincorrect\swarning)\sin\sClang-8.
+D 2020-06-20T03:43:46.380
 F Makefile.in 50fc38e4f846af70c248542d2ad4e3bca3d80e3f1b9137ce79b047743d4b642c
 F autoconf/Makefile.am a8d1d24affe52ebf8d7ddcf91aa973fa0316618ab95bb68c87cabf8faf527dc8
 F main.mk f3c3de159abc51086a16a72d0b48077d2dda6a8dfb96963f8a010136bfd98108
+F src/build.c ba1bbe563a3dc02d5fed20537603181e5289c13ea30ae5e775f552e7557adbfa
 F tool/mkautoconfamal.sh f62353eb6c06ab264da027fd4507d09914433dbdcab9cb011cdc18016f1ab3b8
-P 3df579ca32e8250725957d1982897a43281c73e8373af49abd6e7bd674f30e74
-R ef84abb134da431469eed4f69e2d9d27
-U mistachkin
-Z 582943c8f9d0f62858c028f182582380
+P c7b2ee1edb108430454578c1623ba6aee1e2a7bc30cb2f9884ea3e21c3b75635
+R dbb5c23fb1d24e3d86260a377e8d8a75
+U drh
+Z 257a429f7c220c505fe55670a2ea483e

diff --git a/manifest.uuid b/manifest.uuid
index e798dc22b2a93ba8db8ae4bfe7386a26581fbf7b..13863bf6822bb6493d11362035822ca34a118890 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c7b2ee1edb108430454578c1623ba6aee1e2a7bc30cb2f9884ea3e21c3b75635
\ No newline at end of file
+067291143a63db924ead4810defb4bc6f195557412f5d1c22299f30d2d9f2a79
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index e3f8668440607d00c700b6870c8d21a3c63ad635..fcb8de551d7ce3c75a561153c18a20915d5f53b4 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -337,15 +337,15 @@ Table *sqlite3FindTable(sqlite3 *db, const char *zName, const char *zDatabase){
     p = sqlite3HashFind(&db->aDb[i].pSchema->tblHash, zName);
     if( p==0 && sqlite3StrNICmp(zName, "sqlite_", 7)==0 ){
       if( i==1 ){
-        if( sqlite3StrICmp(zName+7, ALT_TEMP_SCHEMA_TABLE+7)==0
-         || sqlite3StrICmp(zName+7, ALT_SCHEMA_TABLE+7)==0
-         || sqlite3StrICmp(zName+7, DFLT_SCHEMA_TABLE+7)==0
+        if( sqlite3StrICmp(zName+7, &ALT_TEMP_SCHEMA_TABLE[7])==0
+         || sqlite3StrICmp(zName+7, &ALT_SCHEMA_TABLE[7])==0
+         || sqlite3StrICmp(zName+7, &DFLT_SCHEMA_TABLE[7])==0
         ){
           p = sqlite3HashFind(&db->aDb[1].pSchema->tblHash, 
                               DFLT_TEMP_SCHEMA_TABLE);
         }
       }else{
-        if( sqlite3StrICmp(zName+7, ALT_SCHEMA_TABLE+7)==0 ){
+        if( sqlite3StrICmp(zName+7, &ALT_SCHEMA_TABLE[7])==0 ){
           p = sqlite3HashFind(&db->aDb[i].pSchema->tblHash,
                               DFLT_SCHEMA_TABLE);
         }
@@ -365,9 +365,9 @@ Table *sqlite3FindTable(sqlite3 *db, const char *zName, const char *zDatabase){
       if( p ) break;
     }
     if( p==0 && sqlite3StrNICmp(zName, "sqlite_", 7)==0 ){
-      if( sqlite3StrICmp(zName+7, ALT_SCHEMA_TABLE+7)==0 ){
+      if( sqlite3StrICmp(zName+7, &ALT_SCHEMA_TABLE[7])==0 ){
         p = sqlite3HashFind(&db->aDb[0].pSchema->tblHash, DFLT_SCHEMA_TABLE);
-      }else if( sqlite3StrICmp(zName+7, ALT_TEMP_SCHEMA_TABLE+7)==0 ){
+      }else if( sqlite3StrICmp(zName+7, &ALT_TEMP_SCHEMA_TABLE[7])==0 ){
         p = sqlite3HashFind(&db->aDb[1].pSchema->tblHash, 
                             DFLT_TEMP_SCHEMA_TABLE);
       }