From a18532353c3d2f87d8b739e30ec0d55437aa8d8c Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 18 Jul 2017 20:17:52 +0000 Subject: [PATCH] Remove an unused variable from unionvtab.c. FossilOrigin-Name: a447fdf182c9090ca5b6c9c13147ae4b78d22d67f416ee7a0436ca408284c8fe --- ext/misc/unionvtab.c | 4 ---- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/ext/misc/unionvtab.c b/ext/misc/unionvtab.c index d957901833..eb17db78bf 100644 --- a/ext/misc/unionvtab.c +++ b/ext/misc/unionvtab.c @@ -416,7 +416,6 @@ static int unionConnect( }else{ int nAlloc = 0; /* Allocated size of pTab->aSrc[] */ sqlite3_stmt *pStmt = 0; /* Argument statement */ - char *zSql = 0; /* SQL statement */ char *zArg = unionStrdup(&rc, argv[3]); /* Copy of argument to CVT */ /* Prepare the SQL statement. Instead of executing it directly, sort @@ -470,8 +469,6 @@ static int unionConnect( } unionFinalize(&rc, pStmt); pStmt = 0; - sqlite3_free(zSql); - zSql = 0; /* Verify that all source tables exist and have compatible schemas. */ if( rc==SQLITE_OK ){ @@ -495,7 +492,6 @@ static int unionConnect( } unionFinalize(&rc, pStmt); - sqlite3_free(zSql); } if( rc!=SQLITE_OK ){ diff --git a/manifest b/manifest index c0ff6acba9..7f3a35907f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Improve\sthe\sreadability\sof\sthe\sunionvtab\scode. -D 2017-07-18T20:03:49.037 +C Remove\san\sunused\svariable\sfrom\sunionvtab.c. +D 2017-07-18T20:17:52.099 F Makefile.in d9873c9925917cca9990ee24be17eb9613a668012c85a343aef7e5536ae266e8 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 20850e3e8d4d4791e0531955852d768eb06f24138214870d543abb1a47346fba @@ -281,7 +281,7 @@ F ext/misc/showauth.c 732578f0fe4ce42d577e1c86dc89dd14a006ab52 F ext/misc/spellfix.c a4723b6aff748a417b5091b68a46443265c40f0d F ext/misc/stmt.c 6f16443abb3551e3f5813bb13ba19a30e7032830015b0f92fe0c0453045c0a11 F ext/misc/totype.c 4a167594e791abeed95e0a8db028822b5e8fe512 -F ext/misc/unionvtab.c 6f000dda30b9b757d96430b527fa914565db761b052eeff44f4ecc4fb78afb17 +F ext/misc/unionvtab.c 270ebaa9f5a7d283f9aeeb50605dbd243bde111b5ee9f5f5765b3f1a7998a71c F ext/misc/vfslog.c fe40fab5c077a40477f7e5eba994309ecac6cc95 F ext/misc/vfsstat.c bf10ef0bc51e1ad6756629e1edb142f7a8db1178 F ext/misc/vtshim.c 1976e6dd68dd0d64508c91a6dfab8e75f8aaf6cd @@ -1635,7 +1635,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 4a6c416fa025a34116ea30923a673cbb108b251b2676734ec8f603600e38e50e -R e0c4fc635382665649191367077e776c +P 5bcf0f86ea7fbbc31a13b2d5b1cf93a92e46fb65fe8e779b3d7e4a98d60d7061 +R 33f90b952409aeaf28122c0e9ad9167d U dan -Z e8f0cf724e634e649031bed86724d795 +Z 29489a901bd7715b1c7e8c4ddf6a1303 diff --git a/manifest.uuid b/manifest.uuid index 3c95ab695a..6ced47f601 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -5bcf0f86ea7fbbc31a13b2d5b1cf93a92e46fb65fe8e779b3d7e4a98d60d7061 \ No newline at end of file +a447fdf182c9090ca5b6c9c13147ae4b78d22d67f416ee7a0436ca408284c8fe \ No newline at end of file