From: stephan <stephan@noemail.net>
Date: Sat, 30 Sep 2023 10:37:36 +0000 (+0000)
Subject: Merge in and close jni-ptr-passing branch. The remaining pointer-passing adaptation... 
X-Git-Tag: version-3.44.0~171
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=008b62f1ae972d74e7940c33ad1dae1ed1043978;p=thirdparty%2Fsqlite.git

Merge in and close jni-ptr-passing branch. The remaining pointer-passing adaptation can be done incrementally without affecting the interface.

FossilOrigin-Name: 7927c42410ba0d5fc8e6e08caaa5cbaaeb359869f17d1afaa082f1aa47fdb2fc
---

008b62f1ae972d74e7940c33ad1dae1ed1043978
diff --cc ext/jni/GNUmakefile
index ddf97dd8ac,e1aa06091f..942a4a96de
--- a/ext/jni/GNUmakefile
+++ b/ext/jni/GNUmakefile
@@@ -233,6 -239,7 +239,7 @@@ ende
  # Invoke ADD_JNI_H once for each Java file which includes JNI
  # declarations:
  $(eval $(call ADD_JNI_H,$(dir.src.jni),SQLite3Jni,))
 -$(eval $(call ADD_JNI_H,$(dir.src.jni),SQLTester,_tester))
++$(eval $(call ADD_JNI_H,$(dir.src.jni),SQLTester,))
  ifeq (1,$(enable.fts5))
   $(eval $(call ADD_JNI_H,$(dir.src.fts5),Fts5ExtensionApi,_fts5))
   $(eval $(call ADD_JNI_H,$(dir.src.fts5),fts5_api,_fts5))
diff --cc ext/jni/src/c/sqlite3-jni.h
index 717a932676,c411541134..99903d3027
--- a/ext/jni/src/c/sqlite3-jni.h
+++ b/ext/jni/src/c/sqlite3-jni.h
@@@ -2077,18 -2093,39 +2093,39 @@@ JNIEXPORT jint JNICALL Java_org_sqlite_
  
  /*
   * Class:     org_sqlite_jni_SQLite3Jni
-  * Method:    sqlite3_value_subtype
-  * Signature: (Lorg/sqlite/jni/sqlite3_value;)I
+  * Method:    sqlite3_jni_internal_details
+  * Signature: ()V
   */
- JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1value_1subtype
-   (JNIEnv *, jclass, jobject);
+ JNIEXPORT void JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1jni_1internal_1details
+   (JNIEnv *, jclass);
+ 
+ #ifdef __cplusplus
+ }
+ #endif
+ #endif
+ /* DO NOT EDIT THIS FILE - it is machine generated */
+ #include <jni.h>
 -/* Header for class org_sqlite_jni_tester_SQLTester */
++/* Header for class org_sqlite_jni_SQLTester */
  
 -#ifndef _Included_org_sqlite_jni_tester_SQLTester
 -#define _Included_org_sqlite_jni_tester_SQLTester
++#ifndef _Included_org_sqlite_jni_SQLTester
++#define _Included_org_sqlite_jni_SQLTester
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
  /*
-  * Class:     org_sqlite_jni_SQLite3Jni
-  * Method:    sqlite3_jni_internal_details
 - * Class:     org_sqlite_jni_tester_SQLTester
++ * Class:     org_sqlite_jni_SQLTester
+  * Method:    strglob
+  * Signature: ([B[B)I
+  */
 -JNIEXPORT jint JNICALL Java_org_sqlite_jni_tester_SQLTester_strglob
++JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLTester_strglob
+   (JNIEnv *, jclass, jbyteArray, jbyteArray);
+ 
+ /*
 - * Class:     org_sqlite_jni_tester_SQLTester
++ * Class:     org_sqlite_jni_SQLTester
+  * Method:    installCustomExtensions
   * Signature: ()V
   */
- JNIEXPORT void JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1jni_1internal_1details
 -JNIEXPORT void JNICALL Java_org_sqlite_jni_tester_SQLTester_installCustomExtensions
++JNIEXPORT void JNICALL Java_org_sqlite_jni_SQLTester_installCustomExtensions
    (JNIEnv *, jclass);
  
  #ifdef __cplusplus
diff --cc manifest
index a4de81334c,42d18e5b1e..bb25c13460
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\stest\scase\sto\sensure\sthe\sassert()\sremoved\sby\s[f090af77]\sno\slonger\sfails.
- D 2023-09-29T15:56:40.552
 -C Make\sall\snative\sJNI\ssqlite3_...()\sbindings\spackage-private\sas\sa\sfoot-shooting\sprotective\smeasure\s(higher-level\spre-native-call\sargument\svalidation\sis\slargely\spending).\sMove\sSQLTester.java\sand\sTesterFts5.java\sinto\sthe\sorg.sqlite.jni\spackage\sso\sthat\sthey\scan\saccess\sthe\sbeing-tested\smethods.
 -D 2023-09-30T10:31:56.592
++C Merge\sin\sand\sclose\sjni-ptr-passing\sbranch.\sThe\sremaining\spointer-passing\sadaptation\scan\sbe\sdone\sincrementally\swithout\saffecting\sthe\sinterface.
++D 2023-09-30T10:37:36.161
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -235,11 -235,11 +235,11 @@@ F ext/fts5/tool/showfts5.tcl d54da0e067
  F ext/icu/README.txt 7ab7ced8ae78e3a645b57e78570ff589d4c672b71370f5aa9e1cd7024f400fc9
  F ext/icu/icu.c c074519b46baa484bb5396c7e01e051034da8884bad1a1cb7f09bbe6be3f0282
  F ext/icu/sqliteicu.h fa373836ed5a1ee7478bdf8a1650689294e41d0c89c1daab26e9ae78a32075a8
- F ext/jni/GNUmakefile 42e00052401b6dd41c0cdd53b31450606ea37486283abdb038dff9be74bff71e
 -F ext/jni/GNUmakefile 029d131ba19c74aec87cab49d36162fc2102e7e3fd58f9b8d2555c92a4752c95
++F ext/jni/GNUmakefile af9aec8c540167ba8f9da23f86f74df0ad96e72431fd216b24e722b465e86c12
  F ext/jni/README.md 9fceaeb17cecdc5d699dfc83c0cbc3a03fdb3b86bf676381894166c73375ee75
  F ext/jni/jar-dist.make 030aaa4ae71dd86e4ec5e7c1e6cd86f9dfa47c4592c070d2e35157e42498e1fa
- F ext/jni/src/c/sqlite3-jni.c 2932d4cae2b70a469a73f4a2cefa2701291e420155044d2c9e79137b65e237a1
- F ext/jni/src/c/sqlite3-jni.h 5e093f65c01050e6fe0988f559145f3b61a15c734aa3100a2b98d2a4b9d4c57a
+ F ext/jni/src/c/sqlite3-jni.c d1fa417c9ee7db061f86e928834e1086172ef7199d2324b823136879b4c1a187
 -F ext/jni/src/c/sqlite3-jni.h 9d6564f044664a82a3c2c8ab8d7f32b38082dc2a80bdb3370f21bb8d0ec901b9
++F ext/jni/src/c/sqlite3-jni.h f5bdb7bb7799b89277ac84d4b6e37719398a9b9c6b3ab62cc0583699625e71ea
  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
@@@ -2122,8 -2122,8 +2122,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P f090af775f6d2ce8b50850f5c9e33546bcb9cff5467d99ca210530cb7ca83d5b
- R f51ac3149d0d82cdeb16ecb943c18226
- U dan
- Z 47eb0b07d7471e6df082d31971a82a19
 -P 6c63987e893357dc8b10decaa96c30fb37b75481640a303e77a0d8224354491e
 -R 14bbbf737f96564a41d23e210ece88e9
++P 615ab71761754b072439f92e73fdb98c916b820937bcca8904f4be34936d5f9c ec82f7251acab7df40755ef5f456f36fe49b59e63a20be59bd610fc4280ba8cd
++R 847945c3f257f5fdca3b6859cd8a460f
+ U stephan
 -Z 2d0b47023fa8f7cf28e0da2e32c6e917
++Z f5f86ba28a644ae448899dff21eb5c68
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index abd5292e26,e344029e30..a71acc91fd
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 615ab71761754b072439f92e73fdb98c916b820937bcca8904f4be34936d5f9c
 -ec82f7251acab7df40755ef5f456f36fe49b59e63a20be59bd610fc4280ba8cd
++7927c42410ba0d5fc8e6e08caaa5cbaaeb359869f17d1afaa082f1aa47fdb2fc