author | Wes Johnston <wjohnston@mozilla.com> |
Mon, 08 Oct 2012 16:59:24 -0700 | |
changeset 109708 | edb9750342f7d208e0bd244c2d504d39bff0f20a |
parent 109707 | 14684be8116624897f620ede591c58723a172919 |
child 109709 | d7650d584078bb923d787a18487088998f7d7843 |
push id | 23648 |
push user | emorley@mozilla.com |
push date | Tue, 09 Oct 2012 14:23:49 +0000 |
treeherder | mozilla-central@dd61540f237c [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
bugs | 745384 |
milestone | 19.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
mozglue/android/SQLiteBridge.cpp | file | annotate | diff | comparison | revisions | |
mozglue/android/SQLiteBridge.h | file | annotate | diff | comparison | revisions |
--- a/mozglue/android/SQLiteBridge.cpp +++ b/mozglue/android/SQLiteBridge.cpp @@ -21,17 +21,16 @@ #define SQLITE_WRAPPER_INT(name) name ## _t f_ ## name; SQLITE_WRAPPER_INT(sqlite3_open) SQLITE_WRAPPER_INT(sqlite3_errmsg) SQLITE_WRAPPER_INT(sqlite3_prepare_v2) SQLITE_WRAPPER_INT(sqlite3_bind_parameter_count) SQLITE_WRAPPER_INT(sqlite3_bind_text) -SQLITE_WRAPPER_INT(sqlite3_bind_null) SQLITE_WRAPPER_INT(sqlite3_step) SQLITE_WRAPPER_INT(sqlite3_column_count) SQLITE_WRAPPER_INT(sqlite3_finalize) SQLITE_WRAPPER_INT(sqlite3_close) SQLITE_WRAPPER_INT(sqlite3_column_name) SQLITE_WRAPPER_INT(sqlite3_column_type) SQLITE_WRAPPER_INT(sqlite3_column_blob) SQLITE_WRAPPER_INT(sqlite3_column_bytes) @@ -248,21 +247,16 @@ sqliteInternalCall(JNIEnv* jenv, goto error_close; } if (jParams != NULL) { // Bind parameters, if any if (numPars > 0) { for (int i = 0; i < numPars; i++) { jobject jObjectParam = jenv->GetObjectArrayElement(jParams, i); - if (jObjectParam == NULL) { - // SQLite parameters index from 1 - rc = f_sqlite3_bind_null(ppStmt, i + 1); - continue; - } // IsInstanceOf or isAssignableFrom? String is final, so IsInstanceOf // should be OK. jboolean isString = jenv->IsInstanceOf(jObjectParam, stringClass); if (isString != JNI_TRUE) { asprintf(&errorMsg, "Parameter is not of String type"); goto error_close; } jstring jStringParam = (jstring)jObjectParam;
--- a/mozglue/android/SQLiteBridge.h +++ b/mozglue/android/SQLiteBridge.h @@ -13,17 +13,16 @@ void setup_sqlite_functions(void *sqlite typedef return_type (*name ## _t)(args); \ extern name ## _t f_ ## name; SQLITE_WRAPPER(sqlite3_open, int, const char*, sqlite3**) SQLITE_WRAPPER(sqlite3_errmsg, const char*, sqlite3*) SQLITE_WRAPPER(sqlite3_prepare_v2, int, sqlite3*, const char*, int, sqlite3_stmt**, const char**) SQLITE_WRAPPER(sqlite3_bind_parameter_count, int, sqlite3_stmt*) SQLITE_WRAPPER(sqlite3_bind_text, int, sqlite3_stmt*, int, const char*, int, void(*)(void*)) -SQLITE_WRAPPER(sqlite3_bind_null, int, sqlite3_stmt*, int) SQLITE_WRAPPER(sqlite3_step, int, sqlite3_stmt*) SQLITE_WRAPPER(sqlite3_column_count, int, sqlite3_stmt*) SQLITE_WRAPPER(sqlite3_finalize, int, sqlite3_stmt*) SQLITE_WRAPPER(sqlite3_close, int, sqlite3*) SQLITE_WRAPPER(sqlite3_column_name, const char*, sqlite3_stmt*, int) SQLITE_WRAPPER(sqlite3_column_type, int, sqlite3_stmt*, int) SQLITE_WRAPPER(sqlite3_column_blob, const void*, sqlite3_stmt*, int) SQLITE_WRAPPER(sqlite3_column_bytes, int, sqlite3_stmt*, int)