diff options
| author | Anatol Belski <ab@php.net> | 2014-08-25 21:51:49 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-25 21:51:49 +0200 |
| commit | af59e92b24c8f624672720d47ef65bd8457728b9 (patch) | |
| tree | 1da992a4689783e1351760a8702cbf6844ad37aa /ext/pdo_sqlite | |
| parent | b9514bb8fd27e2d841bab3eb256fcbaa613aa049 (diff) | |
| download | php-git-af59e92b24c8f624672720d47ef65bd8457728b9.tar.gz | |
master renames phase 7PRE_AST_MERGE
Diffstat (limited to 'ext/pdo_sqlite')
| -rw-r--r-- | ext/pdo_sqlite/sqlite_driver.c | 4 | ||||
| -rw-r--r-- | ext/pdo_sqlite/sqlite_statement.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/pdo_sqlite/sqlite_driver.c b/ext/pdo_sqlite/sqlite_driver.c index da69448d5d..1fff450623 100644 --- a/ext/pdo_sqlite/sqlite_driver.c +++ b/ext/pdo_sqlite/sqlite_driver.c @@ -301,7 +301,7 @@ static int pdo_sqlite_set_attr(pdo_dbh_t *dbh, zend_long attr, zval *val TSRMLS_ switch (attr) { case PDO_ATTR_TIMEOUT: - convert_to_int(val); + convert_to_long(val); sqlite3_busy_timeout(H->db, Z_LVAL_P(val) * 1000); return 1; } @@ -497,7 +497,7 @@ static int php_sqlite3_collation_callback(void *context, php_error_docref(NULL TSRMLS_CC, E_WARNING, "An error occurred while invoking the callback"); } else if (!Z_ISUNDEF(retval)) { if (Z_TYPE(retval) != IS_LONG) { - convert_to_int_ex(&retval); + convert_to_long_ex(&retval); } ret = 0; if (Z_LVAL(retval) > 0) { diff --git a/ext/pdo_sqlite/sqlite_statement.c b/ext/pdo_sqlite/sqlite_statement.c index feaff73b94..2cf271c0d3 100644 --- a/ext/pdo_sqlite/sqlite_statement.c +++ b/ext/pdo_sqlite/sqlite_statement.c @@ -117,7 +117,7 @@ static int pdo_sqlite_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_d return 1; } } else { - convert_to_int(parameter); + convert_to_long(parameter); #if ZEND_LONG_MAX > 2147483647 if (SQLITE_OK == sqlite3_bind_int64(S->stmt, param->paramno + 1, Z_LVAL_P(parameter))) { return 1; |