summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@gmail.com>2015-05-12 16:35:57 +0800
committerXinchen Hui <laruence@gmail.com>2015-05-12 16:35:57 +0800
commit16265a59ac6bd433bfb636e4e44da1ad57cdcda9 (patch)
treebbe4d862c3779d89a6e7954526ba621ed9aa855b
parent81049cdf061c685b0f68eb44a1258e6e2ecd0fe6 (diff)
downloadphp-git-16265a59ac6bd433bfb636e4e44da1ad57cdcda9.tar.gz
Use explicit type here
-rw-r--r--sapi/fpm/fpm/fpm_php_trace.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sapi/fpm/fpm/fpm_php_trace.c b/sapi/fpm/fpm/fpm_php_trace.c
index f6506fcb94..e6482b6380 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;
}