com php-src: Pssst, compiler!: phpdbg.c phpdbg_cmd.c phpd bg_opcode.c phpdbg_print.c

From: Date: Sun, 24 Nov 2013 12:27:22 +0000
Subject: com php-src: Pssst, compiler!: phpdbg.c phpdbg_cmd.c phpd bg_opcode.c phpdbg_print.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-74644@lists.php.net to get a copy of this message
Commit: 2800af6e47dbc9b76843e480bb5d5a61adebc342 Author: Bob Weinand <bobwei9@hotmail.com> Sun, 24 Nov 2013 13:27:22 +0100 Parents: fcdae5867fa6905b25de29dae69e2d3bdcc8e60d Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2800af6e47dbc9b76843e480bb5d5a61adebc342 Log: Pssst, compiler! Changed paths: M phpdbg.c M phpdbg_cmd.c M phpdbg_opcode.c M phpdbg_print.c Diff: diff --git a/phpdbg.c b/phpdbg.c index 2811362..94896cc 100644 --- a/phpdbg.c +++ b/phpdbg.c @@ -286,7 +286,7 @@ static void php_sapi_phpdbg_send_header(sapi_header_struct *sapi_header, void *s static void php_sapi_phpdbg_log_message(char *message TSRMLS_DC) /* {{{ */ { - phpdbg_error(message); + phpdbg_error("%s", message); } /* }}} */ diff --git a/phpdbg_cmd.c b/phpdbg_cmd.c index 580f68a..81d71da 100644 --- a/phpdbg_cmd.c +++ b/phpdbg_cmd.c @@ -192,7 +192,7 @@ PHPDBG_API phpdbg_input_t **phpdbg_read_argv(char *buffer, int *argc TSRMLS_DC) case IN_STRING: phpdbg_error( - "Malformed command line (unclosed quote) @ %d: %s!", + "Malformed command line (unclosed quote) @ %ld: %s!", (p - buffer)-1, &buffer[(p - buffer)-1]); break; diff --git a/phpdbg_opcode.c b/phpdbg_opcode.c index d01f08c..fc8bd9a 100644 --- a/phpdbg_opcode.c +++ b/phpdbg_opcode.c @@ -152,7 +152,7 @@ void phpdbg_print_opline_ex(zend_execute_data *execute_data, HashTable *vars, ze (!(PHPDBG_G(flags) & PHPDBG_IS_QUIET) || (PHPDBG_G(flags) & PHPDBG_IS_STEPPING))) { /* output line info */ - phpdbg_notice("#%- 5lu %16p %-30s %s %s", + phpdbg_notice("#%-5u %16p %-30s %s %s", opline->lineno, opline, phpdbg_decode_opcode(opline->opcode), @@ -161,7 +161,7 @@ void phpdbg_print_opline_ex(zend_execute_data *execute_data, HashTable *vars, ze } if (!ignore_flags && PHPDBG_G(oplog)) { - phpdbg_log_ex(PHPDBG_G(oplog), "#%- 5lu %16p %-30s %s %s", + phpdbg_log_ex(PHPDBG_G(oplog), "#%-5u %16p %-30s %s %s", opline->lineno, opline, phpdbg_decode_opcode(opline->opcode), diff --git a/phpdbg_print.c b/phpdbg_print.c index 9865fe9..67a0f33 100644 --- a/phpdbg_print.c +++ b/phpdbg_print.c @@ -70,12 +70,12 @@ static inline void phpdbg_print_function_helper(zend_function *method TSRMLS_DC) char *decode = phpdbg_decode_opline(op_array, opline, &vars TSRMLS_CC); if (decode != NULL) { phpdbg_writeln( - "\t\t#%lu\t%p %-30s %s", + "\t\t#%u\t%p %-30s %s", opline->lineno, opline, phpdbg_decode_opcode(opline->opcode), decode); - } else phpdbg_error("\tFailed to decode opline @ %ld", opline); + } else phpdbg_error("\tFailed to decode opline %16p", opline); free(decode); opline++; } while (++opcode < end);

« previous php.cvs (#74644) next »