database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-29 08:01:23 +03:00
Code Activity

Remove several unnececessary functions.

Browse Source 
FossilOrigin-Name: 84433c72b0b08e7906ef87758caffe98f95df812945a7aea675bbc20791e33c0
This commit is contained in:
stephan
2023-09-04 05:58:13 +00:00
parent 4eaf5883b3
commit 3aeb58c90c
5 changed files with 27 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
ext/jni/src/c/sqlite3-jni.c
View File

@ -1592,44 +1592,6 @@ static void OutputPointer_set_obj(JNIEnv * const env,
S3JniExceptionIsFatal("Cannot set OutputPointer.T.value");
}
/*
** Sets the value property of the OutputPointer.sqlite3 jOut object to
** v.
*/
static void OutputPointer_set_sqlite3(JNIEnv * const env, jobject const jOut,
jobject v){
OutputPointer_set_obj(env, S3JniNph(OutputPointer_sqlite3), jOut, v);
}
/*
** Sets the value property of the OutputPointer.sqlite3_blob jOut object to
** v.
*/
static void OutputPointer_set_sqlite3_blob(JNIEnv * const env, jobject const jOut,
jobject v){
OutputPointer_set_obj(env, S3JniNph(OutputPointer_sqlite3_blob), jOut, v);
}
/*
** Sets the value property of the OutputPointer.sqlite3_stmt jOut object to
** v.
*/
static void OutputPointer_set_sqlite3_stmt(JNIEnv * const env, jobject const jOut,
jobject v){
OutputPointer_set_obj(env, S3JniNph(OutputPointer_sqlite3_stmt), jOut, v);
}
#ifdef SQLITE_ENABLE_PREUPDATE_HOOK
/*
** Sets the value property of the OutputPointer.sqlite3_value jOut object to
** v.
*/
static void OutputPointer_set_sqlite3_value(JNIEnv * const env, jobject const jOut,
jobject v){
OutputPointer_set_obj(env, S3JniNph(OutputPointer_sqlite3_value), jOut, v);
}
#endif /* SQLITE_ENABLE_PREUPDATE_HOOK */
#ifdef SQLITE_ENABLE_FTS5
#if 0
/*
@ -1680,15 +1642,13 @@ static void S3Jni_jobject_finalizer(void *v){
}
}
/*
** Returns a new Java instance of the class referred to by pRef, which
** MUST be interface-compatible with NativePointerHolder and MUST have
** a no-arg constructor. The NativePointerHolder_set() method is
** passed the new Java object and pNative. Hypothetically returns NULL
** if Java fails to allocate, but the JNI docs are not entirely clear
** on that detail.
** passed the new Java object (which must not be NULL) and pNative
** (which may be NULL). Hypothetically returns NULL if Java fails to
** allocate, but the JNI docs are not entirely clear on that detail.
**
** Always use a static pointer from the S3JniNphOps struct for the
** 2nd argument.
@ -2484,7 +2444,7 @@ S3JniApi(sqlite3_blob_open(),jint,1blob_1open)(
if( 0==rc ){
jobject rv = new_java_sqlite3_blob(env, pBlob);
if( rv ){
OutputPointer_set_sqlite3_blob(env, jOut, rv);
OutputPointer_set_obj(env, S3JniNph(OutputPointer_sqlite3_blob), jOut, rv);
}else{
sqlite3_blob_close(pBlob);
rc = SQLITE_NOMEM;
@ -2529,7 +2489,7 @@ S3JniApi(sqlite3_blob_write(),jint,1blob_1write)(
const jsize nBa = pBuf ? (*env)->GetArrayLength(env, jBa) : 0;
int rc = SQLITE_MISUSE;
if(b && pBuf){
rc = sqlite3_blob_write( b, pBuf, nBa, (int)iOffset );
rc = sqlite3_blob_write( b, pBuf, (int)nBa, (int)iOffset );
}
s3jni_jbyteArray_release(jBa, pBuf);
return (jint)rc;
@ -3620,7 +3580,8 @@ static int s3jni_open_post(JNIEnv * const env, S3JniEnv * const jc,
S3JniDb_set_aside(ps);
ps = 0;
}
OutputPointer_set_sqlite3(env, jOut, ps ? ps->jDb : 0);
OutputPointer_set_obj(env, S3JniNph(OutputPointer_sqlite3),
jOut, ps ? ps->jDb : 0);
return theRc ? theRc : rc;
}
@ -3712,7 +3673,9 @@ end:
** what follows... */
assert(zTail ? ((void*)zTail>=(void*)pBuf) : 1);
assert(zTail ? (((int)((void*)zTail - (void*)pBuf)) >= 0) : 1);
OutputPointer_set_Int32(env, outTail, (int)(zTail ? (zTail - (const char *)pBuf) : 0));
OutputPointer_set_Int32(
env, outTail, (int)(zTail ? (zTail - (const char *)pBuf) : 0)
);
}
if( pStmt ){
NativePointerHolder_set(S3JniNph(sqlite3_stmt), jStmt, pStmt);
@ -3725,7 +3688,8 @@ end:
S3JniUnrefLocal(jStmt);
jStmt = 0;
}
OutputPointer_set_sqlite3_stmt(env, jOutStmt, jStmt);
OutputPointer_set_obj(env, S3JniNph(OutputPointer_sqlite3_stmt),
jOutStmt, jStmt);
return (jint)rc;
}
S3JniApi(sqlite3_prepare(),jint,1prepare)(
@ -3932,7 +3896,8 @@ static int s3jni_preupdate_newold(JNIEnv * const env, int isNew, jobject jDb,
if( 0==rc ){
jobject pWrap = new_java_sqlite3_value(env, pOut);
if( pWrap ){
OutputPointer_set_sqlite3_value(env, jOut, pWrap);
OutputPointer_set_obj(env, S3JniNph(OutputPointer_sqlite3_value),
jOut, pWrap);
S3JniUnrefLocal(pWrap);
}else{
rc = SQLITE_NOMEM;

2
ext/jni/src/c/sqlite3-jni.h
View File

@ -2277,6 +2277,8 @@ JNIEXPORT jobject JNICALL Java_org_sqlite_jni_Fts5ExtensionApi_xUserData
#ifdef __cplusplus
extern "C" {
#endif
#undef org_sqlite_jni_fts5_api_iVersion
#define org_sqlite_jni_fts5_api_iVersion 2L
/*
* Class: org_sqlite_jni_fts5_api
* Method: getInstanceForDb

3
ext/jni/src/org/sqlite/jni/fts5_api.java
View File

@ -25,7 +25,8 @@ import org.sqlite.jni.annotation.*;
public final class fts5_api extends NativePointerHolder<fts5_api> {
/* Only invoked from JNI */
private fts5_api(){}
public final int iVersion = 2;
public static final int iVersion = 2;
/**
Returns the fts5_api instance associated with the given db, or