From: stephan <stephan@noemail.net>
Date: Thu, 31 Aug 2023 18:34:43 +0000 (+0000)
Subject: Minor JNI cleanups.
X-Git-Tag: version-3.44.0~216^2~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=63e7ed3b449aa7a76b0e6543e970bd445f862193;p=thirdparty%2Fsqlite.git

Minor JNI cleanups.

FossilOrigin-Name: 2e2bb841ef8b53266ec48d8c3408d6396f29f17922e858eac1b4f12f4adeb05e
---

diff --git a/ext/jni/src/c/sqlite3-jni.c b/ext/jni/src/c/sqlite3-jni.c
index 4fe788a007..e63c86a1a4 100644
--- a/ext/jni/src/c/sqlite3-jni.c
+++ b/ext/jni/src/c/sqlite3-jni.c
@@ -2127,22 +2127,21 @@ static int s3jni_run_java_auto_extensions(sqlite3 *pDb, const char **pzErr,
        (temporary) lack of finalizer for the ps object. */;
   ps->pDb = pDb;
   for( i = 0; go && 0==rc; ++i ){
-    S3JniAutoExtension ax = {0,0}
+    S3JniAutoExtension ax = S3JniHook_empty
       /* We need a copy of the auto-extension object, with our own
       ** local reference to it, to avoid a race condition with another
       ** thread manipulating the list during the call and invaliding
-      ** what ax points to. */;
+      ** what ax references. */;
     S3JniAutoExt_mutex_enter;
     if( i >= SJG.autoExt.nExt ){
       go = 0;
     }else{
-      ax.jObj = S3JniRefLocal(SJG.autoExt.aExt[i].jObj);
-      ax.midCallback = SJG.autoExt.aExt[i].midCallback;
+      S3JniHook_localdup(&SJG.autoExt.aExt[i], &ax);
     }
     S3JniAutoExt_mutex_leave;
     if( ax.jObj ){
       rc = (*env)->CallIntMethod(env, ax.jObj, ax.midCallback, ps->jDb);
-      S3JniUnrefLocal(ax.jObj);
+      S3JniHook_localundup(ax);
       S3JniIfThrew {
         jthrowable const ex = (*env)->ExceptionOccurred(env);
         char * zMsg;
@@ -2151,7 +2150,7 @@ static int s3jni_run_java_auto_extensions(sqlite3 *pDb, const char **pzErr,
         S3JniUnrefLocal(ex);
         *pzErr = sqlite3_mprintf("auto-extension threw: %s", zMsg);
         sqlite3_free(zMsg);
-        if( !rc ) rc = SQLITE_ERROR;
+        rc = SQLITE_ERROR;
       }
     }
   }
diff --git a/ext/jni/src/org/sqlite/jni/SQLite3Jni.java b/ext/jni/src/org/sqlite/jni/SQLite3Jni.java
index 8a4a359aaf..c45f50b002 100644
--- a/ext/jni/src/org/sqlite/jni/SQLite3Jni.java
+++ b/ext/jni/src/org/sqlite/jni/SQLite3Jni.java
@@ -1426,7 +1426,7 @@ public final class SQLite3Jni {
 
   @Canonical
   public static native UpdateHookCallback sqlite3_update_hook(
-    sqlite3 db, UpdateHookCallback hook
+    @NotNull sqlite3 db, @Nullable UpdateHookCallback hook
   );
 
   @Canonical
diff --git a/manifest b/manifest
index 2e4701bf4a..ef1d301e64 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sconvenience\soverloads\sof\sJNI\ssqlite3_table_column_metadata()\sto\ssimplify\susage.
-D 2023-08-31T15:24:46.471
+C Minor\sJNI\scleanups.
+D 2023-08-31T18:34:43.613
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -237,7 +237,7 @@ F ext/icu/sqliteicu.h fa373836ed5a1ee7478bdf8a1650689294e41d0c89c1daab26e9ae78a3
 F ext/jni/GNUmakefile b6ae6d04cc33f2300ab7177bd5db1ecfbc8627f76fee6aec441f980e57594291
 F ext/jni/README.md 1332b1fa27918bd5d9ca2d0d4f3ac3a6ab86b9e3699dc5bfe32904a027f3d2a9
 F ext/jni/jar-dist.make 030aaa4ae71dd86e4ec5e7c1e6cd86f9dfa47c4592c070d2e35157e42498e1fa
-F ext/jni/src/c/sqlite3-jni.c 2364ccb4445c5f45a4d4b80d28455fe0c547f5529e5bd8610b4ba3811c82cc78
+F ext/jni/src/c/sqlite3-jni.c 07b1b48cbc192b4316adf9581412fb280634e87eaf55302f529611b3f49e1c6c
 F ext/jni/src/c/sqlite3-jni.h d9ea1662cefe7d8a2737cdbc55799a7e407cbc2239769f486d8eb33b68b9f133
 F ext/jni/src/org/sqlite/jni/AbstractCollationCallback.java 95e88ba04f4aac51ffec65693e878e234088b2f21b387f4e4285c8b72b33e436
 F ext/jni/src/org/sqlite/jni/AggregateFunction.java 7312486bc65fecdb91753c0a4515799194e031f45edbe16a6373cea18f404dc4
@@ -262,7 +262,7 @@ F ext/jni/src/org/sqlite/jni/ResultCode.java ba701f20213a5f259e94cfbfdd36eb7ac7c
 F ext/jni/src/org/sqlite/jni/RollbackHookCallback.java 16042be9d072a26dbb2f1b1b63e7639989b747bb80d2bd667ba4f7555f56a825
 F ext/jni/src/org/sqlite/jni/SQLFunction.java 544a875d33fd160467d82e2397ac33157b29971d715a821a4fad3c899113ee8c
 F ext/jni/src/org/sqlite/jni/SQLite3CallbackProxy.java c2748ab52856075b053a55b317988d95dc7fb4d3d42520f8c33573effe1cd185
-F ext/jni/src/org/sqlite/jni/SQLite3Jni.java 5ac577b1f2290b3ef6e974e5d1530c380c09708ffedb42797dcfc2b8d016904d
+F ext/jni/src/org/sqlite/jni/SQLite3Jni.java ffabb0a0ed7f35cfdea41502888b1c616b7e9b262afd9f2cace527b7a7ec0631
 F ext/jni/src/org/sqlite/jni/ScalarFunction.java 6d387bb499fbe3bc13c53315335233dbf6a0c711e8fa7c521683219b041c614c
 F ext/jni/src/org/sqlite/jni/TableColumnMetadata.java 54511b4297fa28dcb3f49b24035e34ced10e3fd44fd0e458e784f4d6b0096dab
 F ext/jni/src/org/sqlite/jni/Tester1.java 96fefa219302e3e82f720baf082533fed98e6d31fe8887db5e14c150f1d2b3c1
@@ -2116,8 +2116,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 7c86aa3400ed591d38c1828f366f4b5de97954c2b301919d3f06d9c2d3d7d1f2
-R b592252ce8c67a9da162168a99edb15f
+P faf4e6d398f444d970be8b1364c984c67ccbc5f8a27f3aa93f05b8a8de7bec9b
+R 67c1ebfb718bb21974f4c19c81901b59
 U stephan
-Z b8513dbd5fd3543a1785ad43823c91b6
+Z 4fedefd0e23421552f6c24692e21e3ca
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9126a286a0..d71724e89d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-faf4e6d398f444d970be8b1364c984c67ccbc5f8a27f3aa93f05b8a8de7bec9b
\ No newline at end of file
+2e2bb841ef8b53266ec48d8c3408d6396f29f17922e858eac1b4f12f4adeb05e
\ No newline at end of file