Skip to content

Commit

Permalink
Fixed some GCC warnings when built with PHP 5.4
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.php.net/repository/pecl/apm/trunk@325557 c90b9560-bf6c-de11-be94-00142212c4b1
  • Loading branch information
patrickallaert committed May 6, 2012
1 parent 659d9be commit d5a66f5
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions backtrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ void append_backtrace(smart_str *trace_str TSRMLS_DC)
/* backtrace variables */
zend_execute_data *ptr, *skip;
int lineno;
char *function_name;
char *filename;
char *class_name = NULL;
const char *function_name;
const char *filename;
const char *class_name = NULL;
char *call_type;
char *include_filename = NULL;
const char *include_filename = NULL;
zval *arg_array = NULL;
#if PHP_API_VERSION < 20090626
void **cur_arg_pos = EG(argument_stack).top_element;
Expand Down Expand Up @@ -73,7 +73,7 @@ void append_backtrace(smart_str *trace_str TSRMLS_DC)
ptr = EG(current_execute_data);

while (ptr) {
char *free_class_name = NULL;
const char *free_class_name = NULL;

class_name = call_type = NULL;
arg_array = NULL;
Expand Down Expand Up @@ -228,7 +228,7 @@ void append_backtrace(smart_str *trace_str TSRMLS_DC)
ptr = skip->prev_execute_data;
++indent;
if (free_class_name) {
efree(free_class_name);
efree((char *) free_class_name);
}
}
}
Expand Down Expand Up @@ -275,7 +275,7 @@ static void append_flat_zval_r(zval *expr TSRMLS_DC, smart_str *trace_str, char
zend_uint clen;

if (Z_OBJ_HANDLER_P(expr, get_class_name)) {
Z_OBJ_HANDLER_P(expr, get_class_name)(expr, &class_name, &clen, 0 TSRMLS_CC);
Z_OBJ_HANDLER_P(expr, get_class_name)(expr, (const char **) &class_name, &clen, 0 TSRMLS_CC);
}
if (class_name) {
smart_str_appends(trace_str, class_name);
Expand Down

0 comments on commit d5a66f5

Please sign in to comment.