]> granicus.if.org Git - php/commitdiff
use Z* macro name
authorAnatol Belski <ab@php.net>
Thu, 5 Nov 2015 21:39:10 +0000 (22:39 +0100)
committerAnatol Belski <ab@php.net>
Thu, 5 Nov 2015 21:39:10 +0000 (22:39 +0100)
ext/pdo_firebird/firebird_statement.c
ext/pdo_mysql/mysql_statement.c
ext/pdo_sqlite/sqlite_statement.c

index 5eaf530415ac34cbbbcd1ca4982601e484630e95..5445368bc9f306f21ffbae1831af2177eb4e9ef6 100644 (file)
@@ -529,7 +529,7 @@ static int firebird_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_dat
                                if (stm) {
                                        zend_string *mem =  php_stream_copy_to_mem(stm, PHP_STREAM_COPY_ALL, 0);
                                        zval_ptr_dtor(parameter);
-                                       ZVAL_STR(parameter, mem ? mem : STR_EMPTY_ALLOC());
+                                       ZVAL_STR(parameter, mem ? mem : ZSTR_EMPTY_ALLOC());
                                } else {
                                        pdo_raise_impl_error(stmt->dbh, stmt, "HY105", "Expected a stream resource");
                                        return 0;
index ac94632aae83dc255836ec37e8150c631f030218..2c7e39bbbdaf9ab1b2d6196fef67cb3f1d1a9e94 100644 (file)
@@ -528,7 +528,7 @@ static int pdo_mysql_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_da
                                                        if (stm) {
                                                                zend_string *mem = php_stream_copy_to_mem(stm, PHP_STREAM_COPY_ALL, 0);
                                                                zval_ptr_dtor(parameter);
-                                                               ZVAL_STR(parameter, mem ? mem : STR_EMPTY_ALLOC());
+                                                               ZVAL_STR(parameter, mem ? mem : ZSTR_EMPTY_ALLOC());
                                                        } else {
                                                                pdo_raise_impl_error(stmt->dbh, stmt, "HY105", "Expected a stream resource");
                                                                return 0;
index 93807c834cabf10d23e6f42687604e00c97ad80e..efe84c11cd69e470dc0b220c02a01964d9ea59c1 100644 (file)
@@ -143,7 +143,7 @@ static int pdo_sqlite_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_d
                                                        if (stm) {
                                                                zend_string *mem = php_stream_copy_to_mem(stm, PHP_STREAM_COPY_ALL, 0);
                                                                zval_ptr_dtor(parameter);
-                                                               ZVAL_STR(parameter, mem ? mem : STR_EMPTY_ALLOC());
+                                                               ZVAL_STR(parameter, mem ? mem : ZSTR_EMPTY_ALLOC());
                                                        } else {
                                                                pdo_raise_impl_error(stmt->dbh, stmt, "HY105", "Expected a stream resource");
                                                                return 0;