com php-src: Revert "PHP 7 compat": ext/pdo/pdo_stmt.c
| From: | JulienPauli | Date: | Fri, 02 Sep 2016 15:57:09 +0000 |
| Subject: | com php-src: Revert "PHP 7 compat": ext/pdo/pdo_stmt.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-94252@lists.php.net to get a copy of this message | ||
Commit: 0dbcdceb280bc45553a4b048c7b78c55acee34bb
Author: Julien Pauli <jpauli@php.net> Fri, 2 Sep 2016 17:57:09 +0200
Parents: 67153d644dc1ff91fb4a7ab6c1a03286829d59ba
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0dbcdceb280bc45553a4b048c7b78c55acee34bb
Log:
Revert "PHP 7 compat"
This reverts commit 24a57ee03b5b8803a2dcffd458b8a56c13ec6293.
Changed paths:
M ext/pdo/pdo_stmt.c
Diff:
diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index 779011a..f7d82df 100644
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@ -2123,7 +2123,7 @@ static PHP_METHOD(PDOStatement, debugDumpParams)
}
php_stream_printf(out TSRMLS_CC, "paramno=%ld\nname=[%d]
\"%.*s\"\nis_param=%d\nparam_type=%d\nis_input_output=%d\n",
- param->paramno, ZSTR_LEN(param->name), ZSTR_LEN(param->name), param->name ?
ZSTR_VAL(param->name) : "",
+ param->paramno, param->namelen, param->namelen, param->name ? param->name :
"",
param->is_param,
PDO_PARAM_TYPE(param->param_type),
(param->param_type & PDO_PARAM_INPUT_OUTPUT) == PDO_PARAM_INPUT_OUTPUT);
@@ -2135,24 +2135,21 @@ static PHP_METHOD(PDOStatement, debugDumpParams)
* PDO::PARAM_INT evaluates to a long
* PDO::PARAM_LOB evaluates to a string
*/
- switch (Z_TYPE(param->parameter)) {
- case IS_TRUE:
- php_stream_printf(out, "param_value=true\n");
- break;
- case IS_FALSE:
- php_stream_printf(out, "param_value=false\n");
+ switch (Z_TYPE_P(param->parameter)) {
+ case IS_BOOL:
+ php_stream_printf(out TSRMLS_CC, "param_value=%s\n",
Z_BVAL_P(param->parameter)?"true":"false");
break;
case IS_NULL:
- php_stream_printf(out, "param_value=null\n");
+ php_stream_printf(out TSRMLS_CC, "param_value=null\n");
break;
case IS_LONG:
- php_stream_printf(out, "param_value=%ld\n", Z_LVAL(param->parameter));
+ php_stream_printf(out TSRMLS_CC, "param_value=%ld\n",
Z_LVAL_P(param->parameter));
break;
case IS_STRING:
- php_stream_printf(out, "param_value=%s\n", Z_STRVAL(param->parameter));
+ php_stream_printf(out TSRMLS_CC, "param_value=%s\n",
Z_STRVAL_P(param->parameter));
break;
default:
- php_stream_printf(out, "param_value=unknown\n");
+ php_stream_printf(out TSRMLS_CC, "param_value=unknown\n");
break;
}
} ZEND_HASH_FOREACH_END();