JNI: rename sqlite3_errmsg16() to sqlite3_errmsg(), as the 16 suffix is superfluous...

FossilOrigin-Name: df25b21689de84b7b8c940df39461d3d88f592f0ba2dddcfcbb0bebcea6ee7da

diff --git a/ext/jni/src/c/sqlite3-jni.c b/ext/jni/src/c/sqlite3-jni.c
index f862b3449802896922bf483074a8b2c507455751..74619145800c4a7fad9622add13fafe8f32eabf8 100644 (file)
--- a/ext/jni/src/c/sqlite3-jni.c
+++ b/ext/jni/src/c/sqlite3-jni.c
@@ -3359,7 +3359,7 @@ S3JniApi(sqlite3_errcode(),jint,1errcode)(
   return pDb ? sqlite3_errcode(pDb) : SQLITE_MISUSE;
 }
 
-S3JniApi(sqlite3_errmsg16(),jstring,1errmsg16)(
+S3JniApi(sqlite3_errmsg(),jstring,1errmsg)(
   JniArgsEnvClass, jobject jpDb
 ){
   sqlite3 * const pDb = PtrGet_sqlite3(jpDb);

diff --git a/ext/jni/src/c/sqlite3-jni.h b/ext/jni/src/c/sqlite3-jni.h
index a631245de4c25fc77ec52c106877f24ba19a1e61..b9d4a3574e4c328d6b11e5becba67fd8b051cd1f 100644 (file)
--- a/ext/jni/src/c/sqlite3-jni.h
+++ b/ext/jni/src/c/sqlite3-jni.h
@@ -1349,10 +1349,10 @@ JNIEXPORT jint JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1errcode
 
 /*
  * Class:     org_sqlite_jni_SQLite3Jni
- * Method:    sqlite3_errmsg16
+ * Method:    sqlite3_errmsg
  * Signature: (Lorg/sqlite/jni/sqlite3;)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1errmsg16
+JNIEXPORT jstring JNICALL Java_org_sqlite_jni_SQLite3Jni_sqlite3_1errmsg
   (JNIEnv *, jclass, jobject);
 
 /*

diff --git a/ext/jni/src/org/sqlite/jni/SQLTester.java b/ext/jni/src/org/sqlite/jni/SQLTester.java
index b3e184523a81f1d2ef1aa6da0404190d92dfbbc0..21722777943347262ee3fb25c803e7504f4f4007 100644 (file)
--- a/ext/jni/src/org/sqlite/jni/SQLTester.java
+++ b/ext/jni/src/org/sqlite/jni/SQLTester.java
@@ -68,7 +68,7 @@ class SQLTesterException extends RuntimeException {
 
 class DbException extends SQLTesterException {
   DbException(sqlite3 db, int rc, boolean closeDb){
-    super("DB error #"+rc+": "+sqlite3_errmsg16(db),true);
+    super("DB error #"+rc+": "+sqlite3_errmsg(db),true);
     if( closeDb ) sqlite3_close_v2(db);
   }
   DbException(sqlite3 db, int rc){
@@ -458,7 +458,7 @@ public class SQLTester {
 
   private void appendDbErr(sqlite3 db, StringBuilder sb, int rc){
     sb.append(org.sqlite.jni.ResultCode.getEntryForInt(rc)).append(' ');
-    final String msg = escapeSqlValue(sqlite3_errmsg16(db));
+    final String msg = escapeSqlValue(sqlite3_errmsg(db));
     if( '{' == msg.charAt(0) ){
       sb.append(msg);
     }else{
@@ -932,7 +932,7 @@ class RunCommand extends Command {
     final int rc = t.execSql(db, false, ResultBufferMode.NONE,
                              ResultRowMode.ONELINE, sql);
     if( 0!=rc && t.isVerbose() ){
-      String msg = sqlite3_errmsg16(db);
+      String msg = sqlite3_errmsg(db);
       ts.verbose1(argv[0]," non-fatal command error #",rc,": ",
                   msg,"\nfor SQL:\n",sql);
     }

diff --git a/ext/jni/src/org/sqlite/jni/SQLite3Jni.java b/ext/jni/src/org/sqlite/jni/SQLite3Jni.java
index 0b6c191f5f7224565c74e8f6b46f2e32f2046dcc..91f23c8a822dc952c35b11997393ed4dfa5a371f 100644 (file)
--- a/ext/jni/src/org/sqlite/jni/SQLite3Jni.java
+++ b/ext/jni/src/org/sqlite/jni/SQLite3Jni.java
@@ -940,7 +940,7 @@ final class SQLite3Jni {
   public static native int sqlite3_errcode(@NotNull sqlite3 db);
 
   @Canonical
-  public static native String sqlite3_errmsg16(@NotNull sqlite3 db);
+  public static native String sqlite3_errmsg(@NotNull sqlite3 db);
 
   @Canonical
   public static native int sqlite3_error_offset(@NotNull long ptrToDb);

diff --git a/ext/jni/src/org/sqlite/jni/Tester1.java b/ext/jni/src/org/sqlite/jni/Tester1.java
index 66027dafb3673848a8dd1b72e581a067a214a7dc..274df3c8c8eb794aab886583b7d9cf17b4638ff0 100644 (file)
--- a/ext/jni/src/org/sqlite/jni/Tester1.java
+++ b/ext/jni/src/org/sqlite/jni/Tester1.java
@@ -146,7 +146,7 @@ public class Tester1 implements Runnable {
     sqlite3 db = out.take();
     if( 0!=rc ){
       final String msg =
-        null==db ? sqlite3_errstr(rc) : sqlite3_errmsg16(db);
+        null==db ? sqlite3_errstr(rc) : sqlite3_errmsg(db);
       sqlite3_close(db);
       throw new RuntimeException("Opening db failed: "+msg);
     }
@@ -197,7 +197,7 @@ public class Tester1 implements Runnable {
     if(SQLITE_ROW==rc || SQLITE_DONE==rc) rc = 0;
     if( 0!=rc && throwOnError){
       throw new RuntimeException("db op failed with rc="
-                                 +rc+": "+sqlite3_errmsg16(db));
+                                 +rc+": "+sqlite3_errmsg(db));
     }
     return rc;
   }
@@ -343,7 +343,7 @@ public class Tester1 implements Runnable {
     stmt = sqlite3_prepare(db, "intentional error");
     affirm( null==stmt );
     affirm( 0!=sqlite3_errcode(db) );
-    affirm( 0==sqlite3_errmsg16(db).indexOf("near \"intentional\"") );
+    affirm( 0==sqlite3_errmsg(db).indexOf("near \"intentional\"") );
     sqlite3_finalize(stmt);
     stmt = sqlite3_prepare(db, "/* empty input*/\n-- comments only");
     affirm( null==stmt );
@@ -736,7 +736,7 @@ public class Tester1 implements Runnable {
     rc = sqlite3_step(stmt);
     sqlite3_finalize(stmt);
     affirm( 0 != rc );
-    affirm( sqlite3_errmsg16(db).indexOf("an xFinal") > 0 );
+    affirm( sqlite3_errmsg(db).indexOf("an xFinal") > 0 );
 
     SQLFunction funcSc = new ScalarFunction(){
         @Override public void xFunc(sqlite3_context cx, sqlite3_value[] args){
@@ -750,7 +750,7 @@ public class Tester1 implements Runnable {
     rc = sqlite3_step(stmt);
     sqlite3_finalize(stmt);
     affirm( 0 != rc );
-    affirm( sqlite3_errmsg16(db).indexOf("an xFunc") > 0 );
+    affirm( sqlite3_errmsg(db).indexOf("an xFunc") > 0 );
     rc = sqlite3_create_function(db, "mysca", 1, -1, funcSc);
     affirm( SQLITE_FORMAT==rc, "invalid encoding value." );
     sqlite3_close_v2(db);

diff --git a/ext/jni/src/org/sqlite/jni/TesterFts5.java b/ext/jni/src/org/sqlite/jni/TesterFts5.java
index 8577ee46e1f87f394f7de9acc60d2953b81c6e88..9112a53cdec62e15c83faabb91e4f668f866606e 100644 (file)
--- a/ext/jni/src/org/sqlite/jni/TesterFts5.java
+++ b/ext/jni/src/org/sqlite/jni/TesterFts5.java
@@ -104,7 +104,7 @@ public class TesterFts5 {
       }
     });
     if( rc!=SQLITE_OK ){
-      throw new RuntimeException(sqlite3_errmsg16(db));
+      throw new RuntimeException(sqlite3_errmsg(db));
     }
 
     /* Convert to array and return */

diff --git a/manifest b/manifest
index a72bbfce0e7f4bcf2c58e38be0ad0c9dfa2a025e..bb357fd664070e1499f18e451f8ab5d854cad35b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Expose\ssqlite3_stmt_busy()\sto\sJNI.
-D 2023-09-30T14:34:55.498
+C JNI:\srename\ssqlite3_errmsg16()\sto\ssqlite3_errmsg(),\sas\sthe\s16\ssuffix\sis\ssuperfluous\sthere.
+D 2023-09-30T14:48:21.317
 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 af9aec8c540167ba8f9da23f86f74df0ad96e72431fd216b24e722b465e86c12
 F ext/jni/README.md 9fceaeb17cecdc5d699dfc83c0cbc3a03fdb3b86bf676381894166c73375ee75
 F ext/jni/jar-dist.make 030aaa4ae71dd86e4ec5e7c1e6cd86f9dfa47c4592c070d2e35157e42498e1fa
-F ext/jni/src/c/sqlite3-jni.c 047829e3cf4f9a2f36a66d5251af3f74b4cddeb29bd81afc92140467569ec2fb
-F ext/jni/src/c/sqlite3-jni.h b5213a59041016398b932cba9787e819556f0cb920f898f9a9e22778db0354c8
+F ext/jni/src/c/sqlite3-jni.c 2f15974f283c3a0df9ddd44ce5adbe6a284b06ba578b6ef588a0a4598161f059
+F ext/jni/src/c/sqlite3-jni.h 8c6368788415552dd1ee9f3029475f38982d048c87f598e573f98357924202ac
 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,12 +259,12 @@ 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/SQLTester.java e7ba02a72be4205c479d08cbc48cd8f3ac5b924eb6b36a3f5a676a67dcdb8af3
-F ext/jni/src/org/sqlite/jni/SQLite3Jni.java 6e0f4426746c589c4e2abce0f1a4e702d5a10cb11bf21ba6849434544d42506f
+F ext/jni/src/org/sqlite/jni/SQLTester.java da42be06a2d644e0b915b40508934c1f32391e5308ab8767c1e2e65a281a198f
+F ext/jni/src/org/sqlite/jni/SQLite3Jni.java 09739b5f11cf35e1ffe61020f4720997f8554a84bf1175ba17afdfc6bc2418e0
 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 a570ee0b68c51432b918b48032d3893e3b1c5c36e68971c54208144c26773802
-F ext/jni/src/org/sqlite/jni/TesterFts5.java 0995c5ca1da36b3b703c1c04132b2ee8edd16483be5c422ae378220a4817adbf
+F ext/jni/src/org/sqlite/jni/Tester1.java 03e964552ce735e13b0f7f996d7ce60626c918d8e23392b40ed14ffd07dceebd
+F ext/jni/src/org/sqlite/jni/TesterFts5.java 854c737bb5c9463ee92a8ee230013e924236dd4b74d4688dd62c17f38d5837db
 F ext/jni/src/org/sqlite/jni/TraceV2Callback.java beb0b064c1a5f8bfe585a324ed39a4e33edbe379a3fc60f1401661620d3ca7c0
 F ext/jni/src/org/sqlite/jni/UpdateHookCallback.java 8376f4a931f2d5612b295c003c9515ba933ee76d8f95610e89c339727376e36c
 F ext/jni/src/org/sqlite/jni/WindowFunction.java 488980f4dbb6bdd7067d6cb9c43e4075475e51c54d9b74a5834422654b126246
@@ -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 fd4632540717c4771ac9ae1fe4400091a2cd0553639bf809abaf4ecbc54de4f0
-R 601420fd86b70884aeab48cb94eb9cfd
+P 5733aa5fe341d50b84baebd8803a86e381bb95959a8bc733b8fff6fd4e732867
+R 004350affb009ac56aac17effbafb511
 U stephan
-Z 22753df20106c2d85107d9adda4fe97b
+Z c6c765b1c23cd6f9853e3702c0c3b2cc
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 1c9ce5847495906ee141a574d111c11dc0e4adeb..231ebdf509258f7d0e64fcade3585870ef530c8e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5733aa5fe341d50b84baebd8803a86e381bb95959a8bc733b8fff6fd4e732867
\ No newline at end of file
+df25b21689de84b7b8c940df39461d3d88f592f0ba2dddcfcbb0bebcea6ee7da
\ No newline at end of file