From: drh <> Date: Tue, 13 Dec 2022 16:59:09 +0000 (+0000) Subject: Remove an unused variable from sqlite3SubqueryColumnTypes(). X-Git-Tag: version-3.41.0~246^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c799217cc8ca5284806503d09f5ae7c6cb5d0612;p=thirdparty%2Fsqlite.git Remove an unused variable from sqlite3SubqueryColumnTypes(). FossilOrigin-Name: c6e3ff396947e6954e77195419b35de8b39bd540d3f4bff456bab25b512e1792 --- diff --git a/manifest b/manifest index f66c0934cf..d1f7caa123 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Use\sstandard\sdatatype\snames\sfor\sthe\scolumn\sdatatypes\sin\sviews\sand\ssubqueries. -D 2022-12-13T16:55:23.134 +C Remove\san\sunused\svariable\sfrom\ssqlite3SubqueryColumnTypes(). +D 2022-12-13T16:59:09.043 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -645,7 +645,7 @@ F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92 -F src/select.c 44fd33ce5785cc339d20fa20677cd1aab7a8320522096a4ba2579c24509f547c +F src/select.c 9e95a0a9705d795e0293343e76cd9d3b148710bd241598be9d5a01202539ca83 F src/shell.c.in 8d9dc02dd03f8fc93f3e3cdb17d8d16e8ddb985dddad213985c08186900a3ebb F src/sqlite.h.in e752f82b9d71f1d42b259b1900e4b1caf0965e844d756cd5cc91cc2cf45ed925 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 @@ -2067,8 +2067,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 4dfb1b450b87e2c6207c83c102b785781d1dbdeadbeeab6a83f96d58bb96cfbf -R 6aab825d7c825fe79986d6d7941e29bc +P baf2c2413346feb72ecb0bac800be9b945ebb4e01b42212132434d8ddef9cad0 +R 86de588c322b7763c9c612098f7035e4 U drh -Z 81f237e4466072746acf71e9caeb1aa9 +Z 74aeae4c2e5182075f948a03d97615dd # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 06104e000b..8d0d9f01aa 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -baf2c2413346feb72ecb0bac800be9b945ebb4e01b42212132434d8ddef9cad0 \ No newline at end of file +c6e3ff396947e6954e77195419b35de8b39bd540d3f4bff456bab25b512e1792 \ No newline at end of file diff --git a/src/select.c b/src/select.c index 03b26a44e4..fe10a8b60a 100644 --- a/src/select.c +++ b/src/select.c @@ -2320,7 +2320,6 @@ void sqlite3SubqueryColumnTypes( char aff /* Default affinity. Maybe with SQLITE_AFF_FLAG1 too */ ){ sqlite3 *db = pParse->db; - NameContext sNC; Column *pCol; CollSeq *pColl; int i,j; @@ -2332,8 +2331,6 @@ void sqlite3SubqueryColumnTypes( assert( pTab->nCol==pSelect->pEList->nExpr || db->mallocFailed ); if( db->mallocFailed ) return; while( pSelect->pPrior ) pSelect = pSelect->pPrior; - memset(&sNC, 0, sizeof(sNC)); - sNC.pSrcList = pSelect->pSrc; a = pSelect->pEList->a; for(i=0, pCol=pTab->aCol; inCol; i++, pCol++){ const char *zType;