diff options
Diffstat (limited to 'sapi/fpm/fpm')
| -rw-r--r-- | sapi/fpm/fpm/fpm_php_trace.c | 6 | ||||
| -rw-r--r-- | sapi/fpm/fpm/fpm_scoreboard.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sapi/fpm/fpm/fpm_php_trace.c b/sapi/fpm/fpm/fpm_php_trace.c index b5d642f8a6..26583881af 100644 --- a/sapi/fpm/fpm/fpm_php_trace.c +++ b/sapi/fpm/fpm/fpm_php_trace.c @@ -117,7 +117,7 @@ static int fpm_php_trace_dump(struct fpm_child_s *child, FILE *slowlog) /* {{{ * } else { memcpy(buf, "???", sizeof("???")); } - + fprintf(slowlog, "[0x%" PTR_FMT "lx] ", execute_data); fprintf(slowlog, "%s()", buf); @@ -144,7 +144,7 @@ static int fpm_php_trace_dump(struct fpm_child_s *child, FILE *slowlog) /* {{{ * } type = (zend_uchar *)&l; - if (0 > fpm_trace_get_long(function + offsetof(zend_function, type), &l)) { + if (0 > fpm_trace_get_long(function + offsetof(zend_function, type), &l)) { return -1; } @@ -174,7 +174,7 @@ static int fpm_php_trace_dump(struct fpm_child_s *child, FILE *slowlog) /* {{{ * lineno = *lu; } break; - } + } if (0 > fpm_trace_get_long(prev + offsetof(zend_execute_data, prev_execute_data), &l)) { return -1; diff --git a/sapi/fpm/fpm/fpm_scoreboard.c b/sapi/fpm/fpm/fpm_scoreboard.c index 8b73df895d..b2ce46356f 100644 --- a/sapi/fpm/fpm/fpm_scoreboard.c +++ b/sapi/fpm/fpm/fpm_scoreboard.c @@ -247,7 +247,7 @@ void fpm_scoreboard_free(struct fpm_scoreboard_s *scoreboard) /* {{{ */ scoreboard_size = sizeof(struct fpm_scoreboard_s) + (scoreboard->nprocs) * sizeof(struct fpm_scoreboard_proc_s *); scoreboard_nprocs_size = sizeof(struct fpm_scoreboard_proc_s) * scoreboard->nprocs; - + fpm_shm_free(scoreboard, scoreboard_size + scoreboard_nprocs_size); } /* }}} */ |