Convert the remaining macro-generated JNI bindings to the new pointer-passing mechanism.

FossilOrigin-Name: 250fd6ae806cf705c0f29ad30ad8fb885b12590848e7adae63bc21d874c6d3bd

diff --git a/ext/jni/src/c/sqlite3-jni.c b/ext/jni/src/c/sqlite3-jni.c
index b631baa182fafb71380d4c8b559e19224ba52bd2..248c12abbd8e6b47860b74301edf3b7cbfaf0abf 100644 (file)
--- a/ext/jni/src/c/sqlite3-jni.c
+++ b/ext/jni/src/c/sqlite3-jni.c
@@ -1456,6 +1456,7 @@ static void * NativePointerHolder__get(JNIEnv * env, jobject jNph,
 #define S3JniLongPtr_sqlite3_backup(JLongPtr) S3JniLongPtr_T(sqlite3_backup,JLongPtr)
 #define S3JniLongPtr_sqlite3_blob(JLongPtr) S3JniLongPtr_T(sqlite3_blob,JLongPtr)
 #define S3JniLongPtr_sqlite3_stmt(JLongPtr) S3JniLongPtr_T(sqlite3_stmt,JLongPtr)
+#define S3JniLongPtr_sqlite3_value(JLongPtr) S3JniLongPtr_T(sqlite3_value,JLongPtr)
 
 /*
 ** Extracts the new S3JniDb instance from the free-list, or allocates
@@ -1992,27 +1993,25 @@ static void udf_xInverse(sqlite3_context* cx, int argc,
     return rv;                                                 \
   }
 /** Create a trivial JNI wrapper for (int CName(sqlite3_stmt*)). */
-#define WRAP_INT_STMT(JniNameSuffix,CName)                      \
-  JniDecl(jint,JniNameSuffix)(JniArgsEnvClass, jobject jpStmt){ \
-    jint const rc = (jint)CName(PtrGet_sqlite3_stmt(jpStmt));   \
-    S3JniExceptionIgnore /* squelch -Xcheck:jni */;             \
-    return rc; \
+#define WRAP_INT_STMT(JniNameSuffix,CName)                    \
+  JniDecl(jint,JniNameSuffix)(JniArgsEnvClass, jlong jpStmt){ \
+    return (jint)CName(S3JniLongPtr_sqlite3_stmt(jpStmt));    \
   }
 /** Create a trivial JNI wrapper for (int CName(sqlite3_stmt*,int)). */
 #define WRAP_INT_STMT_INT(JniNameSuffix,CName)                         \
-  JniDecl(jint,JniNameSuffix)(JniArgsEnvClass, jobject pStmt, jint n){ \
-    return (jint)CName(PtrGet_sqlite3_stmt(pStmt), (int)n);            \
+  JniDecl(jint,JniNameSuffix)(JniArgsEnvClass, jlong jpStmt, jint n){ \
+    return (jint)CName(S3JniLongPtr_sqlite3_stmt(jpStmt), (int)n);            \
   }
 /** Create a trivial JNI wrapper for (boolish-int CName(sqlite3_stmt*)). */
 #define WRAP_BOOL_STMT(JniNameSuffix,CName)                         \
-  JniDecl(jboolean,JniNameSuffix)(JniArgsEnvClass, jobject pStmt){ \
-    return CName(PtrGet_sqlite3_stmt(pStmt)) ? JNI_TRUE : JNI_FALSE; \
+  JniDecl(jboolean,JniNameSuffix)(JniArgsEnvClass, jlong jpStmt){ \
+    return CName(S3JniLongPtr_sqlite3_stmt(jpStmt)) ? JNI_TRUE : JNI_FALSE; \
   }
 /** Create a trivial JNI wrapper for (jstring CName(sqlite3_stmt*,int)). */
-#define WRAP_STR_STMT_INT(JniNameSuffix,CName)                              \
-  JniDecl(jstring,JniNameSuffix)(JniArgsEnvClass, jobject pStmt, jint ndx){ \
+#define WRAP_STR_STMT_INT(JniNameSuffix,CName)                             \
+  JniDecl(jstring,JniNameSuffix)(JniArgsEnvClass, jlong jpStmt, jint ndx){ \
     return s3jni_utf8_to_jstring(                                       \
-      CName(PtrGet_sqlite3_stmt(pStmt), (int)ndx),                      \
+      CName(S3JniLongPtr_sqlite3_stmt(jpStmt), (int)ndx),               \
       -1);                                                              \
   }
 /** Create a trivial JNI wrapper for (boolean CName(sqlite3*)). */
@@ -2032,8 +2031,8 @@ static void udf_xInverse(sqlite3_context* cx, int argc,
   }
 /** Create a trivial JNI wrapper for (int CName(sqlite3_value*)). */
 #define WRAP_INT_SVALUE(JniNameSuffix,CName)                      \
-  JniDecl(jint,JniNameSuffix)(JniArgsEnvClass, jobject jpSValue){ \
-    return (jint)CName(PtrGet_sqlite3_value(jpSValue));           \
+  JniDecl(jint,JniNameSuffix)(JniArgsEnvClass, jlong jpSValue){ \
+    return (jint)CName(S3JniLongPtr_sqlite3_value(jpSValue));   \
   }
 
 WRAP_INT_DB(1changes,                  sqlite3_changes)

diff --git a/ext/jni/src/c/sqlite3-jni.h b/ext/jni/src/c/sqlite3-jni.h
index 6ead741d463cf5adeaed8f949de80acd805c493d..a2e9644c8bebd5164d0914f619e8b4d6d046b8e2 100644 (file)
--- a/ext/jni/src/c/sqlite3-jni.h
+++ b/ext/jni/src/c/sqlite3-jni.h
@@ -1046,10 +1046,10 @@ JNIEXPORT jlong JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1changes64
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_clear_bindings
- * Signature: (Lorg/sqlite/jni/sqlite3_stmt;)I
+ * Signature: (J)I
  */
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1clear_1bindings
-  (JNIEnv *, jclass, jobject);
+  (JNIEnv *, jclass, jlong);
 
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
@@ -1078,26 +1078,34 @@ JNIEXPORT jbyteArray JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1column_1blo
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_column_bytes
- * Signature: (Lorg/sqlite/jni/sqlite3_stmt;I)I
+ * Signature: (JI)I
  */
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1column_1bytes
-  (JNIEnv *, jclass, jobject, jint);
+  (JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_column_bytes16
- * Signature: (Lorg/sqlite/jni/sqlite3_stmt;I)I
+ * Signature: (JI)I
  */
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1column_1bytes16
-  (JNIEnv *, jclass, jobject, jint);
+  (JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_column_count
- * Signature: (Lorg/sqlite/jni/sqlite3_stmt;)I
+ * Signature: (J)I
  */
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1column_1count
-  (JNIEnv *, jclass, jobject);
+  (JNIEnv *, jclass, jlong);
+
+/*
+ * Class:     org_sqlite_jni_SQLite3Jni
+ * Method:    sqlite3_column_decltype
+ * Signature: (JI)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1column_1decltype
+  (JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
@@ -1126,34 +1134,34 @@ JNIEXPORT jlong JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1column_1int64
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_column_name
- * Signature: (Lorg/sqlite/jni/sqlite3_stmt;I)Ljava/lang/String;
+ * Signature: (JI)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1column_1name
-  (JNIEnv *, jclass, jobject, jint);
+  (JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_column_database_name
- * Signature: (Lorg/sqlite/jni/sqlite3_stmt;I)Ljava/lang/String;
+ * Signature: (JI)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1column_1database_1name
-  (JNIEnv *, jclass, jobject, jint);
+  (JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_column_origin_name
- * Signature: (Lorg/sqlite/jni/sqlite3_stmt;I)Ljava/lang/String;
+ * Signature: (JI)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1column_1origin_1name
-  (JNIEnv *, jclass, jobject, jint);
+  (JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_column_table_name
- * Signature: (Lorg/sqlite/jni/sqlite3_stmt;I)Ljava/lang/String;
+ * Signature: (JI)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1column_1table_1name
-  (JNIEnv *, jclass, jobject, jint);
+  (JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
@@ -1174,10 +1182,10 @@ JNIEXPORT jstring JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1column_1text16
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_column_type
- * Signature: (Lorg/sqlite/jni/sqlite3_stmt;I)I
+ * Signature: (JI)I
  */
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1column_1type
-  (JNIEnv *, jclass, jobject, jint);
+  (JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
@@ -1278,10 +1286,10 @@ JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1create_1function
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_data_count
- * Signature: (Lorg/sqlite/jni/sqlite3_stmt;)I
+ * Signature: (J)I
  */
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1data_1count
-  (JNIEnv *, jclass, jobject);
+  (JNIEnv *, jclass, jlong);
 
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
@@ -1838,26 +1846,26 @@ JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1step
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_stmt_explain
- * Signature: (Lorg/sqlite/jni/sqlite3_stmt;I)I
+ * Signature: (JI)I
  */
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1stmt_1explain
-  (JNIEnv *, jclass, jobject, jint);
+  (JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_stmt_isexplain
- * Signature: (Lorg/sqlite/jni/sqlite3_stmt;)I
+ * Signature: (J)I
  */
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1stmt_1isexplain
-  (JNIEnv *, jclass, jobject);
+  (JNIEnv *, jclass, jlong);
 
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_stmt_readonly
- * Signature: (Lorg/sqlite/jni/sqlite3_stmt;)Z
+ * Signature: (J)Z
  */
 JNIEXPORT jboolean JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1stmt_1readonly
-  (JNIEnv *, jclass, jobject);
+  (JNIEnv *, jclass, jlong);
 
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
@@ -1958,18 +1966,18 @@ JNIEXPORT jbyteArray JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1value_1blob
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_value_bytes
- * Signature: (Lorg/sqlite/jni/sqlite3_value;)I
+ * Signature: (J)I
  */
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1value_1bytes
-  (JNIEnv *, jclass, jobject);
+  (JNIEnv *, jclass, jlong);
 
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_value_bytes16
- * Signature: (Lorg/sqlite/jni/sqlite3_value;)I
+ * Signature: (J)I
  */
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1value_1bytes16
-  (JNIEnv *, jclass, jobject);
+  (JNIEnv *, jclass, jlong);
 
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
@@ -1990,10 +1998,10 @@ JNIEXPORT jobject JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1value_1dup
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_value_encoding
- * Signature: (Lorg/sqlite/jni/sqlite3_value;)I
+ * Signature: (J)I
  */
 JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1value_1encoding
-  (JNIEnv *, jclass, jobject);
+  (JNIEnv *, jclass, jlong);
 
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
@@ -2003,6 +2011,14 @@ JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1value_1encoding
 JNIEXPORT void JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1value_1free
   (JNIEnv *, jclass, jobject);
 
+/*
+ * Class:     org_sqlite_jni_SQLite3Jni
+ * Method:    sqlite3_value_frombind
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1value_1frombind
+  (JNIEnv *, jclass, jlong);
+
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
  * Method:    sqlite3_value_int
@@ -2029,59 +2045,51 @@ JNIEXPORT jobject JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1value_1java_1o
 
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
- * Method:    sqlite3_value_text
- * Signature: (Lorg/sqlite/jni/sqlite3_value;)[B
- */
-JNIEXPORT jbyteArray JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1value_1text
-  (JNIEnv *, jclass, jobject);
-
-/*
- * Class:     org_sqlite_jni_SQLite3Jni
- * Method:    sqlite3_value_text16
- * Signature: (Lorg/sqlite/jni/sqlite3_value;)Ljava/lang/String;
+ * Method:    sqlite3_value_nochange
+ * Signature: (J)I
  */
-JNIEXPORT jstring JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1value_1text16
-  (JNIEnv *, jclass, jobject);
+JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1value_1nochange
+  (JNIEnv *, jclass, jlong);
 
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
- * Method:    sqlite3_value_type
- * Signature: (Lorg/sqlite/jni/sqlite3_value;)I
+ * Method:    sqlite3_value_numeric_type
+ * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1value_1type
-  (JNIEnv *, jclass, jobject);
+JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1value_1numeric_1type
+  (JNIEnv *, jclass, jlong);
 
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
- * Method:    sqlite3_value_numeric_type
- * Signature: (Lorg/sqlite/jni/sqlite3_value;)I
+ * Method:    sqlite3_value_subtype
+ * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1value_1numeric_1type
-  (JNIEnv *, jclass, jobject);
+JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1value_1subtype
+  (JNIEnv *, jclass, jlong);
 
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
- * Method:    sqlite3_value_nochange
- * Signature: (Lorg/sqlite/jni/sqlite3_value;)I
+ * Method:    sqlite3_value_text
+ * Signature: (Lorg/sqlite/jni/sqlite3_value;)[B
  */
-JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1value_1nochange
+JNIEXPORT jbyteArray JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1value_1text
   (JNIEnv *, jclass, jobject);
 
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
- * Method:    sqlite3_value_frombind
- * Signature: (Lorg/sqlite/jni/sqlite3_value;)I
+ * Method:    sqlite3_value_text16
+ * Signature: (Lorg/sqlite/jni/sqlite3_value;)Ljava/lang/String;
  */
-JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1value_1frombind
+JNIEXPORT jstring JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1value_1text16
   (JNIEnv *, jclass, jobject);
 
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
- * Method:    sqlite3_value_subtype
- * Signature: (Lorg/sqlite/jni/sqlite3_value;)I
+ * Method:    sqlite3_value_type
+ * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1value_1subtype
-  (JNIEnv *, jclass, jobject);
+JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1value_1type
+  (JNIEnv *, jclass, jlong);
 
 /*
  * Class:     org_sqlite_jni_SQLite3Jni

diff --git a/ext/jni/src/org/sqlite/jni/SQLite3Jni.java b/ext/jni/src/org/sqlite/jni/SQLite3Jni.java
index 516e86f39d0e8548d16bbdbc272b31c881c4f78b..9cdae6d7b6a01f790f674b9bf6b29f5b05dba81c 100644 (file)
--- a/ext/jni/src/org/sqlite/jni/SQLite3Jni.java
+++ b/ext/jni/src/org/sqlite/jni/SQLite3Jni.java
@@ -562,9 +562,12 @@ public final class SQLite3Jni {
   }
 
   @Canonical
-  public static native int sqlite3_clear_bindings(
-    @NotNull sqlite3_stmt stmt
-  );
+  public static native int sqlite3_clear_bindings(@NotNull long ptrToStmt);
+
+  @Canonical
+  public static int sqlite3_clear_bindings(@NotNull sqlite3_stmt stmt){
+    return sqlite3_clear_bindings(stmt.getNativePointer());
+  }
 
   @Canonical
   private static native int sqlite3_close(@Nullable long ptrToDb);
@@ -590,19 +593,36 @@ public final class SQLite3Jni {
   );
 
   @Canonical
-  public static native int sqlite3_column_bytes(
-    @NotNull sqlite3_stmt stmt, int ndx
-  );
+  private static native int sqlite3_column_bytes(@NotNull long ptrToStmt, int ndx);
 
   @Canonical
-  public static native int sqlite3_column_bytes16(
-    @NotNull sqlite3_stmt stmt, int ndx
-  );
+  public static int sqlite3_column_bytes(@NotNull sqlite3_stmt stmt, int ndx){
+    return sqlite3_column_bytes(stmt.getNativePointer(), ndx);
+  }
 
   @Canonical
-  public static native int sqlite3_column_count(
-    @NotNull sqlite3_stmt stmt
-  );
+  private static native int sqlite3_column_bytes16(@NotNull long ptrToStmt, int ndx);
+
+  @Canonical
+  public static int sqlite3_column_bytes16(@NotNull sqlite3_stmt stmt, int ndx){
+    return sqlite3_column_bytes16(stmt.getNativePointer(), ndx);
+  }
+
+  @Canonical
+  private static native int sqlite3_column_count(@NotNull long ptrToStmt);
+
+  @Canonical
+  public static int sqlite3_column_count(@NotNull sqlite3_stmt stmt){
+    return sqlite3_column_count(stmt.getNativePointer());
+  }
+
+  @Canonical
+  private static native String sqlite3_column_decltype(@NotNull long ptrToStmt, int ndx);
+
+  @Canonical
+  public static String sqlite3_column_decltype(@NotNull sqlite3_stmt stmt, int ndx){
+    return sqlite3_column_decltype(stmt.getNativePointer(), ndx);
+  }
 
   @Canonical
   public static native double sqlite3_column_double(
@@ -620,24 +640,36 @@ public final class SQLite3Jni {
   );
 
   @Canonical
-  public static native String sqlite3_column_name(
-    @NotNull sqlite3_stmt stmt, int ndx
-  );
+  private static native String sqlite3_column_name(@NotNull long ptrToStmt, int ndx);
 
   @Canonical
-  public static native String sqlite3_column_database_name(
-    @NotNull sqlite3_stmt stmt, int ndx
-  );
+  public static String sqlite3_column_name(@NotNull sqlite3_stmt stmt, int ndx){
+    return sqlite3_column_name(stmt.getNativePointer(), ndx);
+  }
 
   @Canonical
-  public static native String sqlite3_column_origin_name(
-    @NotNull sqlite3_stmt stmt, int ndx
-  );
+  private static native String sqlite3_column_database_name(@NotNull long ptrToStmt, int ndx);
 
   @Canonical
-  public static native String sqlite3_column_table_name(
-    @NotNull sqlite3_stmt stmt, int ndx
-  );
+  public static String sqlite3_column_database_name(@NotNull sqlite3_stmt stmt, int ndx){
+    return sqlite3_column_database_name(stmt.getNativePointer(), ndx);
+  }
+
+  @Canonical
+  private static native String sqlite3_column_origin_name(@NotNull long ptrToStmt, int ndx);
+
+  @Canonical
+  public static String sqlite3_column_origin_name(@NotNull sqlite3_stmt stmt, int ndx){
+    return sqlite3_column_origin_name(stmt.getNativePointer(), ndx);
+  }
+
+  @Canonical
+  private static native String sqlite3_column_table_name(@NotNull long ptrToStmt, int ndx);
+
+  @Canonical
+  public static String sqlite3_column_table_name(@NotNull sqlite3_stmt stmt, int ndx){
+    return sqlite3_column_table_name(stmt.getNativePointer(), ndx);
+  }
 
   /**
      Functions identially to the C API, and this note is just to
@@ -695,9 +727,12 @@ public final class SQLite3Jni {
   // }
 
   @Canonical
-  public static native int sqlite3_column_type(
-    @NotNull sqlite3_stmt stmt, int ndx
-  );
+  private static native int sqlite3_column_type(@NotNull long ptrToStmt, int ndx);
+
+  @Canonical
+  public static int sqlite3_column_type(@NotNull sqlite3_stmt stmt, int ndx){
+    return sqlite3_column_type(stmt.getNativePointer(), ndx);
+  }
 
   @Canonical
   public static native sqlite3_value sqlite3_column_value(
@@ -816,9 +851,12 @@ public final class SQLite3Jni {
   );
 
   @Canonical
-  public static native int sqlite3_data_count(
-    @NotNull sqlite3_stmt stmt
-  );
+  private static native int sqlite3_data_count(@NotNull long ptrToStmt);
+
+  @Canonical
+  public static int sqlite3_data_count(@NotNull sqlite3_stmt stmt){
+    return sqlite3_data_count(stmt.getNativePointer());
+  }
 
   /**
      Overload for sqlite3_db_config() calls which take (int,int*)
@@ -1768,15 +1806,28 @@ public final class SQLite3Jni {
   public static native int sqlite3_step(@NotNull sqlite3_stmt stmt);
 
   @Canonical
-  public static native int sqlite3_stmt_explain(
-    @NotNull sqlite3_stmt stmt, int op
-  );
+  private static native int sqlite3_stmt_explain(@NotNull long ptrToStmt, int op);
+
+  @Canonical
+  public static int sqlite3_stmt_explain(@NotNull sqlite3_stmt stmt, int op){
+    return sqlite3_stmt_explain(stmt.getNativePointer(), op);
+  }
 
   @Canonical
-  public static native int sqlite3_stmt_isexplain(@NotNull sqlite3_stmt stmt);
+  private static native int sqlite3_stmt_isexplain(@NotNull long ptrToStmt);
 
   @Canonical
-  public static native boolean sqlite3_stmt_readonly(@NotNull sqlite3_stmt stmt);
+  public static int sqlite3_stmt_isexplain(@NotNull sqlite3_stmt stmt){
+    return sqlite3_stmt_isexplain(stmt.getNativePointer());
+  }
+
+  @Canonical
+  private static native boolean sqlite3_stmt_readonly(@NotNull long ptrToStmt);
+
+  @Canonical
+  public static boolean sqlite3_stmt_readonly(@NotNull sqlite3_stmt stmt){
+    return sqlite3_stmt_readonly(stmt.getNativePointer());
+  }
 
   @Canonical
   public static native int sqlite3_stmt_status(
@@ -1933,10 +1984,20 @@ public final class SQLite3Jni {
   public static native byte[] sqlite3_value_blob(@NotNull sqlite3_value v);
 
   @Canonical
-  public static native int sqlite3_value_bytes(@NotNull sqlite3_value v);
+  private static native int sqlite3_value_bytes(@NotNull long ptrToValue);
 
   @Canonical
-  public static native int sqlite3_value_bytes16(@NotNull sqlite3_value v);
+  public static int sqlite3_value_bytes(@NotNull sqlite3_value v){
+    return sqlite3_value_bytes(v.getNativePointer());
+  }
+
+  @Canonical
+  private static native int sqlite3_value_bytes16(@NotNull long ptrToValue);
+
+  @Canonical
+  public static int sqlite3_value_bytes16(@NotNull sqlite3_value v){
+    return sqlite3_value_bytes16(v.getNativePointer());
+  }
 
   @Canonical
   public static native double sqlite3_value_double(@NotNull sqlite3_value v);
@@ -1947,11 +2008,24 @@ public final class SQLite3Jni {
   );
 
   @Canonical
-  public static native int sqlite3_value_encoding(@NotNull sqlite3_value v);
+  private static native int sqlite3_value_encoding(@NotNull long ptrToValue);
+
+  @Canonical
+  public static int sqlite3_value_encoding(@NotNull sqlite3_value v){
+    return sqlite3_value_encoding(v.getNativePointer());
+  }
 
   @Canonical
   public static native void sqlite3_value_free(@Nullable sqlite3_value v);
 
+  @Canonical
+  private static native int sqlite3_value_frombind(@NotNull long ptrToValue);
+
+  @Canonical
+  public static int sqlite3_value_frombind(@NotNull sqlite3_value v){
+    return sqlite3_value_frombind(v.getNativePointer());
+  }
+
   @Canonical
   public static native int sqlite3_value_int(@NotNull sqlite3_value v);
 
@@ -1982,6 +2056,30 @@ public final class SQLite3Jni {
     return type.isInstance(o) ? (T)o : null;
   }
 
+  @Canonical
+  private static native int sqlite3_value_nochange(@NotNull long ptrToValue);
+
+  @Canonical
+  public static int sqlite3_value_nochange(@NotNull sqlite3_value v){
+    return sqlite3_value_nochange(v.getNativePointer());
+  }
+
+  @Canonical
+  private static native int sqlite3_value_numeric_type(@NotNull long ptrToValue);
+
+  @Canonical
+  public static int sqlite3_value_numeric_type(@NotNull sqlite3_value v){
+    return sqlite3_value_numeric_type(v.getNativePointer());
+  }
+
+  @Canonical
+  private static native int sqlite3_value_subtype(@NotNull long ptrToValue);
+
+  @Canonical
+  public static int sqlite3_value_subtype(@NotNull sqlite3_value v){
+    return sqlite3_value_subtype(v.getNativePointer());
+  }
+
   /**
      Functions identially to the C API, and this note is just to
      stress that the returned bytes are encoded as UTF-8. It returns
@@ -1995,19 +2093,12 @@ public final class SQLite3Jni {
   public static native String sqlite3_value_text16(@NotNull sqlite3_value v);
 
   @Canonical
-  public static native int sqlite3_value_type(@NotNull sqlite3_value v);
-
-  @Canonical
-  public static native int sqlite3_value_numeric_type(@NotNull sqlite3_value v);
-
-  @Canonical
-  public static native int sqlite3_value_nochange(@NotNull sqlite3_value v);
+  private static native int sqlite3_value_type(@NotNull long ptrToValue);
 
   @Canonical
-  public static native int sqlite3_value_frombind(@NotNull sqlite3_value v);
-
-  @Canonical
-  public static native int sqlite3_value_subtype(@NotNull sqlite3_value v);
+  public static int sqlite3_value_type(@NotNull sqlite3_value v){
+    return sqlite3_value_type(v.getNativePointer());
+  }
 
   /**
      This is NOT part of the public API. It exists solely as a place

diff --git a/manifest b/manifest
index 0439e98ef5623f5dacef13484fde554393c2faa8..de6d1d2b2b71f7aef774e6a56eaf30267a761864 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Convert\sthe\smacro-generated\sJNI\sbindings\swhich\stake\sa\sdb\spointer\sto\sthe\snew\spointer-passing\smechanism.
-D 2023-09-28T10:27:01.146
+C Convert\sthe\sremaining\smacro-generated\sJNI\sbindings\sto\sthe\snew\spointer-passing\smechanism.
+D 2023-09-28T10:50:26.804
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -238,8 +238,8 @@ F ext/icu/sqliteicu.h fa373836ed5a1ee7478bdf8a1650689294e41d0c89c1daab26e9ae78a3
 F ext/jni/GNUmakefile 42e00052401b6dd41c0cdd53b31450606ea37486283abdb038dff9be74bff71e
 F ext/jni/README.md 9fceaeb17cecdc5d699dfc83c0cbc3a03fdb3b86bf676381894166c73375ee75
 F ext/jni/jar-dist.make 030aaa4ae71dd86e4ec5e7c1e6cd86f9dfa47c4592c070d2e35157e42498e1fa
-F ext/jni/src/c/sqlite3-jni.c 14406b8857fb1ea3ec57bf90fdd17e1dbb68937f21868b50de6a5e64555a1053
-F ext/jni/src/c/sqlite3-jni.h d1ac1b6610437291077b263cfc2ecb2dd1ccc5154e83dd45083b86aa20b34be6
+F ext/jni/src/c/sqlite3-jni.c cb456137ac67fc9859279d7c5029bf771954df5f4922abbbf2be2a79b0909116
+F ext/jni/src/c/sqlite3-jni.h ad69a8b62390c8ad5be254fa1a065c0ba48152b271d82edb84f89edf4c83669c
 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
@@ -259,7 +259,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 7075a5c5de4d5b41b47587abd0fd0d82e325e1a4fc24d4422d029b9b7f0cac1e
+F ext/jni/src/org/sqlite/jni/SQLite3Jni.java e03e2a3e773c95401c97f334e7389dcf9ebe65d01a9c6e0ada1a1e8618958d7f
 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 720e1efddd769d5785e95100ff48aa203f2288eea865326a1a81fd5af43ec3a5
@@ -2122,8 +2122,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 0b22c8ef93e5ccd45316099fb8575e27620158b1992c0c70fe0348cfc10147f8
-R 39e7f9b7ed1c60cf4f2907887eef0ed7
+P 5f47fb77db4ee77afc541e680559ad88e66ba7fd04b830e70f8be92cf8d0a60c
+R 00596872cec8308548a723b66cba58cd
 U stephan
-Z e97bf1ee3ba4dec99a48b628a72060e8
+Z f8a1bff7f7d52efaacf825af2168fc26
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 90ab0b17f4d77b57dc933a25c4556a0dca7f8c0d..f62f58d6acec5775a94e15151694fff68f86ff87 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5f47fb77db4ee77afc541e680559ad88e66ba7fd04b830e70f8be92cf8d0a60c
\ No newline at end of file
+250fd6ae806cf705c0f29ad30ad8fb885b12590848e7adae63bc21d874c6d3bd
\ No newline at end of file