diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-06-30 04:05:24 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-06-30 04:05:24 +0300 |
| commit | 4a2e40bb861bc3cf5fb6863e57486ed60316e97c (patch) | |
| tree | 6579660b282fdd1bc50095e48d702913a0b6aa97 /ext/pdo_sqlite | |
| parent | 8cce5b2641fb91c3073018b59f6f044b843041a8 (diff) | |
| download | php-git-4a2e40bb861bc3cf5fb6863e57486ed60316e97c.tar.gz | |
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).
Diffstat (limited to 'ext/pdo_sqlite')
| -rw-r--r-- | ext/pdo_sqlite/sqlite_driver.c | 8 | ||||
| -rw-r--r-- | ext/pdo_sqlite/sqlite_statement.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ext/pdo_sqlite/sqlite_driver.c b/ext/pdo_sqlite/sqlite_driver.c index decc9dc438..6dff114c01 100644 --- a/ext/pdo_sqlite/sqlite_driver.c +++ b/ext/pdo_sqlite/sqlite_driver.c @@ -533,7 +533,7 @@ static PHP_METHOD(SQLite, sqliteCreateFunction) PDO_CONSTRUCT_CHECK; if (!zend_is_callable(callback, 0, &cbname)) { - php_error_docref(NULL, E_WARNING, "function '%s' is not callable", cbname->val); + php_error_docref(NULL, E_WARNING, "function '%s' is not callable", ZSTR_VAL(cbname)); zend_string_release(cbname); RETURN_FALSE; } @@ -603,13 +603,13 @@ static PHP_METHOD(SQLite, sqliteCreateAggregate) PDO_CONSTRUCT_CHECK; if (!zend_is_callable(step_callback, 0, &cbname)) { - php_error_docref(NULL, E_WARNING, "function '%s' is not callable", cbname->val); + php_error_docref(NULL, E_WARNING, "function '%s' is not callable", ZSTR_VAL(cbname)); zend_string_release(cbname); RETURN_FALSE; } zend_string_release(cbname); if (!zend_is_callable(fini_callback, 0, &cbname)) { - php_error_docref(NULL, E_WARNING, "function '%s' is not callable", cbname->val); + php_error_docref(NULL, E_WARNING, "function '%s' is not callable", ZSTR_VAL(cbname)); zend_string_release(cbname); RETURN_FALSE; } @@ -663,7 +663,7 @@ static PHP_METHOD(SQLite, sqliteCreateCollation) PDO_CONSTRUCT_CHECK; if (!zend_is_callable(callback, 0, &cbname)) { - php_error_docref(NULL, E_WARNING, "function '%s' is not callable", cbname->val); + php_error_docref(NULL, E_WARNING, "function '%s' is not callable", ZSTR_VAL(cbname)); zend_string_release(cbname); RETURN_FALSE; } diff --git a/ext/pdo_sqlite/sqlite_statement.c b/ext/pdo_sqlite/sqlite_statement.c index f42ad05329..53d12a719d 100644 --- a/ext/pdo_sqlite/sqlite_statement.c +++ b/ext/pdo_sqlite/sqlite_statement.c @@ -91,7 +91,7 @@ static int pdo_sqlite_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_d if (param->is_param) { if (param->paramno == -1) { - param->paramno = sqlite3_bind_parameter_index(S->stmt, param->name->val) - 1; + param->paramno = sqlite3_bind_parameter_index(S->stmt, ZSTR_VAL(param->name)) - 1; } switch (PDO_PARAM_TYPE(param->param_type)) { |