diff options
| author | Nick Kralevich <nnk@google.com> | 2019-08-27 09:48:01 -0700 |
|---|---|---|
| committer | Max Spector <mspector@google.com> | 2019-09-18 17:13:17 -0700 |
| commit | 509217c61c07497db8b0d6d136f2d600c500990b (patch) | |
| tree | a4d2824dd67fb1bc1ffb9a49c0a2f3644b576957 | |
| parent | 0f726527dc11e3f946d1643364cf12cd81d1bb6a (diff) | |
| download | sqlite-android-security-8.1.0_r88.tar.gz | |
sqlite3_android.cpp: disable _TOKENIZEandroid-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-8.1.0_r81android-8.1.0_r80android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70security-oc-mr1-release
Comment out the tokenize function. This code doesn't appear to be used.
A future change will further clean up this code and delete it properly.
Bug: 139186193
Test: compiles and boots
Change-Id: I0b2c37b6716162228205fc1ca8bea0f397f36baf
(cherry picked from commit c52a17358593062a7eb75a023c115df9ad89563b)
(cherry picked from commit 2f967a222a948027bb7f02970370ccaa8ae608a2)
| -rw-r--r-- | android/sqlite3_android.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/android/sqlite3_android.cpp b/android/sqlite3_android.cpp index 659ee6c..d65f872 100644 --- a/android/sqlite3_android.cpp +++ b/android/sqlite3_android.cpp @@ -231,6 +231,7 @@ struct SqliteUserData { UCollator* collator; }; +#if 0 /** * This function is invoked as: * @@ -407,6 +408,7 @@ static void tokenize(sqlite3_context * context, int argc, sqlite3_value ** argv) } while ((token = u_strtok_r(NULL, delim, &state)) != NULL); sqlite3_result_int(context, numTokens); } +#endif static void localized_collator_dtor(UCollator* collator) { @@ -451,6 +453,7 @@ extern "C" int register_localized_collators(sqlite3* handle __attribute((unused) return err; } +#if 0 // Register the _TOKENIZE function err = sqlite3_create_function(handle, "_TOKENIZE", 4, SQLITE_UTF16, collator, tokenize, NULL, NULL); if (err != SQLITE_OK) { @@ -464,6 +467,7 @@ extern "C" int register_localized_collators(sqlite3* handle __attribute((unused) if (err != SQLITE_OK) { return err; } +#endif //// PHONEBOOK_COLLATOR status = U_ZERO_ERROR; |