com php-src: Use explicit type here: sapi/fpm/fpm/fpm_php_t race.c

From: Date: Tue, 12 May 2015 08:35:57 +0000
Subject: com php-src: Use explicit type here: sapi/fpm/fpm/fpm_php_t race.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-86671@lists.php.net to get a copy of this message
Commit: 16265a59ac6bd433bfb636e4e44da1ad57cdcda9 Author: Xinchen Hui <laruence@gmail.com> Tue, 12 May 2015 16:35:57 +0800 Parents: 81049cdf061c685b0f68eb44a1258e6e2ecd0fe6 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=16265a59ac6bd433bfb636e4e44da1ad57cdcda9 Log: Use explicit type here Changed paths: M sapi/fpm/fpm/fpm_php_trace.c Diff: diff --git a/sapi/fpm/fpm/fpm_php_trace.c b/sapi/fpm/fpm/fpm_php_trace.c index f6506fc..e6482b6 100644 --- a/sapi/fpm/fpm/fpm_php_trace.c +++ b/sapi/fpm/fpm/fpm_php_trace.c @@ -131,6 +131,7 @@ static int fpm_php_trace_dump(struct fpm_child_s *child, FILE *slowlog) /* {{{ * execute_data = prev = l; while (prev) { + zend_uchar *type; if (0 > fpm_trace_get_long(prev + offsetof(zend_execute_data, func), &l)) { return -1; @@ -142,12 +143,12 @@ static int fpm_php_trace_dump(struct fpm_child_s *child, FILE *slowlog) /* {{{ * break; } - if (0 > fpm_trace_get_long(function + offsetof(zend_function, type), &l)) { + type = (zend_uchar *)&l; + if (0 > fpm_trace_get_long(function + offsetof(zend_function, type), &l)) { return -1; } - /* zend_uchar? */ - if (ZEND_USER_CODE(l)) { + if (ZEND_USER_CODE(*type)) { if (0 > fpm_trace_get_long(function + offsetof(zend_op_array, filename), &l)) { return -1; }

« previous php.cvs (#86671) next »