From: dan Date: Fri, 27 Nov 2020 16:15:55 +0000 (+0000) Subject: Add missing cast to fts5 bm25() code. X-Git-Tag: version-3.34.0~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d19bf9460e136b7cf21732359c63965ee48ce4d;p=thirdparty%2Fsqlite.git Add missing cast to fts5 bm25() code. FossilOrigin-Name: 6ff9673847c0b4174d9435e93d19af0ee7406b1a12edeb6edec98697e1646824 --- diff --git a/ext/fts5/fts5_aux.c b/ext/fts5/fts5_aux.c index a3a89006b2..256fc9afd1 100644 --- a/ext/fts5/fts5_aux.c +++ b/ext/fts5/fts5_aux.c @@ -566,7 +566,7 @@ static int fts5Bm25GetData( int rc = SQLITE_OK; /* Return code */ Fts5Bm25Data *p; /* Object to return */ - p = pApi->xGetAuxdata(pFts, 0); + p = (Fts5Bm25Data*)pApi->xGetAuxdata(pFts, 0); if( p==0 ){ int nPhrase; /* Number of phrases in query */ sqlite3_int64 nRow = 0; /* Number of rows in table */ diff --git a/manifest b/manifest index 04f6c7f81b..dea829c2f7 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Remove\sa\sredundant\s"if(\src==SQLITE_OK\s)"\sfrom\sthe\sfts5\sbm25()\scode. -D 2020-11-27T16:08:15.286 +C Add\smissing\scast\sto\sfts5\sbm25()\scode. +D 2020-11-27T16:15:55.777 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -114,7 +114,7 @@ F ext/fts3/unicode/parseunicode.tcl a981bd6466d12dd17967515801c3ff23f74a281be1a0 F ext/fts5/extract_api_docs.tcl a36e54ec777172ddd3f9a88daf593b00848368e0 F ext/fts5/fts5.h c132a9323f22a972c4c93a8d5a3d901113a6e612faf30ca8e695788438c5ca2a F ext/fts5/fts5Int.h 26c74dd5776f798436fbf604a0bf0e8de263b35b5060b05c15f9085845d9fda2 -F ext/fts5/fts5_aux.c e6dbf53bfe21597cf3d52a4385bba006f0a58a8001b1c520d2ed3689f32545f9 +F ext/fts5/fts5_aux.c 7dc0cda24be4d32ddaf0fd3ffdd3406564dc28e055f2148d6dc5ecc900858f9e F ext/fts5/fts5_buffer.c 5a5fe0159752c0fb0a5a93c722e9db2662822709490769d482b76a6dc8aaca70 F ext/fts5/fts5_config.c be54f44fca491e96c6923a4b9a736f2da2b13811600eb6e38d1bcc91c4ea2e61 F ext/fts5/fts5_expr.c e527e3a7410393075598cec544e3831798a8c88b3e8878e2cfb7cb147113e925 @@ -1886,7 +1886,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 14a4dcf3474566d072007a37d214c892397c21dd3b7f8b55ad0e5edfb7130dd6 -R dd07aa0753904b5aa7d82526799a8608 +P d85f4f27f58adcc75fc7d59e63af95b2a338052d8748a11f22ec1e48d1aff4cc +R 31f1de2e35e2b768451de6161bdb08f9 U dan -Z 86f990987e42b1dda2e73f9540f5c419 +Z ed7ca998689e3eeaf0ec679d62a198f7 diff --git a/manifest.uuid b/manifest.uuid index 9bc890025c..23ea5d7535 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d85f4f27f58adcc75fc7d59e63af95b2a338052d8748a11f22ec1e48d1aff4cc \ No newline at end of file +6ff9673847c0b4174d9435e93d19af0ee7406b1a12edeb6edec98697e1646824 \ No newline at end of file