From 3722b3abf1da4e9bde859df68e679e00c6829f41 Mon Sep 17 00:00:00 2001 From: mistachkin Date: Tue, 20 Aug 2019 02:19:26 +0000 Subject: [PATCH] Fix a typo and a harmless compiler warning. FossilOrigin-Name: ec4c63e00c957f98d61ddc1b9d20406c7e1072d6ab0c12ac6939db6c63d90cb8 --- manifest | 17 ++++++++--------- manifest.uuid | 2 +- src/test1.c | 1 - src/vtab.c | 2 +- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/manifest b/manifest index d592f7b0c3..1b402b9276 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sthe\ssqlite3_drop_modules()\sinterface. -D 2019-08-19T20:44:07.937 +C Fix\sa\stypo\sand\sa\sharmless\scompiler\swarning. +D 2019-08-20T02:19:26.962 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -533,7 +533,7 @@ F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6 F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34 F src/tclsqlite.c 50c93be3e1c03b4e6cf6756e5197afcfe7f5cd0497d83a7ac317cde09e19b290 -F src/test1.c af2f21f9aee617582129bdef3934734d88c0d53de0c71019453bb72185430389 +F src/test1.c 8ce455da8dcec886a0e1e608da0fee7de67c8195b14517a8824a2a40c2d11fbf F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5 F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644 F src/test4.c 405834f6a93ec395cc4c9bb8ecebf7c3d8079e7ca16ae65e82d01afd229694bb @@ -604,7 +604,7 @@ F src/vdbeblob.c 253ed82894924c362a7fa3079551d3554cd1cdace39aa833da77d3bc67e7c1b F src/vdbemem.c 920285c3b7f5c64369e02da437dab71e9e91862df9c486541c14633739f91d75 F src/vdbesort.c 3531ae3a431ad6b98b67bd891fb42ec9d66867157188a2b1a9e58c55da6151b2 F src/vdbetrace.c fa3bf238002f0bbbdfb66cc8afb0cea284ff9f148d6439bc1f6f2b4c3b7143f0 -F src/vtab.c 6b36944fdf05a33150787236e3506e878dca027a239e39eaf408f09c4821170c +F src/vtab.c 5a0b7193d586991b3db30e343d6b59959906bfe8658a6a0a85709b20ca50bb49 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9 F src/wal.c bbd6838bd79c0a32144d482fb0b6a9d2d1a252fb3b16d5005ec30f2f80413b0d F src/wal.h 606292549f5a7be50b6227bd685fa76e3a4affad71bb8ac5ce4cb5c79f6a176a @@ -1836,8 +1836,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 4cb009b0f724f72eaea90e45488122f7c2a7d0caf31a8422da4060469507e921 e5ba47c2d8eb9f48a0e0d325e57d0092d536f85983819634c871ebd51829f1d1 -R 9f3cd232033726d002a567b7aed22f3d -T +closed e5ba47c2d8eb9f48a0e0d325e57d0092d536f85983819634c871ebd51829f1d1 -U drh -Z ea1a16d1273af50410789215c7a1a587 +P e2c6fed8f84929ed51a4e876bb09c85ac4b86a2e4cf0832a7da724bb9f4df5bf +R 8b1ae3c95bd6ffc47e9182b0d67348c9 +U mistachkin +Z 2a3c93f956b1ecd418b937639070a999 diff --git a/manifest.uuid b/manifest.uuid index 2aebc48857..1d741309c7 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e2c6fed8f84929ed51a4e876bb09c85ac4b86a2e4cf0832a7da724bb9f4df5bf \ No newline at end of file +ec4c63e00c957f98d61ddc1b9d20406c7e1072d6ab0c12ac6939db6c63d90cb8 \ No newline at end of file diff --git a/src/test1.c b/src/test1.c index e238d31e84..c6c9e17afe 100644 --- a/src/test1.c +++ b/src/test1.c @@ -1123,7 +1123,6 @@ static int SQLITE_TCLAPI test_drop_modules( int argc, /* Number of arguments */ char **argv /* Text of each argument */ ){ - int rc; sqlite3 *db; if( argc!=2 ){ diff --git a/src/vtab.c b/src/vtab.c index dd8a755be2..085290914b 100644 --- a/src/vtab.c +++ b/src/vtab.c @@ -140,7 +140,7 @@ int sqlite3_create_module_v2( int sqlite3_drop_modules(sqlite3 *db, const char** azNames){ HashElem *pThis, *pNext; #ifdef SQLITE_ENABLE_API_ARMOR - if( !sqlite3SafetyCheckOk(db) || zName==0 ) return SQLITE_MISUSE_BKPT; + if( !sqlite3SafetyCheckOk(db) ) return SQLITE_MISUSE_BKPT; #endif for(pThis=sqliteHashFirst(&db->aModule); pThis; pThis=pNext){ Module *pMod = (Module*)sqliteHashData(pThis);