From: stephan <stephan@noemail.net>
Date: Sat, 15 Nov 2025 16:06:03 +0000 (+0000)
Subject: Remove an unused struct.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e2ecc390bc5b631d84b89404e4146d6a97dbd07;p=thirdparty%2Fsqlite.git

Remove an unused struct.

FossilOrigin-Name: 93dd0e62b74a0d99803f680f23953e9fa2429074505ba402ca5ed4610ddef8fb
---

diff --git a/ext/jni/src/c/sqlite3-jni.c b/ext/jni/src/c/sqlite3-jni.c
index d463f53256..8cdba9bcfd 100644
--- a/ext/jni/src/c/sqlite3-jni.c
+++ b/ext/jni/src/c/sqlite3-jni.c
@@ -1955,15 +1955,6 @@ static void S3JniUdf_finalizer(void * s){
   S3JniUdf_free(s3jni_env(), (S3JniUdf*)s, 1);
 }
 
-/*
-** Helper for processing args to UDF handlers with signature
-** (sqlite3_context*,int,sqlite3_value**).
-*/
-typedef struct {
-  jobject jcx         /* sqlite3_context */;
-  jobjectArray jargv  /* sqlite3_value[] */;
-} udf_jargs;
-
 /*
 ** Converts the given (cx, argc, argv) into arguments for the given
 ** UDF, writing the result (Java wrappers for cx and argv) in the
@@ -2005,7 +1996,7 @@ error_oom:
 /*
 ** Requires that jCx and jArgv are sqlite3_context
 ** resp. array-of-sqlite3_value values initialized by udf_args(). The
-** latter will be 0-and-NULL for UDF types with no arguments. This
+** (argc,argv) are (0,NULL) for UDF types with no arguments. This
 ** function zeroes out the nativePointer member of jCx and each entry
 ** in jArgv. This is a safety-net precaution to avoid undefined
 ** behavior if a Java-side UDF holds a reference to its context or one
@@ -2098,19 +2089,19 @@ static int udf_xFSI(sqlite3_context* const pCx, int argc,
                     sqlite3_value** const argv, S3JniUdf * const s,
                     jmethodID xMethodID, const char * const zFuncType){
   S3JniDeclLocal_env;
-  udf_jargs args = {0,0};
-  int rc = udf_args(env, pCx, argc, argv, &args.jcx, &args.jargv);
-
+  jobject jcx        = 0 /* sqlite3_context */;
+  jobjectArray jargv = 0 /* sqlite3_value[] */;
+  int rc = udf_args(env, pCx, argc, argv, &jcx, &jargv);
   if( 0 == rc ){
-    (*env)->CallVoidMethod(env, s->jObj, xMethodID, args.jcx, args.jargv);
+    (*env)->CallVoidMethod(env, s->jObj, xMethodID, jcx, jargv);
     S3JniIfThrew{
       rc = udf_report_exception(env, 'F'==zFuncType[1]/*xFunc*/, pCx,
                                 s->zFuncName, zFuncType);
     }
-    udf_unargs(env, args.jcx, argc, args.jargv);
+    udf_unargs(env, jcx, argc, jargv);
   }
-  S3JniUnrefLocal(args.jcx);
-  S3JniUnrefLocal(args.jargv);
+  S3JniUnrefLocal(jcx);
+  S3JniUnrefLocal(jargv);
   return rc;
 }
 
diff --git a/manifest b/manifest
index c3c93ac4de..b5195025b2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C JNI:\swhen\svaliding\sthe\seTextRep\sargument\sin\ssqlite3_create_function(),\sonly\svalidate\sthe\slower\sfour\sbits\s(the\shigh\sbits\sare\sfor\sother\sflags).\sAdd\sflags\sto\stest\sfunctions\sto\sensure\sthis\scase\sis\striggered.
-D 2025-11-15T15:30:45.907
+C Remove\san\sunused\sstruct.
+D 2025-11-15T16:06:03.503
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -290,7 +290,7 @@ F ext/intck/test_intck.c 4f9eaadaedccb9df1d26ba41116a0a8e5b0c5556dc3098c8ff68633
 F ext/jni/GNUmakefile 8a94e3a1953b88cf117fb2a5380480feada8b4f5316f02572cab425030a720b4
 F ext/jni/README.md 1479c83dbe26125264a060ee6873531795a7082dbc0d43c4067683371331559f
 F ext/jni/jar-dist.make 030aaa4ae71dd86e4ec5e7c1e6cd86f9dfa47c4592c070d2e35157e42498e1fa
-F ext/jni/src/c/sqlite3-jni.c 7bfdc6bcf8318ec1b2b83f4ec50bb664192e96fe752bfaa410d2c682230c10a9
+F ext/jni/src/c/sqlite3-jni.c 6ccc50b0e98b8ef8fd6a8b837223e1c8ebb92bfe6b976128cc757c26257d994a
 F ext/jni/src/c/sqlite3-jni.h df43024cced914c49485633d0f90168689e70577b3b17b0ecbdaf16e4a417bff
 F ext/jni/src/org/sqlite/jni/annotation/Experimental.java 8603498634e41d0f7c70f661f64e05df64376562ea8f126829fd1e0cdd47e82b
 F ext/jni/src/org/sqlite/jni/annotation/NotNull.java be6cc3e8e114485822331630097cc0f816377e8503af2fc02f9305ff2b353917
@@ -2166,8 +2166,8 @@ F tool/version-info.c 33d0390ef484b3b1cb685d59362be891ea162123cea181cb8e6d2cf6dd
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 0899a9eb3af727f310372f3441573ab506ffec31dca4774e850b2b59a4001ee0
-R 601ead01f2a6a28658655ab790f5c9f1
+P aab640be7bc5829fe16d2582b13f942b7debb271c150ca2471561de6b2d70dc7
+R 012476731c5db75eaace4f90d638ad84
 U stephan
-Z 23594003e167060d2f5f12fe9a21d14d
+Z 7745ec9fad92783170dee3b89dca825b
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 415e5e5fdb..c7fce78867 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-aab640be7bc5829fe16d2582b13f942b7debb271c150ca2471561de6b2d70dc7
+93dd0e62b74a0d99803f680f23953e9fa2429074505ba402ca5ed4610ddef8fb