com php-src: PHP 7 compat: ext/pdo/pdo_stmt.c

From: Date: Fri, 02 Sep 2016 15:02:39 +0000
Subject: com php-src: PHP 7 compat: ext/pdo/pdo_stmt.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-94250@lists.php.net to get a copy of this message
Commit: 24a57ee03b5b8803a2dcffd458b8a56c13ec6293 Author: Julien Pauli <jpauli@php.net> Thu, 1 Sep 2016 13:44:54 +0200 Parents: 04115b4e3f37f24bdefb853c5c31eebd40ffff64 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=24a57ee03b5b8803a2dcffd458b8a56c13ec6293 Log: PHP 7 compat Changed paths: M ext/pdo/pdo_stmt.c Diff: diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c index f7d82df..779011a 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, param->namelen, param->namelen, param->name ? param->name : "", + param->paramno, ZSTR_LEN(param->name), ZSTR_LEN(param->name), param->name ? ZSTR_VAL(param->name) : "", param->is_param, PDO_PARAM_TYPE(param->param_type), (param->param_type & PDO_PARAM_INPUT_OUTPUT) == PDO_PARAM_INPUT_OUTPUT); @@ -2135,21 +2135,24 @@ static PHP_METHOD(PDOStatement, debugDumpParams) * PDO::PARAM_INT evaluates to a long * PDO::PARAM_LOB evaluates to a string */ - 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"); + 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"); break; case IS_NULL: - php_stream_printf(out TSRMLS_CC, "param_value=null\n"); + php_stream_printf(out, "param_value=null\n"); break; case IS_LONG: - php_stream_printf(out TSRMLS_CC, "param_value=%ld\n", Z_LVAL_P(param->parameter)); + php_stream_printf(out, "param_value=%ld\n", Z_LVAL(param->parameter)); break; case IS_STRING: - php_stream_printf(out TSRMLS_CC, "param_value=%s\n", Z_STRVAL_P(param->parameter)); + php_stream_printf(out, "param_value=%s\n", Z_STRVAL(param->parameter)); break; default: - php_stream_printf(out TSRMLS_CC, "param_value=unknown\n"); + php_stream_printf(out, "param_value=unknown\n"); break; } } ZEND_HASH_FOREACH_END();

« previous php.cvs (#94250) next »