summaryrefslogtreecommitdiff
path: root/ext/pdo_sqlite
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2012-01-31 07:17:05 +0000
committerPierre Joye <pajoye@php.net>2012-01-31 07:17:05 +0000
commit0e0d79218f06489286c42e1a6d0c686383071552 (patch)
tree25920e9b84fb12ee9e87078c32c3d49a52fdf6df /ext/pdo_sqlite
parent3115e6497ad241995c7c90a3a98ddcf6d79dc25b (diff)
downloadphp-git-0e0d79218f06489286c42e1a6d0c686383071552.tar.gz
- fix #55226, WS
Diffstat (limited to 'ext/pdo_sqlite')
-rw-r--r--ext/pdo_sqlite/sqlite_driver.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/pdo_sqlite/sqlite_driver.c b/ext/pdo_sqlite/sqlite_driver.c
index 637d93c502..115b3e2da2 100644
--- a/ext/pdo_sqlite/sqlite_driver.c
+++ b/ext/pdo_sqlite/sqlite_driver.c
@@ -670,14 +670,14 @@ static PHP_METHOD(SQLite, sqliteCreateCollation)
struct pdo_sqlite_collation *collation;
zval *callback;
char *collation_name;
- int collation_name_len;
- char *cbname = NULL;
+ int collation_name_len;
+ char *cbname = NULL;
pdo_dbh_t *dbh;
pdo_sqlite_db_handle *H;
int ret;
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz",
- &collation_name, &collation_name_len, &callback)) {
+ &collation_name, &collation_name_len, &callback)) {
RETURN_FALSE;
}
@@ -693,10 +693,10 @@ static PHP_METHOD(SQLite, sqliteCreateCollation)
H = (pdo_sqlite_db_handle *)dbh->driver_data;
- collation = (struct pdo_sqlite_collation*)ecalloc(1, sizeof(*collation));
+ collation = (struct pdo_sqlite_collation*)ecalloc(1, sizeof(*collation));
- ret = sqlite3_create_collation(H->db, collation_name, SQLITE_UTF8, collation, php_sqlite3_collation_callback);
- if (ret == SQLITE_OK) {
+ ret = sqlite3_create_collation(H->db, collation_name, SQLITE_UTF8, collation, php_sqlite3_collation_callback);
+ if (ret == SQLITE_OK) {
collation->name = estrdup(collation_name);
MAKE_STD_ZVAL(collation->callback);