Rename a local variable to avoid masking a function parameter and thus

causing a harmless compiler warning.

FossilOrigin-Name: f065cf003bd2a3a580cb5b9fa2eacd8be075fe8c2bbc5688e9a9406abbfb3804

diff --git a/manifest b/manifest
index d258de301c1e4bb7910566b1536bab507ea0ed49..4ecbb9780615674fa34bb8f231051dc36aa0e454 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\sNEVER()\sto\sthe\sALTER\sTABLE\sfix\sin\scheck-in\s[1d2e53a39b87e364]
-D 2019-12-09T19:29:10.291
+C Rename\sa\slocal\svariable\sto\savoid\smasking\sa\sfunction\sparameter\sand\sthus\ncausing\sa\sharmless\scompiler\swarning.
+D 2019-12-09T19:44:45.580
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -525,7 +525,7 @@ F src/pragma.h ec3b31eac9b1df040f1cc8cb3d89bc06605c3b4cb3d76f833de8d6d6c3f77f04
 F src/prepare.c 6049beb71385f017af6fc320d2c75a4e50b75e280c54232442b785fbb83df057
 F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
-F src/resolve.c 5b36f3e5185828514a9819b17ba12c2a90d7533c6480e9c132af2a15dc873f51
+F src/resolve.c 2a1218137b99f613decff552a7b76f5c7a2129a74d0b22a7d19dfbf3a770f01b
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
 F src/select.c 0fe10579de20eb8dc04ec9ed29659fa782bee2bcc85a35734637f3e2cabc2762
 F src/shell.c.in 4a3a9e1c11847b1904f2b01d087af1c052f660902755abab457cab1756817ded
@@ -1852,7 +1852,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P ed28aaa4851202111a502f883ca06359d89b25bba4055c29d7bce2b501cfcc68
-R ba840c4297279356152ab032c954fe8c
+P c7309ed3c7588c7e51e09418bf5cfd4611539b44c39cef9ed4ae0e385bae7625
+R c5e9fc97422d66306dffd9a52fafe510
 U drh
-Z 9bf11ac4c26576dca473cbff94f16995
+Z 2d277b2fd1fa015a93e6a070ccbdea58

diff --git a/manifest.uuid b/manifest.uuid
index 9983641a848d039f086999846e24d838ab3ebac4..2199075894a59dae32b0e3fafb8515beac860def 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c7309ed3c7588c7e51e09418bf5cfd4611539b44c39cef9ed4ae0e385bae7625
\ No newline at end of file
+f065cf003bd2a3a580cb5b9fa2eacd8be075fe8c2bbc5688e9a9406abbfb3804
\ No newline at end of file

diff --git a/src/resolve.c b/src/resolve.c
index e8e735aec8cad1786f5f6e973e74eadf3ffdf98d..974d9802f16b05e0130f2563b5502af8b160ca76 100644 (file)
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -565,16 +565,15 @@ static int lookupName(
   */
   if( pExpr->iColumn>=0 && pMatch!=0 ){
     int n = pExpr->iColumn;
-    Table *pTab;
-    pTab = pExpr->y.pTab;
-    assert( pTab!=0 );
+    Table *pExTab = pExpr->y.pTab;
+    assert( pExTab!=0 );
     assert( pMatch->iCursor==pExpr->iTable );
-    if( (pTab->tabFlags & TF_HasGenerated)!=0
-     && (pTab->aCol[n].colFlags & COLFLAG_GENERATED)!=0 
+    if( (pExTab->tabFlags & TF_HasGenerated)!=0
+     && (pExTab->aCol[n].colFlags & COLFLAG_GENERATED)!=0 
     ){
-      testcase( pTab->nCol==BMS-1 );
-      testcase( pTab->nCol==BMS );
-      pMatch->colUsed = pTab->nCol>=BMS ? ALLBITS : MASKBIT(pTab->nCol)-1;
+      testcase( pExTab->nCol==BMS-1 );
+      testcase( pExTab->nCol==BMS );
+      pMatch->colUsed = pExTab->nCol>=BMS ? ALLBITS : MASKBIT(pExTab->nCol)-1;
     }else{
       testcase( n==BMS-1 );
       testcase( n==BMS );