From: stephan <stephan@noemail.net>
Date: Sun, 3 Sep 2023 12:46:09 +0000 (+0000)
Subject: Expose sqlite3_system_errno() to JNI.
X-Git-Tag: version-3.44.0~216^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7dfacc9f96e388c5d88677e51e4ecc1c5e5aa66e;p=thirdparty%2Fsqlite.git

Expose sqlite3_system_errno() to JNI.

FossilOrigin-Name: bac54da29c19ef5e0a76599b5d10b377ecd7b391a651af99526529df16a83c7d
---

diff --git a/ext/jni/src/c/sqlite3-jni.c b/ext/jni/src/c/sqlite3-jni.c
index c2fe9f8b8d..8773a7ed7d 100644
--- a/ext/jni/src/c/sqlite3-jni.c
+++ b/ext/jni/src/c/sqlite3-jni.c
@@ -1426,7 +1426,7 @@ static void * NativePointerHolder__get(JNIEnv * env, jobject jNph,
 ** argument is a Java sqlite3 object, as this operation only has void
 ** pointers to work with.
 */
-#define PtrGet_T(T,OBJ) NativePointerHolder_get(OBJ, S3JniNph(T))
+#define PtrGet_T(T,OBJ) (T*)NativePointerHolder_get(OBJ, S3JniNph(T))
 #define PtrGet_sqlite3(OBJ) PtrGet_T(sqlite3, OBJ)
 #define PtrGet_sqlite3_backup(OBJ) PtrGet_T(sqlite3_backup, OBJ)
 #define PtrGet_sqlite3_context(OBJ) PtrGet_T(sqlite3_context, OBJ)
@@ -2087,6 +2087,7 @@ WRAP_MUTF8_VOID(1sourceid,             sqlite3_sourceid)
 WRAP_INT_STMT_INT(1stmt_1explain,      sqlite3_stmt_explain)
 WRAP_INT_STMT(1stmt_1isexplain,        sqlite3_stmt_isexplain)
 WRAP_BOOL_STMT(1stmt_1readonly,        sqlite3_stmt_readonly)
+WRAP_INT_DB(1system_1errno,            sqlite3_system_errno)
 WRAP_INT_VOID(1threadsafe,             sqlite3_threadsafe)
 WRAP_INT_DB(1total_1changes,           sqlite3_total_changes)
 WRAP_INT64_DB(1total_1changes64,       sqlite3_total_changes64)
diff --git a/ext/jni/src/c/sqlite3-jni.h b/ext/jni/src/c/sqlite3-jni.h
index 9b01f04702..d000b0a465 100644
--- a/ext/jni/src/c/sqlite3-jni.h
+++ b/ext/jni/src/c/sqlite3-jni.h
@@ -1827,6 +1827,14 @@ JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1strglob
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1strlike
   (JNIEnv *, jclass, jbyteArray, jbyteArray, jint);
 
+/*
+ * Class:     org_sqlite_jni_SQLite3Jni
+ * Method:    sqlite3_system_errno
+ * Signature: (Lorg/sqlite/jni/sqlite3;)I
+ */
+JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1system_1errno
+  (JNIEnv *, jclass, jobject);
+
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_table_column_metadata
diff --git a/ext/jni/src/org/sqlite/jni/SQLite3Jni.java b/ext/jni/src/org/sqlite/jni/SQLite3Jni.java
index 41cf4988e1..9222c2ad72 100644
--- a/ext/jni/src/org/sqlite/jni/SQLite3Jni.java
+++ b/ext/jni/src/org/sqlite/jni/SQLite3Jni.java
@@ -1482,6 +1482,9 @@ public final class SQLite3Jni {
     );
   }
 
+  @Canonical
+  public static native int sqlite3_system_errno(@NotNull sqlite3 db);
+
   @Canonical
   public static native int sqlite3_table_column_metadata(
     @NotNull sqlite3 db, @NotNull String zDbName,
diff --git a/manifest b/manifest
index 3877b0be95..294ff683d3 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Expose\ssqlite3_stmt_status()\sto\sJNI.
-D 2023-09-03T12:32:09.643
+C Expose\ssqlite3_system_errno()\sto\sJNI.
+D 2023-09-03T12:46:09.429
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -237,8 +237,8 @@ F ext/icu/sqliteicu.h fa373836ed5a1ee7478bdf8a1650689294e41d0c89c1daab26e9ae78a3
 F ext/jni/GNUmakefile 7bd7f0c28d664b71b08f9d8ff507eb8329f1f3e7b5d88f774f90a1a5259a3fe8
 F ext/jni/README.md 1332b1fa27918bd5d9ca2d0d4f3ac3a6ab86b9e3699dc5bfe32904a027f3d2a9
 F ext/jni/jar-dist.make 030aaa4ae71dd86e4ec5e7c1e6cd86f9dfa47c4592c070d2e35157e42498e1fa
-F ext/jni/src/c/sqlite3-jni.c a9ad3d9d960724eeeb7e93bcef7aa12289e68296f30dd2d77d02f299cac99721
-F ext/jni/src/c/sqlite3-jni.h 473c4b35d9f5ea9d79ac1b3b0ea00cc78e8e0385d87a4cb6d8ae8f0bcde2351c
+F ext/jni/src/c/sqlite3-jni.c 0ae08bc58a1304eaceb3d16bf3c799b717662ab59e66b8ca218a2041f4fc42f4
+F ext/jni/src/c/sqlite3-jni.h 2db486abbdd424a0197797908ea46e455b37876c41266a9630885e1469a897e8
 F ext/jni/src/org/sqlite/jni/AbstractCollationCallback.java 95e88ba04f4aac51ffec65693e878e234088b2f21b387f4e4285c8b72b33e436
 F ext/jni/src/org/sqlite/jni/AggregateFunction.java 7312486bc65fecdb91753c0a4515799194e031f45edbe16a6373cea18f404dc4
 F ext/jni/src/org/sqlite/jni/AuthorizerCallback.java e6135be32f12bf140bffa39be7fd1a45ad83b2661ed49c08dbde04c8485feb38
@@ -262,7 +262,7 @@ F ext/jni/src/org/sqlite/jni/ProgressHandlerCallback.java 7b9ff2218129ece98ba60c
 F ext/jni/src/org/sqlite/jni/ResultCode.java ba701f20213a5f259e94cfbfdd36eb7ac7ce7797f2c6c7fca2004ff12ce20f86
 F ext/jni/src/org/sqlite/jni/RollbackHookCallback.java d12352c0e22840de484ffa9b11ed5058bb0daca2e9f218055d3c54c947a273c4
 F ext/jni/src/org/sqlite/jni/SQLFunction.java 544a875d33fd160467d82e2397ac33157b29971d715a821a4fad3c899113ee8c
-F ext/jni/src/org/sqlite/jni/SQLite3Jni.java 85e48806781b6c0ebb7f262444b00df2933d6e197181623c7a930c0efb0e1a8b
+F ext/jni/src/org/sqlite/jni/SQLite3Jni.java bc5f5c2affa2126379696fc5e367b0fa02436166c8bd9f966a99559733acf1a9
 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 14b3a129755a1a19271bdab9de6f4c58898aa28dfe3c03e7f0d23728254dc0d3
@@ -2117,8 +2117,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 de9692242132b8f2c92ef4acb08dd3063327b18666cbb17c4f1153dee9146eaf
-R ebcdf0ddc07ec0bc930ef3346f428207
+P d266acc23ecb7e76c8c68c6e89a76e6f3054f33f0262e60e06b258db5a5e2ccd
+R 0f337c85b77ffdd11d583dfb2c7a7040
 U stephan
-Z 84012132b5e2bcd623d210f7c0541b51
+Z 2f1ca87d5a540c0a7a17c3d282e87afc
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 6d6fa4a985..d19f34cf7c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d266acc23ecb7e76c8c68c6e89a76e6f3054f33f0262e60e06b258db5a5e2ccd
\ No newline at end of file
+bac54da29c19ef5e0a76599b5d10b377ecd7b391a651af99526529df16a83c7d
\ No newline at end of file