Change the name of the _texte64() interfaces to just _test64(), without the "e".
FossilOrigin-Name: 6ab76c5fedfe568b0f0f34a600f9135bf6558148
diff --git a/manifest b/manifest
index c406338..637b73b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\snew\sinterfaces\sto\sthe\sloadable\sextension\smechanism.
-D 2014-09-09T18:41:32.385
+C Change\sthe\sname\sof\sthe\s_texte64()\sinterfaces\sto\sjust\s_test64(),\swithout\sthe\s"e".
+D 2014-09-09T20:30:24.037
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -180,7 +180,7 @@
F src/expr.c 441a7e24e2f7bea9475778fa8acce9e8a69ca8f0
F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
F src/fkey.c da985ae673efef2c712caef825a5d2edb087ead7
-F src/func.c 2ae55b52aa95367ee11d1a8f658605093b13d250
+F src/func.c 63a0da710cdef3dd195bde045e55af34d775b851
F src/global.c 5110fa12e09729b84eee0191c984ec4008e21937
F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
@@ -189,7 +189,7 @@
F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
F src/legacy.c 87c92f4a08e2f70220e3b22a9c3b2482d36a134a
F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
-F src/loadext.c 0cb3e0394c21e7fc513b9e3b013f9675f4c93774
+F src/loadext.c de741e66e5ddc1598d904d7289239696e40ed994
F src/main.c e48517e3da289d93ad86e8b7b4f68078df5e6e51
F src/malloc.c cc015821ba267ad5c91dc8761d0498a3fc3ce6ce
F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
@@ -225,9 +225,9 @@
F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
F src/select.c b4457526cee73c0b69fad42f799f619b1d5a8a8a
F src/shell.c 713cef4d73c05fc8e12f4960072329d767a05d50
-F src/sqlite.h.in cbb079b1d89b45d53d44aab4dc291ce2bac0a4b1
+F src/sqlite.h.in cabd2e9e3a8acb15c5a0f23317e423a17d111e7d
F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
-F src/sqlite3ext.h b8ff57953a1c160e5aa6e0f03119e90ea41fbb4d
+F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
F src/sqliteInt.h 0a9083f9d277bf8ca7e9327c01e01bd01f01a585
F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
@@ -288,7 +288,7 @@
F src/vdbe.c 9a45dcbcc967fc0cb9248c75ba245d1d47de3e78
F src/vdbe.h c63fad052c9e7388d551e556e119c0bcf6bebdf8
F src/vdbeInt.h b4843c35c3ba533b69d4250f550b5bacf2fb013d
-F src/vdbeapi.c fce69e5e9018ce3189da80eefe62ca67606723bc
+F src/vdbeapi.c cec65a12dc2fe9072d5108d9f75df57b0324883a
F src/vdbeaux.c 91fd1e0c54a765838dc61fcf79f31acce035ce38
F src/vdbeblob.c 848238dc73e93e48432991bb5651bf87d865eca4
F src/vdbemem.c dc36ea9fe26c25550c50085f388167086ef7d73a
@@ -1193,7 +1193,7 @@
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 94954850cf2e1ec0b7f590c7f46cdc54c72558ce
-R c1ce17f309170a7fa900bd5f2fa22c3a
+P 18d80cbc590165913d82056aa69ddaeea07b76ec
+R 3de8eb96dbf21697cafd6a57c5ce9a51
U drh
-Z 9deb67bcd7039b69f5843b47ed73f48c
+Z 5ae42b376f3f0dc69341930379e42b64
diff --git a/manifest.uuid b/manifest.uuid
index 3f9cdc6..3cbc755 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-18d80cbc590165913d82056aa69ddaeea07b76ec
\ No newline at end of file
+6ab76c5fedfe568b0f0f34a600f9135bf6558148
\ No newline at end of file
diff --git a/src/func.c b/src/func.c
index eef16d3..e421b28 100644
--- a/src/func.c
+++ b/src/func.c
@@ -325,13 +325,14 @@
for(z2=z; *z2 && p2; p2--){
SQLITE_SKIP_UTF8(z2);
}
- sqlite3_result_text(context, (char*)z, (int)(z2-z), SQLITE_TRANSIENT);
+ sqlite3_result_text64(context, (char*)z, z2-z, SQLITE_TRANSIENT,
+ SQLITE_UTF8);
}else{
if( p1+p2>len ){
p2 = len-p1;
if( p2<0 ) p2 = 0;
}
- sqlite3_result_blob(context, (char*)&z[p1], (int)p2, SQLITE_TRANSIENT);
+ sqlite3_result_blob64(context, (char*)&z[p1], (u64)p2, SQLITE_TRANSIENT);
}
}
@@ -1041,7 +1042,7 @@
*zOut++ = 0x80 + (u8)(c & 0x3F);
} \
}
- sqlite3_result_text(context, (char*)z, (int)(zOut-z), sqlite3_free);
+ sqlite3_result_text64(context, (char*)z, zOut-z, sqlite3_free, SQLITE_UTF8);
}
/*
diff --git a/src/loadext.c b/src/loadext.c
index be82629..2a2afd8 100644
--- a/src/loadext.c
+++ b/src/loadext.c
@@ -394,7 +394,7 @@
/* Version 3.8.7 and later */
sqlite3_auto_extension,
sqlite3_bind_blob64,
- sqlite3_bind_texte64,
+ sqlite3_bind_text64,
sqlite3_cancel_auto_extension,
sqlite3_load_extension,
sqlite3_malloc64,
@@ -402,7 +402,7 @@
sqlite3_realloc64,
sqlite3_reset_auto_extension,
sqlite3_result_blob64,
- sqlite3_result_texte64,
+ sqlite3_result_text64,
sqlite3_strglob
};
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 79dd4c3..f9249b0 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -3385,7 +3385,7 @@
** If the fourth parameter to sqlite3_bind_blob() is negative, then
** the behavior is undefined.
** If a non-negative fourth parameter is provided to sqlite3_bind_text()
-** or sqlite3_bind_text16() or sqlite3_bind_texte64() then
+** or sqlite3_bind_text16() or sqlite3_bind_text64() then
** that parameter must be the byte offset
** where the NUL terminator would occur assuming the string were NUL
** terminated. If any NUL characters occur at byte offsets less than
@@ -3405,10 +3405,10 @@
** SQLite makes its own private copy of the data immediately, before
** the sqlite3_bind_*() routine returns.
**
-** ^The sixth argument to sqlite3_bind_texte64() must be one of
+** ^The sixth argument to sqlite3_bind_text64() must be one of
** [SQLITE_UTF8], [SQLITE_UTF16], [SQLITE_UTF16BE], or [SQLITE_UTF16LE]
** to specify the encoding of the text in the third parameter. If
-** the sixth argument to sqlite3_bind_texte64() is not how of the
+** the sixth argument to sqlite3_bind_text64() is not how of the
** allowed values shown above, or if the text encoding is different
** from the encoding specified by the sixth parameter, then the behavior
** is undefined.
@@ -3451,7 +3451,7 @@
int sqlite3_bind_null(sqlite3_stmt*, int);
int sqlite3_bind_text(sqlite3_stmt*,int,const char*,int,void(*)(void*));
int sqlite3_bind_text16(sqlite3_stmt*, int, const void*, int, void(*)(void*));
-int sqlite3_bind_texte64(sqlite3_stmt*, int, const char*, sqlite3_uint64,
+int sqlite3_bind_text64(sqlite3_stmt*, int, const char*, sqlite3_uint64,
void(*)(void*), unsigned char encoding);
int sqlite3_bind_value(sqlite3_stmt*, int, const sqlite3_value*);
int sqlite3_bind_zeroblob(sqlite3_stmt*, int, int n);
@@ -4448,7 +4448,7 @@
** set the return value of the application-defined function to be
** a text string which is represented as UTF-8, UTF-16 native byte order,
** UTF-16 little endian, or UTF-16 big endian, respectively.
-** ^The sqlite3_result_texte64() interface sets the return value of an
+** ^The sqlite3_result_text64() interface sets the return value of an
** application-defined function to be a text string in an encoding
** specified by the fifth (and last) parameter, which must be one
** of [SQLITE_UTF8], [SQLITE_UTF16], [SQLITE_UTF16BE], or [SQLITE_UTF16LE].
@@ -4506,8 +4506,8 @@
void sqlite3_result_int64(sqlite3_context*, sqlite3_int64);
void sqlite3_result_null(sqlite3_context*);
void sqlite3_result_text(sqlite3_context*, const char*, int, void(*)(void*));
-void sqlite3_result_texte64(sqlite3_context*, const char*,sqlite3_uint64,
- void(*)(void*), unsigned char encoding);
+void sqlite3_result_text64(sqlite3_context*, const char*,sqlite3_uint64,
+ void(*)(void*), unsigned char encoding);
void sqlite3_result_text16(sqlite3_context*, const void*, int, void(*)(void*));
void sqlite3_result_text16le(sqlite3_context*, const void*, int,void(*)(void*));
void sqlite3_result_text16be(sqlite3_context*, const void*, int,void(*)(void*));
diff --git a/src/sqlite3ext.h b/src/sqlite3ext.h
index 17d6197..f9a0665 100644
--- a/src/sqlite3ext.h
+++ b/src/sqlite3ext.h
@@ -254,7 +254,7 @@
int (*auto_extension)(void(*)(void));
int (*bind_blob64)(sqlite3_stmt*,int,const void*,sqlite3_uint64,
void(*)(void*));
- int (*bind_texte64)(sqlite3_stmt*,int,const char*,sqlite3_uint64,
+ int (*bind_text64)(sqlite3_stmt*,int,const char*,sqlite3_uint64,
void(*)(void*),unsigned char);
int (*cancel_auto_extension)(void(*)(void));
int (*load_extension)(sqlite3*,const char*,const char*,char**);
@@ -264,7 +264,7 @@
void (*reset_auto_extension)(void);
void (*result_blob64)(sqlite3_context*,const void*,sqlite3_uint64,
void(*)(void*));
- void (*result_texte64)(sqlite3_context*,const char*,sqlite3_uint64,
+ void (*result_text64)(sqlite3_context*,const char*,sqlite3_uint64,
void(*)(void*), unsigned char);
int (*strglob)(const char*,const char*);
};
@@ -487,7 +487,7 @@
/* Version 3.8.7 and later */
#define sqlite3_auto_extension sqlite3_api->auto_extension
#define sqlite3_bind_blob64 sqlite3_api->bind_blob64
-#define sqlite3_bind_texte64 sqlite3_api->bind_texte64
+#define sqlite3_bind_text64 sqlite3_api->bind_text64
#define sqlite3_cancel_auto_extension sqlite3_api->cancel_auto_extension
#define sqlite3_load_extension sqlite3_api->load_extension
#define sqlite3_malloc64 sqlite3_api->malloc64
@@ -495,7 +495,7 @@
#define sqlite3_realloc64 sqlite3_api->realloc64
#define sqlite3_reset_auto_extension sqlite3_api->reset_auto_extension
#define sqlite3_result_blob64 sqlite3_api->result_blob64
-#define sqlite3_result_texte64 sqlite3_api->result_texte64
+#define sqlite3_result_text64 sqlite3_api->result_text64
#define sqlite3_strglob sqlite3_api->strglob
#endif /* SQLITE_CORE */
diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index 087ea5c..4dccb30 100644
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -309,7 +309,7 @@
assert( sqlite3_mutex_held(pCtx->pOut->db->mutex) );
setResultStrOrError(pCtx, z, n, SQLITE_UTF8, xDel);
}
-void sqlite3_result_texte64(
+void sqlite3_result_text64(
sqlite3_context *pCtx,
const char *z,
sqlite3_uint64 n,
@@ -1226,7 +1226,7 @@
){
return bindText(pStmt, i, zData, nData, xDel, SQLITE_UTF8);
}
-int sqlite3_bind_texte64(
+int sqlite3_bind_text64(
sqlite3_stmt *pStmt,
int i,
const char *zData,
