Fossil SCM

Fix harmless compiler warnings in the embedded SQLite.

drh 2021-02-07 13:08 trunk
Commit c577aae0a3d74d7ede3e2c86c81ee4549435933c02c227a1cab418fd99bdbc46
Parent 391eb1cefb72a51…
2 files changed +14 -10 +1 -1
~ src/sqlite3.c ~ src/sqlite3.h
M src/sqlite3.c
+14 -10
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -1186,11 +1186,11 @@
11861186
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
11871187
 ** [sqlite_version()] and [sqlite_source_id()].
11881188
 */
11891189
 #define SQLITE_VERSION "3.35.0"
11901190
 #define SQLITE_VERSION_NUMBER 3035000
1191
-#define SQLITE_SOURCE_ID "2021-02-05 17:34:47 078dbff04a95a001bbd8690ab08038fbb5506899df8290991b53fd1122a4c30c"
1191
+#define SQLITE_SOURCE_ID "2021-02-07 12:59:43 5f8bf99579e6663fc701cdc94f685584a86398c4687e25e7e241de755398f17d"
11921192
11931193
 /*
11941194
 ** CAPI3REF: Run-Time Library Version Numbers
11951195
 ** KEYWORDS: sqlite3_version sqlite3_sourceid
11961196
 **
@@ -98938,20 +98938,21 @@
9893898938
 }
9893998939
 }else
9894098940
 #endif /* SQLITE_OMIT_UPSERT */
9894198941
 {
9894298942
 pExpr->y.pTab = pTab;
98943
- if( iCol<0 ) pExpr->affExpr = SQLITE_AFF_INTEGER;
9894498943
 if( pParse->bReturning ){
9894598944
 eNewExprOp = TK_REGISTER;
9894698945
 pExpr->iTable = pNC->uNC.iBaseReg + (pTab->nCol+1)*pExpr->iTable
9894798946
 + iCol + 1;
9894898947
 }else{
9894998948
 pExpr->iColumn = (i16)iCol;
9895098949
 eNewExprOp = TK_TRIGGER;
9895198950
 #ifndef SQLITE_OMIT_TRIGGER
98952
- if( pExpr->iTable==0 ){
98951
+ if( iCol<0 ){
98952
+ pExpr->affExpr = SQLITE_AFF_INTEGER;
98953
+ }else if( pExpr->iTable==0 ){
9895398954
 testcase( iCol==31 );
9895498955
 testcase( iCol==32 );
9895598956
 pParse->oldmask |= (iCol>=32 ? 0xffffffff : (((u32)1)<<iCol));
9895698957
 }else{
9895798958
 testcase( iCol==31 );
@@ -111046,19 +111047,19 @@
111046111047
111047111048
 if( pExpr->op==TK_TRIGGER ){
111048111049
 pTab = pParse->pTriggerTab;
111049111050
 }else{
111050111051
 assert( pTabList );
111051
- for(iSrc=0; ALWAYS(iSrc<pTabList->nSrc); iSrc++){
111052
+ for(iSrc=0; iSrc<pTabList->nSrc; iSrc++){
111052111053
 if( pExpr->iTable==pTabList->a[iSrc].iCursor ){
111053111054
 pTab = pTabList->a[iSrc].pTab;
111054111055
 break;
111055111056
 }
111056111057
 }
111057111058
 }
111058111059
 iCol = pExpr->iColumn;
111059
- if( NEVER(pTab==0) ) return;
111060
+ if( pTab==0 ) return;
111060111061
111061111062
 if( iCol>=0 ){
111062111063
 assert( iCol<pTab->nCol );
111063111064
 zCol = pTab->aCol[iCol].zName;
111064111065
 }else if( pTab->iPKey>=0 ){
@@ -138685,12 +138686,13 @@
138685138686
 for(i=0; i<pList->nExpr; i++){
138686138687
 Expr *pOldExpr = pList->a[i].pExpr;
138687138688
 if( ALWAYS(pOldExpr!=0) && pOldExpr->op==TK_ASTERISK ){
138688138689
 int jj;
138689138690
 for(jj=0; jj<pTab->nCol; jj++){
138691
+ Expr *pNewExpr;
138690138692
 if( IsHiddenColumn(pTab->aCol+jj) ) continue;
138691
- Expr *pNewExpr = sqlite3Expr(db, TK_ID, pTab->aCol[jj].zName);
138693
+ pNewExpr = sqlite3Expr(db, TK_ID, pTab->aCol[jj].zName);
138692138694
 pNew = sqlite3ExprListAppend(pParse, pNew, pNewExpr);
138693138695
 if( !db->mallocFailed ){
138694138696
 struct ExprList_item *pItem = &pNew->a[pNew->nExpr-1];
138695138697
 pItem->zEName = sqlite3DbStrDup(db, pTab->aCol[jj].zName);
138696138698
 pItem->eEName = ENAME_NAME;
@@ -146730,11 +146732,13 @@
146730146732
 }
146731146733
146732146734
 /*
146733146735
 ** Select callback for exprUsesSrclist().
146734146736
 */
146735
-static int exprUsesSrclistSelectCb(Walker *p, Select *pSelect){
146737
+static int exprUsesSrclistSelectCb(Walker *NotUsed1, Select *NotUsed2){
146738
+ UNUSED_PARAMETER(NotUsed1);
146739
+ UNUSED_PARAMETER(NotUsed2);
146736146740
 return WRC_Abort;
146737146741
 }
146738146742
146739146743
 /*
146740146744
 ** This function always returns true if expression pExpr contains
@@ -228480,11 +228484,11 @@
228480228484
 int nArg, /* Number of args */
228481228485
 sqlite3_value **apUnused /* Function arguments */
228482228486
 ){
228483228487
 assert( nArg==0 );
228484228488
 UNUSED_PARAM2(nArg, apUnused);
228485
- sqlite3_result_text(pCtx, "fts5: 2021-02-05 17:34:47 078dbff04a95a001bbd8690ab08038fbb5506899df8290991b53fd1122a4c30c", -1, SQLITE_TRANSIENT);
228489
+ sqlite3_result_text(pCtx, "fts5: 2021-02-07 12:59:43 5f8bf99579e6663fc701cdc94f685584a86398c4687e25e7e241de755398f17d", -1, SQLITE_TRANSIENT);
228486228490
 }
228487228491
228488228492
 /*
228489228493
 ** Return true if zName is the extension on one of the shadow tables used
228490228494
 ** by this module.
@@ -233406,12 +233410,12 @@
233406233410
 }
233407233411
 #endif /* SQLITE_CORE */
233408233412
 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
233409233413
233410233414
 /************** End of stmt.c ************************************************/
233411
-#if __LINE__!=233411
233415
+#if __LINE__!=233415
233412233416
 #undef SQLITE_SOURCE_ID
233413
-#define SQLITE_SOURCE_ID "2021-02-05 17:34:47 078dbff04a95a001bbd8690ab08038fbb5506899df8290991b53fd1122a4alt2"
233417
+#define SQLITE_SOURCE_ID "2021-02-07 12:59:43 5f8bf99579e6663fc701cdc94f685584a86398c4687e25e7e241de755398alt2"
233414233418
 #endif
233415233419
 /* Return the source-id for this library */
233416233420
 SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
233417233421
 /************************** End of sqlite3.c ******************************/
233418233422
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -1186,11 +1186,11 @@
1186 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
1187 ** [sqlite_version()] and [sqlite_source_id()].
1188 */
1189 #define SQLITE_VERSION "3.35.0"
1190 #define SQLITE_VERSION_NUMBER 3035000
1191 #define SQLITE_SOURCE_ID "2021-02-05 17:34:47 078dbff04a95a001bbd8690ab08038fbb5506899df8290991b53fd1122a4c30c"
1192
1193 /*
1194 ** CAPI3REF: Run-Time Library Version Numbers
1195 ** KEYWORDS: sqlite3_version sqlite3_sourceid
1196 **
@@ -98938,20 +98938,21 @@
98938 }
98939 }else
98940 #endif /* SQLITE_OMIT_UPSERT */
98941 {
98942 pExpr->y.pTab = pTab;
98943 if( iCol<0 ) pExpr->affExpr = SQLITE_AFF_INTEGER;
98944 if( pParse->bReturning ){
98945 eNewExprOp = TK_REGISTER;
98946 pExpr->iTable = pNC->uNC.iBaseReg + (pTab->nCol+1)*pExpr->iTable
98947 + iCol + 1;
98948 }else{
98949 pExpr->iColumn = (i16)iCol;
98950 eNewExprOp = TK_TRIGGER;
98951 #ifndef SQLITE_OMIT_TRIGGER
98952 if( pExpr->iTable==0 ){
 
 
98953 testcase( iCol==31 );
98954 testcase( iCol==32 );
98955 pParse->oldmask |= (iCol>=32 ? 0xffffffff : (((u32)1)<<iCol));
98956 }else{
98957 testcase( iCol==31 );
@@ -111046,19 +111047,19 @@
111046
111047 if( pExpr->op==TK_TRIGGER ){
111048 pTab = pParse->pTriggerTab;
111049 }else{
111050 assert( pTabList );
111051 for(iSrc=0; ALWAYS(iSrc<pTabList->nSrc); iSrc++){
111052 if( pExpr->iTable==pTabList->a[iSrc].iCursor ){
111053 pTab = pTabList->a[iSrc].pTab;
111054 break;
111055 }
111056 }
111057 }
111058 iCol = pExpr->iColumn;
111059 if( NEVER(pTab==0) ) return;
111060
111061 if( iCol>=0 ){
111062 assert( iCol<pTab->nCol );
111063 zCol = pTab->aCol[iCol].zName;
111064 }else if( pTab->iPKey>=0 ){
@@ -138685,12 +138686,13 @@
138685 for(i=0; i<pList->nExpr; i++){
138686 Expr *pOldExpr = pList->a[i].pExpr;
138687 if( ALWAYS(pOldExpr!=0) && pOldExpr->op==TK_ASTERISK ){
138688 int jj;
138689 for(jj=0; jj<pTab->nCol; jj++){
 
138690 if( IsHiddenColumn(pTab->aCol+jj) ) continue;
138691 Expr *pNewExpr = sqlite3Expr(db, TK_ID, pTab->aCol[jj].zName);
138692 pNew = sqlite3ExprListAppend(pParse, pNew, pNewExpr);
138693 if( !db->mallocFailed ){
138694 struct ExprList_item *pItem = &pNew->a[pNew->nExpr-1];
138695 pItem->zEName = sqlite3DbStrDup(db, pTab->aCol[jj].zName);
138696 pItem->eEName = ENAME_NAME;
@@ -146730,11 +146732,13 @@
146730 }
146731
146732 /*
146733 ** Select callback for exprUsesSrclist().
146734 */
146735 static int exprUsesSrclistSelectCb(Walker *p, Select *pSelect){
 
 
146736 return WRC_Abort;
146737 }
146738
146739 /*
146740 ** This function always returns true if expression pExpr contains
@@ -228480,11 +228484,11 @@
228480 int nArg, /* Number of args */
228481 sqlite3_value **apUnused /* Function arguments */
228482 ){
228483 assert( nArg==0 );
228484 UNUSED_PARAM2(nArg, apUnused);
228485 sqlite3_result_text(pCtx, "fts5: 2021-02-05 17:34:47 078dbff04a95a001bbd8690ab08038fbb5506899df8290991b53fd1122a4c30c", -1, SQLITE_TRANSIENT);
228486 }
228487
228488 /*
228489 ** Return true if zName is the extension on one of the shadow tables used
228490 ** by this module.
@@ -233406,12 +233410,12 @@
233406 }
233407 #endif /* SQLITE_CORE */
233408 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
233409
233410 /************** End of stmt.c ************************************************/
233411 #if __LINE__!=233411
233412 #undef SQLITE_SOURCE_ID
233413 #define SQLITE_SOURCE_ID "2021-02-05 17:34:47 078dbff04a95a001bbd8690ab08038fbb5506899df8290991b53fd1122a4alt2"
233414 #endif
233415 /* Return the source-id for this library */
233416 SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
233417 /************************** End of sqlite3.c ******************************/
233418
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -1186,11 +1186,11 @@
1186 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
1187 ** [sqlite_version()] and [sqlite_source_id()].
1188 */
1189 #define SQLITE_VERSION "3.35.0"
1190 #define SQLITE_VERSION_NUMBER 3035000
1191 #define SQLITE_SOURCE_ID "2021-02-07 12:59:43 5f8bf99579e6663fc701cdc94f685584a86398c4687e25e7e241de755398f17d"
1192
1193 /*
1194 ** CAPI3REF: Run-Time Library Version Numbers
1195 ** KEYWORDS: sqlite3_version sqlite3_sourceid
1196 **
@@ -98938,20 +98938,21 @@
98938 }
98939 }else
98940 #endif /* SQLITE_OMIT_UPSERT */
98941 {
98942 pExpr->y.pTab = pTab;
 
98943 if( pParse->bReturning ){
98944 eNewExprOp = TK_REGISTER;
98945 pExpr->iTable = pNC->uNC.iBaseReg + (pTab->nCol+1)*pExpr->iTable
98946 + iCol + 1;
98947 }else{
98948 pExpr->iColumn = (i16)iCol;
98949 eNewExprOp = TK_TRIGGER;
98950 #ifndef SQLITE_OMIT_TRIGGER
98951 if( iCol<0 ){
98952 pExpr->affExpr = SQLITE_AFF_INTEGER;
98953 }else if( pExpr->iTable==0 ){
98954 testcase( iCol==31 );
98955 testcase( iCol==32 );
98956 pParse->oldmask |= (iCol>=32 ? 0xffffffff : (((u32)1)<<iCol));
98957 }else{
98958 testcase( iCol==31 );
@@ -111046,19 +111047,19 @@
111047
111048 if( pExpr->op==TK_TRIGGER ){
111049 pTab = pParse->pTriggerTab;
111050 }else{
111051 assert( pTabList );
111052 for(iSrc=0; iSrc<pTabList->nSrc; iSrc++){
111053 if( pExpr->iTable==pTabList->a[iSrc].iCursor ){
111054 pTab = pTabList->a[iSrc].pTab;
111055 break;
111056 }
111057 }
111058 }
111059 iCol = pExpr->iColumn;
111060 if( pTab==0 ) return;
111061
111062 if( iCol>=0 ){
111063 assert( iCol<pTab->nCol );
111064 zCol = pTab->aCol[iCol].zName;
111065 }else if( pTab->iPKey>=0 ){
@@ -138685,12 +138686,13 @@
138686 for(i=0; i<pList->nExpr; i++){
138687 Expr *pOldExpr = pList->a[i].pExpr;
138688 if( ALWAYS(pOldExpr!=0) && pOldExpr->op==TK_ASTERISK ){
138689 int jj;
138690 for(jj=0; jj<pTab->nCol; jj++){
138691 Expr *pNewExpr;
138692 if( IsHiddenColumn(pTab->aCol+jj) ) continue;
138693 pNewExpr = sqlite3Expr(db, TK_ID, pTab->aCol[jj].zName);
138694 pNew = sqlite3ExprListAppend(pParse, pNew, pNewExpr);
138695 if( !db->mallocFailed ){
138696 struct ExprList_item *pItem = &pNew->a[pNew->nExpr-1];
138697 pItem->zEName = sqlite3DbStrDup(db, pTab->aCol[jj].zName);
138698 pItem->eEName = ENAME_NAME;
@@ -146730,11 +146732,13 @@
146732 }
146733
146734 /*
146735 ** Select callback for exprUsesSrclist().
146736 */
146737 static int exprUsesSrclistSelectCb(Walker *NotUsed1, Select *NotUsed2){
146738 UNUSED_PARAMETER(NotUsed1);
146739 UNUSED_PARAMETER(NotUsed2);
146740 return WRC_Abort;
146741 }
146742
146743 /*
146744 ** This function always returns true if expression pExpr contains
@@ -228480,11 +228484,11 @@
228484 int nArg, /* Number of args */
228485 sqlite3_value **apUnused /* Function arguments */
228486 ){
228487 assert( nArg==0 );
228488 UNUSED_PARAM2(nArg, apUnused);
228489 sqlite3_result_text(pCtx, "fts5: 2021-02-07 12:59:43 5f8bf99579e6663fc701cdc94f685584a86398c4687e25e7e241de755398f17d", -1, SQLITE_TRANSIENT);
228490 }
228491
228492 /*
228493 ** Return true if zName is the extension on one of the shadow tables used
228494 ** by this module.
@@ -233406,12 +233410,12 @@
233410 }
233411 #endif /* SQLITE_CORE */
233412 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
233413
233414 /************** End of stmt.c ************************************************/
233415 #if __LINE__!=233415
233416 #undef SQLITE_SOURCE_ID
233417 #define SQLITE_SOURCE_ID "2021-02-07 12:59:43 5f8bf99579e6663fc701cdc94f685584a86398c4687e25e7e241de755398alt2"
233418 #endif
233419 /* Return the source-id for this library */
233420 SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
233421 /************************** End of sqlite3.c ******************************/
233422
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.35.0"
127127
 #define SQLITE_VERSION_NUMBER 3035000
128
-#define SQLITE_SOURCE_ID "2021-02-05 17:34:47 078dbff04a95a001bbd8690ab08038fbb5506899df8290991b53fd1122a4c30c"
128
+#define SQLITE_SOURCE_ID "2021-02-07 12:59:43 5f8bf99579e6663fc701cdc94f685584a86398c4687e25e7e241de755398f17d"
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.35.0"
127 #define SQLITE_VERSION_NUMBER 3035000
128 #define SQLITE_SOURCE_ID "2021-02-05 17:34:47 078dbff04a95a001bbd8690ab08038fbb5506899df8290991b53fd1122a4c30c"
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.35.0"
127 #define SQLITE_VERSION_NUMBER 3035000
128 #define SQLITE_SOURCE_ID "2021-02-07 12:59:43 5f8bf99579e6663fc701cdc94f685584a86398c4687e25e7e241de755398f17d"
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