Fossil SCM

Work around an erroneous warning in clang-8. No logic changes. The exact same machine code is generated.

drh 2020-06-20 03:45 trunk
Commit 6daa19d96154868c3a2d0e9c39aa0def60ba3377c6e6c28c772edb92c0432aca
Parent b2dacfcd735d4b1…
2 files changed +9 -9 +1 -1
~ src/sqlite3.c ~ src/sqlite3.h
M src/sqlite3.c
+9 -9
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -1162,11 +1162,11 @@
11621162
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
11631163
 ** [sqlite_version()] and [sqlite_source_id()].
11641164
 */
11651165
 #define SQLITE_VERSION "3.33.0"
11661166
 #define SQLITE_VERSION_NUMBER 3033000
1167
-#define SQLITE_SOURCE_ID "2020-06-19 15:24:12 7a876209a678a34c198b54ceef9e3c041f128a14dc73357f6a57cadadaa6cf7b"
1167
+#define SQLITE_SOURCE_ID "2020-06-20 03:43:46 067291143a63db924ead4810defb4bc6f195557412f5d1c22299f30d2d9f2a79"
11681168
11691169
 /*
11701170
 ** CAPI3REF: Run-Time Library Version Numbers
11711171
 ** KEYWORDS: sqlite3_version sqlite3_sourceid
11721172
 **
@@ -110530,19 +110530,19 @@
110530110530
 }
110531110531
 }
110532110532
 p = sqlite3HashFind(&db->aDb[i].pSchema->tblHash, zName);
110533110533
 if( p==0 && sqlite3StrNICmp(zName, "sqlite_", 7)==0 ){
110534110534
 if( i==1 ){
110535
- if( sqlite3StrICmp(zName+7, ALT_TEMP_SCHEMA_TABLE+7)==0
110536
- || sqlite3StrICmp(zName+7, ALT_SCHEMA_TABLE+7)==0
110537
- || sqlite3StrICmp(zName+7, DFLT_SCHEMA_TABLE+7)==0
110535
+ if( sqlite3StrICmp(zName+7, &ALT_TEMP_SCHEMA_TABLE[7])==0
110536
+ || sqlite3StrICmp(zName+7, &ALT_SCHEMA_TABLE[7])==0
110537
+ || sqlite3StrICmp(zName+7, &DFLT_SCHEMA_TABLE[7])==0
110538110538
 ){
110539110539
 p = sqlite3HashFind(&db->aDb[1].pSchema->tblHash,
110540110540
 DFLT_TEMP_SCHEMA_TABLE);
110541110541
 }
110542110542
 }else{
110543
- if( sqlite3StrICmp(zName+7, ALT_SCHEMA_TABLE+7)==0 ){
110543
+ if( sqlite3StrICmp(zName+7, &ALT_SCHEMA_TABLE[7])==0 ){
110544110544
 p = sqlite3HashFind(&db->aDb[i].pSchema->tblHash,
110545110545
 DFLT_SCHEMA_TABLE);
110546110546
 }
110547110547
 }
110548110548
 }
@@ -110558,13 +110558,13 @@
110558110558
 assert( sqlite3SchemaMutexHeld(db, i, 0) );
110559110559
 p = sqlite3HashFind(&db->aDb[i].pSchema->tblHash, zName);
110560110560
 if( p ) break;
110561110561
 }
110562110562
 if( p==0 && sqlite3StrNICmp(zName, "sqlite_", 7)==0 ){
110563
- if( sqlite3StrICmp(zName+7, ALT_SCHEMA_TABLE+7)==0 ){
110563
+ if( sqlite3StrICmp(zName+7, &ALT_SCHEMA_TABLE[7])==0 ){
110564110564
 p = sqlite3HashFind(&db->aDb[0].pSchema->tblHash, DFLT_SCHEMA_TABLE);
110565
- }else if( sqlite3StrICmp(zName+7, ALT_TEMP_SCHEMA_TABLE+7)==0 ){
110565
+ }else if( sqlite3StrICmp(zName+7, &ALT_TEMP_SCHEMA_TABLE[7])==0 ){
110566110566
 p = sqlite3HashFind(&db->aDb[1].pSchema->tblHash,
110567110567
 DFLT_TEMP_SCHEMA_TABLE);
110568110568
 }
110569110569
 }
110570110570
 }
@@ -225082,11 +225082,11 @@
225082225082
 int nArg, /* Number of args */
225083225083
 sqlite3_value **apUnused /* Function arguments */
225084225084
 ){
225085225085
 assert( nArg==0 );
225086225086
 UNUSED_PARAM2(nArg, apUnused);
225087
- sqlite3_result_text(pCtx, "fts5: 2020-06-19 15:24:12 7a876209a678a34c198b54ceef9e3c041f128a14dc73357f6a57cadadaa6cf7b", -1, SQLITE_TRANSIENT);
225087
+ sqlite3_result_text(pCtx, "fts5: 2020-06-20 03:43:46 067291143a63db924ead4810defb4bc6f195557412f5d1c22299f30d2d9f2a79", -1, SQLITE_TRANSIENT);
225088225088
 }
225089225089
225090225090
 /*
225091225091
 ** Return true if zName is the extension on one of the shadow tables used
225092225092
 ** by this module.
@@ -229867,10 +229867,10 @@
229867229867
 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
229868229868
229869229869
 /************** End of stmt.c ************************************************/
229870229870
 #if __LINE__!=229870
229871229871
 #undef SQLITE_SOURCE_ID
229872
-#define SQLITE_SOURCE_ID "2020-06-19 15:24:12 7a876209a678a34c198b54ceef9e3c041f128a14dc73357f6a57cadadaa6alt2"
229872
+#define SQLITE_SOURCE_ID "2020-06-20 03:43:46 067291143a63db924ead4810defb4bc6f195557412f5d1c22299f30d2d9falt2"
229873229873
 #endif
229874229874
 /* Return the source-id for this library */
229875229875
 SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
229876229876
 /************************** End of sqlite3.c ******************************/
229877229877
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -1162,11 +1162,11 @@
1162 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
1163 ** [sqlite_version()] and [sqlite_source_id()].
1164 */
1165 #define SQLITE_VERSION "3.33.0"
1166 #define SQLITE_VERSION_NUMBER 3033000
1167 #define SQLITE_SOURCE_ID "2020-06-19 15:24:12 7a876209a678a34c198b54ceef9e3c041f128a14dc73357f6a57cadadaa6cf7b"
1168
1169 /*
1170 ** CAPI3REF: Run-Time Library Version Numbers
1171 ** KEYWORDS: sqlite3_version sqlite3_sourceid
1172 **
@@ -110530,19 +110530,19 @@
110530 }
110531 }
110532 p = sqlite3HashFind(&db->aDb[i].pSchema->tblHash, zName);
110533 if( p==0 && sqlite3StrNICmp(zName, "sqlite_", 7)==0 ){
110534 if( i==1 ){
110535 if( sqlite3StrICmp(zName+7, ALT_TEMP_SCHEMA_TABLE+7)==0
110536 || sqlite3StrICmp(zName+7, ALT_SCHEMA_TABLE+7)==0
110537 || sqlite3StrICmp(zName+7, DFLT_SCHEMA_TABLE+7)==0
110538 ){
110539 p = sqlite3HashFind(&db->aDb[1].pSchema->tblHash,
110540 DFLT_TEMP_SCHEMA_TABLE);
110541 }
110542 }else{
110543 if( sqlite3StrICmp(zName+7, ALT_SCHEMA_TABLE+7)==0 ){
110544 p = sqlite3HashFind(&db->aDb[i].pSchema->tblHash,
110545 DFLT_SCHEMA_TABLE);
110546 }
110547 }
110548 }
@@ -110558,13 +110558,13 @@
110558 assert( sqlite3SchemaMutexHeld(db, i, 0) );
110559 p = sqlite3HashFind(&db->aDb[i].pSchema->tblHash, zName);
110560 if( p ) break;
110561 }
110562 if( p==0 && sqlite3StrNICmp(zName, "sqlite_", 7)==0 ){
110563 if( sqlite3StrICmp(zName+7, ALT_SCHEMA_TABLE+7)==0 ){
110564 p = sqlite3HashFind(&db->aDb[0].pSchema->tblHash, DFLT_SCHEMA_TABLE);
110565 }else if( sqlite3StrICmp(zName+7, ALT_TEMP_SCHEMA_TABLE+7)==0 ){
110566 p = sqlite3HashFind(&db->aDb[1].pSchema->tblHash,
110567 DFLT_TEMP_SCHEMA_TABLE);
110568 }
110569 }
110570 }
@@ -225082,11 +225082,11 @@
225082 int nArg, /* Number of args */
225083 sqlite3_value **apUnused /* Function arguments */
225084 ){
225085 assert( nArg==0 );
225086 UNUSED_PARAM2(nArg, apUnused);
225087 sqlite3_result_text(pCtx, "fts5: 2020-06-19 15:24:12 7a876209a678a34c198b54ceef9e3c041f128a14dc73357f6a57cadadaa6cf7b", -1, SQLITE_TRANSIENT);
225088 }
225089
225090 /*
225091 ** Return true if zName is the extension on one of the shadow tables used
225092 ** by this module.
@@ -229867,10 +229867,10 @@
229867 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
229868
229869 /************** End of stmt.c ************************************************/
229870 #if __LINE__!=229870
229871 #undef SQLITE_SOURCE_ID
229872 #define SQLITE_SOURCE_ID "2020-06-19 15:24:12 7a876209a678a34c198b54ceef9e3c041f128a14dc73357f6a57cadadaa6alt2"
229873 #endif
229874 /* Return the source-id for this library */
229875 SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
229876 /************************** End of sqlite3.c ******************************/
229877
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -1162,11 +1162,11 @@
1162 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
1163 ** [sqlite_version()] and [sqlite_source_id()].
1164 */
1165 #define SQLITE_VERSION "3.33.0"
1166 #define SQLITE_VERSION_NUMBER 3033000
1167 #define SQLITE_SOURCE_ID "2020-06-20 03:43:46 067291143a63db924ead4810defb4bc6f195557412f5d1c22299f30d2d9f2a79"
1168
1169 /*
1170 ** CAPI3REF: Run-Time Library Version Numbers
1171 ** KEYWORDS: sqlite3_version sqlite3_sourceid
1172 **
@@ -110530,19 +110530,19 @@
110530 }
110531 }
110532 p = sqlite3HashFind(&db->aDb[i].pSchema->tblHash, zName);
110533 if( p==0 && sqlite3StrNICmp(zName, "sqlite_", 7)==0 ){
110534 if( i==1 ){
110535 if( sqlite3StrICmp(zName+7, &ALT_TEMP_SCHEMA_TABLE[7])==0
110536 || sqlite3StrICmp(zName+7, &ALT_SCHEMA_TABLE[7])==0
110537 || sqlite3StrICmp(zName+7, &DFLT_SCHEMA_TABLE[7])==0
110538 ){
110539 p = sqlite3HashFind(&db->aDb[1].pSchema->tblHash,
110540 DFLT_TEMP_SCHEMA_TABLE);
110541 }
110542 }else{
110543 if( sqlite3StrICmp(zName+7, &ALT_SCHEMA_TABLE[7])==0 ){
110544 p = sqlite3HashFind(&db->aDb[i].pSchema->tblHash,
110545 DFLT_SCHEMA_TABLE);
110546 }
110547 }
110548 }
@@ -110558,13 +110558,13 @@
110558 assert( sqlite3SchemaMutexHeld(db, i, 0) );
110559 p = sqlite3HashFind(&db->aDb[i].pSchema->tblHash, zName);
110560 if( p ) break;
110561 }
110562 if( p==0 && sqlite3StrNICmp(zName, "sqlite_", 7)==0 ){
110563 if( sqlite3StrICmp(zName+7, &ALT_SCHEMA_TABLE[7])==0 ){
110564 p = sqlite3HashFind(&db->aDb[0].pSchema->tblHash, DFLT_SCHEMA_TABLE);
110565 }else if( sqlite3StrICmp(zName+7, &ALT_TEMP_SCHEMA_TABLE[7])==0 ){
110566 p = sqlite3HashFind(&db->aDb[1].pSchema->tblHash,
110567 DFLT_TEMP_SCHEMA_TABLE);
110568 }
110569 }
110570 }
@@ -225082,11 +225082,11 @@
225082 int nArg, /* Number of args */
225083 sqlite3_value **apUnused /* Function arguments */
225084 ){
225085 assert( nArg==0 );
225086 UNUSED_PARAM2(nArg, apUnused);
225087 sqlite3_result_text(pCtx, "fts5: 2020-06-20 03:43:46 067291143a63db924ead4810defb4bc6f195557412f5d1c22299f30d2d9f2a79", -1, SQLITE_TRANSIENT);
225088 }
225089
225090 /*
225091 ** Return true if zName is the extension on one of the shadow tables used
225092 ** by this module.
@@ -229867,10 +229867,10 @@
229867 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
229868
229869 /************** End of stmt.c ************************************************/
229870 #if __LINE__!=229870
229871 #undef SQLITE_SOURCE_ID
229872 #define SQLITE_SOURCE_ID "2020-06-20 03:43:46 067291143a63db924ead4810defb4bc6f195557412f5d1c22299f30d2d9falt2"
229873 #endif
229874 /* Return the source-id for this library */
229875 SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
229876 /************************** End of sqlite3.c ******************************/
229877
M src/sqlite3.h
+1 -1
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -123,11 +123,11 @@
123123
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
124124
 ** [sqlite_version()] and [sqlite_source_id()].
125125
 */
126126
 #define SQLITE_VERSION "3.33.0"
127127
 #define SQLITE_VERSION_NUMBER 3033000
128
-#define SQLITE_SOURCE_ID "2020-06-19 15:24:12 7a876209a678a34c198b54ceef9e3c041f128a14dc73357f6a57cadadaa6cf7b"
128
+#define SQLITE_SOURCE_ID "2020-06-20 03:43:46 067291143a63db924ead4810defb4bc6f195557412f5d1c22299f30d2d9f2a79"
129129
130130
 /*
131131
 ** CAPI3REF: Run-Time Library Version Numbers
132132
 ** KEYWORDS: sqlite3_version sqlite3_sourceid
133133
 **
134134
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -123,11 +123,11 @@
123 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
124 ** [sqlite_version()] and [sqlite_source_id()].
125 */
126 #define SQLITE_VERSION "3.33.0"
127 #define SQLITE_VERSION_NUMBER 3033000
128 #define SQLITE_SOURCE_ID "2020-06-19 15:24:12 7a876209a678a34c198b54ceef9e3c041f128a14dc73357f6a57cadadaa6cf7b"
129
130 /*
131 ** CAPI3REF: Run-Time Library Version Numbers
132 ** KEYWORDS: sqlite3_version sqlite3_sourceid
133 **
134
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -123,11 +123,11 @@
123 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
124 ** [sqlite_version()] and [sqlite_source_id()].
125 */
126 #define SQLITE_VERSION "3.33.0"
127 #define SQLITE_VERSION_NUMBER 3033000
128 #define SQLITE_SOURCE_ID "2020-06-20 03:43:46 067291143a63db924ead4810defb4bc6f195557412f5d1c22299f30d2d9f2a79"
129
130 /*
131 ** CAPI3REF: Run-Time Library Version Numbers
132 ** KEYWORDS: sqlite3_version sqlite3_sourceid
133 **
134

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button