From: stephan Date: Sat, 26 Aug 2023 17:36:15 +0000 (+0000) Subject: Two significant typo fixes for [1a30919bfbb686]. X-Git-Tag: version-3.44.0~277 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a6835fe0c4c65c73138b2ec3ae9ae98fb09c15a;p=thirdparty%2Fsqlite.git Two significant typo fixes for [1a30919bfbb686]. FossilOrigin-Name: 6a6ee6dd54ec1a1dc7fb7d2f331951525d394a8362aef911f62878ac3961898f --- diff --git a/ext/jni/src/c/sqlite3-jni.c b/ext/jni/src/c/sqlite3-jni.c index 629126dd62..fefd19223d 100644 --- a/ext/jni/src/c/sqlite3-jni.c +++ b/ext/jni/src/c/sqlite3-jni.c @@ -2814,7 +2814,7 @@ S3JniApi(sqlite3_db_filename(),jstring,1db_1filename)( S3JniApi(sqlite3_db_handle(),jobject,1db_1handle)( JniArgsEnvClass, jobject jpStmt ){ - sqlite3_stmt * const pStmt = PtrGet_sqlite3_context(jpStmt); + sqlite3_stmt * const pStmt = PtrGet_sqlite3_stmt(jpStmt); sqlite3 * const pDb = pStmt ? sqlite3_db_handle(pStmt) : 0; S3JniDb * const ps = pDb ? S3JniDb_from_c(pDb) : 0; return ps ? ps->jDb : 0; diff --git a/ext/jni/src/org/sqlite/jni/Tester1.java b/ext/jni/src/org/sqlite/jni/Tester1.java index 426cee598f..1a4ee178c6 100644 --- a/ext/jni/src/org/sqlite/jni/Tester1.java +++ b/ext/jni/src/org/sqlite/jni/Tester1.java @@ -926,8 +926,8 @@ public class Tester1 implements Runnable { @ManualTest /* because threads inherently break this test */ private void testBusy(){ final String dbName = "_busy-handler.db"; - final OutputPointer.sqlite3 outDb = OutputPointer.sqlite3(); - final OutputPointer.sqlite3_stmt outStmt = OutputPointer.sqlite3_stmt(); + final OutputPointer.sqlite3 outDb = new OutputPointer.sqlite3(); + final OutputPointer.sqlite3_stmt outStmt = new OutputPointer.sqlite3_stmt(); int rc = sqlite3_open(dbName, outDb); ++metrics.dbOpen; diff --git a/manifest b/manifest index f8be8f3203..c6ef430101 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Bind\ssqlite3_db_handle()\sto\sJNI. -D 2023-08-26T17:30:14.460 +C Two\ssignificant\stypo\sfixes\sfor\s[1a30919bfbb686]. +D 2023-08-26T17:36:15.621 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -236,7 +236,7 @@ F ext/icu/sqliteicu.h fa373836ed5a1ee7478bdf8a1650689294e41d0c89c1daab26e9ae78a3 F ext/jni/GNUmakefile d9244b5addf58868343a74a94faa71f829e7f40c163486d053f4b4bbea173703 F ext/jni/README.md 1332b1fa27918bd5d9ca2d0d4f3ac3a6ab86b9e3699dc5bfe32904a027f3d2a9 F ext/jni/jar-dist.make 030aaa4ae71dd86e4ec5e7c1e6cd86f9dfa47c4592c070d2e35157e42498e1fa -F ext/jni/src/c/sqlite3-jni.c 019f9b9342909af59982ee8c193a181202ef201b31c1f235e6958182c49e9d86 +F ext/jni/src/c/sqlite3-jni.c 96d9681396fef07c83372ce949359bf069e04cd648279760b3bd65352a3cf889 F ext/jni/src/c/sqlite3-jni.h a4559d325925ca4d55ca75e2054adff607fdd35c2a94fecc9f2e8f919cababed F ext/jni/src/org/sqlite/jni/AggregateFunction.java e0aac6ccae05702f8ee779820570866a2760aaa57a73135c57c8d3580bef52d5 F ext/jni/src/org/sqlite/jni/AuthorizerCallback.java c374bb76409cce7a0bdba94877706b59ac6127fa5d9e6af3e8058c99ce99c030 @@ -264,7 +264,7 @@ F ext/jni/src/org/sqlite/jni/SQLFunction.java d060f302b2cc4cf7a4f5a6b2d36458a2e6 F ext/jni/src/org/sqlite/jni/SQLite3CallbackProxy.java 13c4ea6f35871261eba63fa4117715515e0beecbdebfb879ec5b1f340ed36904 F ext/jni/src/org/sqlite/jni/SQLite3Jni.java 9368994e8da4f8012466e4314f484818b8247c7417904fb04ffc87142c87aed5 F ext/jni/src/org/sqlite/jni/ScalarFunction.java 21301a947e49f0dd9c682dfe2cc8a6518226c837253dd791cd512f847eeca52c -F ext/jni/src/org/sqlite/jni/Tester1.java 90c97ee08e8ad859695b79767869f609bb11b71ce7d6b119c766275d6cbfacf3 +F ext/jni/src/org/sqlite/jni/Tester1.java 37b46dc15ac8fbeb916dcf1f7771023d2be025d05422d725d5891935eda506ac F ext/jni/src/org/sqlite/jni/TesterFts5.java 6f135c60e24c89e8eecb9fe61dde0f3bb2906de668ca6c9186bcf34bdaf94629 F ext/jni/src/org/sqlite/jni/TraceV2Callback.java 25a45e800b0c57f506c237d111bcfd09da584e936fee395d4bd802100ebeff8c F ext/jni/src/org/sqlite/jni/UpdateHookCallback.java f5eadfa44462c050658230884b41477274f34306accd85c8201a7afbc00d2429 @@ -2103,8 +2103,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 25331172f78544f7f23ad7821cbf065589f6d02706184d4c83fe3988452dac5d -R edbf86b7a8a5043325b80898d6ff9011 +P 1a30919bfbb686464e8020e684120d22dd2375b910a17446b75452fda96a7449 +R daab7741306924c5da59534b151007f9 U stephan -Z 71902b3879f7020088c52617ebe652ae +Z 2446667f02ee59a9738709662543977d # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 9253a66eb1..a24f802dbd 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -1a30919bfbb686464e8020e684120d22dd2375b910a17446b75452fda96a7449 \ No newline at end of file +6a6ee6dd54ec1a1dc7fb7d2f331951525d394a8362aef911f62878ac3961898f \ No newline at end of file