Fossil SCM

Fix harmless compiler warnings in SQLite.

drh 2014-01-22 18:32 trunk
Commit 64096c726997b1c00f4861398e49ed112afa43c2
Parent af990795fcd3c19…
2 files changed +8 -10 +1 -1
~ src/sqlite3.c ~ src/sqlite3.h
M src/sqlite3.c
+8 -10
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -135,11 +135,11 @@
135135
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
136136
 ** [sqlite_version()] and [sqlite_source_id()].
137137
 */
138138
 #define SQLITE_VERSION "3.8.3"
139139
 #define SQLITE_VERSION_NUMBER 3008003
140
-#define SQLITE_SOURCE_ID "2014-01-22 18:16:27 b6cea42006910d590373e8f9e296d7672edb114b"
140
+#define SQLITE_SOURCE_ID "2014-01-22 18:31:27 dea2ca6a159d5dcfd8deceedf1c2a73fb4ac1cfc"
141141
142142
 /*
143143
 ** CAPI3REF: Run-Time Library Version Numbers
144144
 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
145145
 **
@@ -77966,15 +77966,13 @@
7796677966
 pTab = p->pSrc->a[0].pTab;
7796777967
 pExpr = p->pEList->a[0].pExpr;
7796877968
 iCol = (i16)pExpr->iColumn;
7796977969
7797077970
 /* Code an OP_VerifyCookie and OP_TableLock for <table>. */
77971
- if( ALWAYS(pTab->pSchema) ){
77972
- iDb = sqlite3SchemaToIndex(db, pTab->pSchema);
77973
- sqlite3CodeVerifySchema(pParse, iDb);
77974
- sqlite3TableLock(pParse, iDb, pTab->tnum, 0, pTab->zName);
77975
- }
77971
+ iDb = sqlite3SchemaToIndex(db, pTab->pSchema);
77972
+ sqlite3CodeVerifySchema(pParse, iDb);
77973
+ sqlite3TableLock(pParse, iDb, pTab->tnum, 0, pTab->zName);
7797677974
7797777975
 /* This function is only called from two places. In both cases the vdbe
7797877976
 ** has already been allocated. So assume sqlite3GetVdbe() is always
7797977977
 ** successful here.
7798077978
 */
@@ -101219,11 +101217,11 @@
101219101217
 int nCol = p->pEList->nExpr; /* Number of columns in the recursive table */
101220101218
 Vdbe *v = pParse->pVdbe; /* The prepared statement under construction */
101221101219
 Select *pSetup = p->pPrior; /* The setup query */
101222101220
 int addrTop; /* Top of the loop */
101223101221
 int addrCont, addrBreak; /* CONTINUE and BREAK addresses */
101224
- int iCurrent; /* The Current table */
101222
+ int iCurrent = 0; /* The Current table */
101225101223
 int regCurrent; /* Register holding Current table */
101226101224
 int iQueue; /* The Queue table */
101227101225
 int iDistinct = 0; /* To ensure unique results if UNION */
101228101226
 int eDest = SRT_Table; /* How to write to Queue */
101229101227
 SelectDest destQueue; /* SelectDest targetting the Queue table */
@@ -101381,12 +101379,12 @@
101381101379
 Vdbe *v; /* Generate code to this VDBE */
101382101380
 SelectDest dest; /* Alternative data destination */
101383101381
 Select *pDelete = 0; /* Chain of simple selects to delete */
101384101382
 sqlite3 *db; /* Database connection */
101385101383
 #ifndef SQLITE_OMIT_EXPLAIN
101386
- int iSub1; /* EQP id of left-hand query */
101387
- int iSub2; /* EQP id of right-hand query */
101384
+ int iSub1 = 0; /* EQP id of left-hand query */
101385
+ int iSub2 = 0; /* EQP id of right-hand query */
101388101386
 #endif
101389101387
101390101388
 /* Make sure there is no ORDER BY or LIMIT clause on prior SELECTs. Only
101391101389
 ** the last (right-most) SELECT in the series may have an ORDER BY or LIMIT.
101392101390
 */
@@ -117080,11 +117078,11 @@
117080117078
 sqlite3DropTable(pParse, yymsp[0].minor.yy65, 1, yymsp[-1].minor.yy328);
117081117079
 }
117082117080
 break;
117083117081
 case 111: /* cmd ::= select */
117084117082
 {
117085
- SelectDest dest = {SRT_Output, 0, 0, 0, 0};
117083
+ SelectDest dest = {SRT_Output, 0, 0, 0, 0, 0};
117086117084
 sqlite3Select(pParse, yymsp[0].minor.yy3, &dest);
117087117085
 sqlite3ExplainBegin(pParse->pVdbe);
117088117086
 sqlite3ExplainSelect(pParse->pVdbe, yymsp[0].minor.yy3);
117089117087
 sqlite3ExplainFinish(pParse->pVdbe);
117090117088
 sqlite3SelectDelete(pParse->db, yymsp[0].minor.yy3);
117091117089
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -135,11 +135,11 @@
135 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
136 ** [sqlite_version()] and [sqlite_source_id()].
137 */
138 #define SQLITE_VERSION "3.8.3"
139 #define SQLITE_VERSION_NUMBER 3008003
140 #define SQLITE_SOURCE_ID "2014-01-22 18:16:27 b6cea42006910d590373e8f9e296d7672edb114b"
141
142 /*
143 ** CAPI3REF: Run-Time Library Version Numbers
144 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
145 **
@@ -77966,15 +77966,13 @@
77966 pTab = p->pSrc->a[0].pTab;
77967 pExpr = p->pEList->a[0].pExpr;
77968 iCol = (i16)pExpr->iColumn;
77969
77970 /* Code an OP_VerifyCookie and OP_TableLock for <table>. */
77971 if( ALWAYS(pTab->pSchema) ){
77972 iDb = sqlite3SchemaToIndex(db, pTab->pSchema);
77973 sqlite3CodeVerifySchema(pParse, iDb);
77974 sqlite3TableLock(pParse, iDb, pTab->tnum, 0, pTab->zName);
77975 }
77976
77977 /* This function is only called from two places. In both cases the vdbe
77978 ** has already been allocated. So assume sqlite3GetVdbe() is always
77979 ** successful here.
77980 */
@@ -101219,11 +101217,11 @@
101219 int nCol = p->pEList->nExpr; /* Number of columns in the recursive table */
101220 Vdbe *v = pParse->pVdbe; /* The prepared statement under construction */
101221 Select *pSetup = p->pPrior; /* The setup query */
101222 int addrTop; /* Top of the loop */
101223 int addrCont, addrBreak; /* CONTINUE and BREAK addresses */
101224 int iCurrent; /* The Current table */
101225 int regCurrent; /* Register holding Current table */
101226 int iQueue; /* The Queue table */
101227 int iDistinct = 0; /* To ensure unique results if UNION */
101228 int eDest = SRT_Table; /* How to write to Queue */
101229 SelectDest destQueue; /* SelectDest targetting the Queue table */
@@ -101381,12 +101379,12 @@
101381 Vdbe *v; /* Generate code to this VDBE */
101382 SelectDest dest; /* Alternative data destination */
101383 Select *pDelete = 0; /* Chain of simple selects to delete */
101384 sqlite3 *db; /* Database connection */
101385 #ifndef SQLITE_OMIT_EXPLAIN
101386 int iSub1; /* EQP id of left-hand query */
101387 int iSub2; /* EQP id of right-hand query */
101388 #endif
101389
101390 /* Make sure there is no ORDER BY or LIMIT clause on prior SELECTs. Only
101391 ** the last (right-most) SELECT in the series may have an ORDER BY or LIMIT.
101392 */
@@ -117080,11 +117078,11 @@
117080 sqlite3DropTable(pParse, yymsp[0].minor.yy65, 1, yymsp[-1].minor.yy328);
117081 }
117082 break;
117083 case 111: /* cmd ::= select */
117084 {
117085 SelectDest dest = {SRT_Output, 0, 0, 0, 0};
117086 sqlite3Select(pParse, yymsp[0].minor.yy3, &dest);
117087 sqlite3ExplainBegin(pParse->pVdbe);
117088 sqlite3ExplainSelect(pParse->pVdbe, yymsp[0].minor.yy3);
117089 sqlite3ExplainFinish(pParse->pVdbe);
117090 sqlite3SelectDelete(pParse->db, yymsp[0].minor.yy3);
117091
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -135,11 +135,11 @@
135 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
136 ** [sqlite_version()] and [sqlite_source_id()].
137 */
138 #define SQLITE_VERSION "3.8.3"
139 #define SQLITE_VERSION_NUMBER 3008003
140 #define SQLITE_SOURCE_ID "2014-01-22 18:31:27 dea2ca6a159d5dcfd8deceedf1c2a73fb4ac1cfc"
141
142 /*
143 ** CAPI3REF: Run-Time Library Version Numbers
144 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
145 **
@@ -77966,15 +77966,13 @@
77966 pTab = p->pSrc->a[0].pTab;
77967 pExpr = p->pEList->a[0].pExpr;
77968 iCol = (i16)pExpr->iColumn;
77969
77970 /* Code an OP_VerifyCookie and OP_TableLock for <table>. */
77971 iDb = sqlite3SchemaToIndex(db, pTab->pSchema);
77972 sqlite3CodeVerifySchema(pParse, iDb);
77973 sqlite3TableLock(pParse, iDb, pTab->tnum, 0, pTab->zName);
 
 
77974
77975 /* This function is only called from two places. In both cases the vdbe
77976 ** has already been allocated. So assume sqlite3GetVdbe() is always
77977 ** successful here.
77978 */
@@ -101219,11 +101217,11 @@
101217 int nCol = p->pEList->nExpr; /* Number of columns in the recursive table */
101218 Vdbe *v = pParse->pVdbe; /* The prepared statement under construction */
101219 Select *pSetup = p->pPrior; /* The setup query */
101220 int addrTop; /* Top of the loop */
101221 int addrCont, addrBreak; /* CONTINUE and BREAK addresses */
101222 int iCurrent = 0; /* The Current table */
101223 int regCurrent; /* Register holding Current table */
101224 int iQueue; /* The Queue table */
101225 int iDistinct = 0; /* To ensure unique results if UNION */
101226 int eDest = SRT_Table; /* How to write to Queue */
101227 SelectDest destQueue; /* SelectDest targetting the Queue table */
@@ -101381,12 +101379,12 @@
101379 Vdbe *v; /* Generate code to this VDBE */
101380 SelectDest dest; /* Alternative data destination */
101381 Select *pDelete = 0; /* Chain of simple selects to delete */
101382 sqlite3 *db; /* Database connection */
101383 #ifndef SQLITE_OMIT_EXPLAIN
101384 int iSub1 = 0; /* EQP id of left-hand query */
101385 int iSub2 = 0; /* EQP id of right-hand query */
101386 #endif
101387
101388 /* Make sure there is no ORDER BY or LIMIT clause on prior SELECTs. Only
101389 ** the last (right-most) SELECT in the series may have an ORDER BY or LIMIT.
101390 */
@@ -117080,11 +117078,11 @@
117078 sqlite3DropTable(pParse, yymsp[0].minor.yy65, 1, yymsp[-1].minor.yy328);
117079 }
117080 break;
117081 case 111: /* cmd ::= select */
117082 {
117083 SelectDest dest = {SRT_Output, 0, 0, 0, 0, 0};
117084 sqlite3Select(pParse, yymsp[0].minor.yy3, &dest);
117085 sqlite3ExplainBegin(pParse->pVdbe);
117086 sqlite3ExplainSelect(pParse->pVdbe, yymsp[0].minor.yy3);
117087 sqlite3ExplainFinish(pParse->pVdbe);
117088 sqlite3SelectDelete(pParse->db, yymsp[0].minor.yy3);
117089
M src/sqlite3.h
+1 -1
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -107,11 +107,11 @@
107107
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108108
 ** [sqlite_version()] and [sqlite_source_id()].
109109
 */
110110
 #define SQLITE_VERSION "3.8.3"
111111
 #define SQLITE_VERSION_NUMBER 3008003
112
-#define SQLITE_SOURCE_ID "2014-01-22 18:16:27 b6cea42006910d590373e8f9e296d7672edb114b"
112
+#define SQLITE_SOURCE_ID "2014-01-22 18:31:27 dea2ca6a159d5dcfd8deceedf1c2a73fb4ac1cfc"
113113
114114
 /*
115115
 ** CAPI3REF: Run-Time Library Version Numbers
116116
 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
117117
 **
118118
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -107,11 +107,11 @@
107 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108 ** [sqlite_version()] and [sqlite_source_id()].
109 */
110 #define SQLITE_VERSION "3.8.3"
111 #define SQLITE_VERSION_NUMBER 3008003
112 #define SQLITE_SOURCE_ID "2014-01-22 18:16:27 b6cea42006910d590373e8f9e296d7672edb114b"
113
114 /*
115 ** CAPI3REF: Run-Time Library Version Numbers
116 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
117 **
118
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -107,11 +107,11 @@
107 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108 ** [sqlite_version()] and [sqlite_source_id()].
109 */
110 #define SQLITE_VERSION "3.8.3"
111 #define SQLITE_VERSION_NUMBER 3008003
112 #define SQLITE_SOURCE_ID "2014-01-22 18:31:27 dea2ca6a159d5dcfd8deceedf1c2a73fb4ac1cfc"
113
114 /*
115 ** CAPI3REF: Run-Time Library Version Numbers
116 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
117 **
118

Keyboard Shortcuts

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