]> granicus.if.org Git - php/commitdiff
Pssst, compiler!
authorBob Weinand <bobwei9@hotmail.com>
Sun, 24 Nov 2013 12:27:22 +0000 (13:27 +0100)
committerBob Weinand <bobwei9@hotmail.com>
Sun, 24 Nov 2013 12:27:22 +0000 (13:27 +0100)
phpdbg.c
phpdbg_cmd.c
phpdbg_opcode.c
phpdbg_print.c

index 2811362272bc2bf6f02d0a5a43f8ee34fec0eaf3..94896cc9842a60b1c93b5a27b6d6894498a96449 100644 (file)
--- 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);
 }
 /* }}} */
 
index 580f68abde56e17f33617b729f06f06dd210231e..81d71da8b8c1336b8916dd993b08217570410536 100644 (file)
@@ -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;
 
index d01f08c229770c37f16ab07577c6127eb037b2ba..fc8bd9aeaa602f9286a4104ad70eaa085b735baa 100644 (file)
@@ -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),
index 9865fe9750f012a63b9b94d9776d0e6f022d7df8..67a0f3381deb7fd1089a903d2ecfb038af2e140d 100644 (file)
@@ -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);