com php-src: fix some specs for line num: Zend/zend_alloc.c Zend/zend_execute.c Zend/zend_vm_def.h Zend/ze nd_vm_execute.h main/main.c

Commit: ba32bba8c2b55767e1358aa058e4f7d5756f2d7d Author: Anatol Belski <ab@php.net> Mon, 3 Feb 2014 18:14:31 +0100 Parents: c98fcaafe7d88db1818df6c1f6859d5803605a4b Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ba32bba8c2b55767e1358aa058e4f7d5756f2d7d Log: fix some specs for line num Changed paths: M Zend/zend_alloc.c M Zend/zend_execute.c M Zend/zend_vm_def.h M Zend/zend_vm_execute.h M main/main.c

diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index ddcc6be..54b9270 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -1791,7 +1791,7 @@ static void zend_mm_safe_error(zend_mm_heap *heap, lineno, #endif size); - fprintf(stderr, " in %s on line %d\n", error_filename, error_lineno); + fprintf(stderr, " in %s on line " ZEND_UINT_FMT "\n", error_filename, error_lineno); } /* See http://support.microsoft.com/kb/190351 */ #ifdef PHP_WIN32 diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 4429920..0187b9d 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -601,9 +601,9 @@ ZEND_API int zend_verify_arg_error(int error_type, const zend_function *zf, zend } if (ptr && ptr->op_array) { - zend_error(error_type, "Argument %d passed to %s%s%s() must %s%s, %s%s given, called in %s on line %d and defined", arg_num, fclass, fsep, fname, need_msg, need_kind, given_msg, given_kind, ptr->op_array->filename, ptr->opline->lineno); + zend_error(error_type, "Argument %pu passed to %s%s%s() must %s%s, %s%s given, called in %s on line %pu and defined", arg_num, fclass, fsep, fname, need_msg, need_kind, given_msg, given_kind, ptr->op_array->filename, ptr->opline->lineno); } else { - zend_error(error_type, "Argument %d passed to %s%s%s() must %s%s, %s%s given", arg_num, fclass, fsep, fname, need_msg, need_kind, given_msg, given_kind); + zend_error(error_type, "Argument %pu passed to %s%s%s() must %s%s, %s%s given", arg_num, fclass, fsep, fname, need_msg, need_kind, given_msg, given_kind); } return 0; } diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 02f9e11..bf220a8 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -3065,7 +3065,7 @@ ZEND_VM_HANDLER(65, ZEND_SEND_VAL, CONST|TMP, ANY) if (opline->extended_value == ZEND_DO_FCALL_BY_NAME) { zend_size_t arg_num = opline->op2.num + EX(call)->num_additional_args; if (ARG_MUST_BE_SENT_BY_REF(EX(call)->fbc, arg_num)) { - zend_error_noreturn(E_ERROR, "Cannot pass parameter %d by reference", arg_num); + zend_error_noreturn(E_ERROR, "Cannot pass parameter %pu by reference", arg_num); } } @@ -3332,7 +3332,7 @@ ZEND_VM_HANDLER(165, ZEND_SEND_UNPACK, ANY, ANY) if (ARG_MUST_BE_SENT_BY_REF(EX(call)->fbc, arg_num)) { zend_error( - E_WARNING, "Cannot pass by-reference argument %d of %s%s%s()" + E_WARNING, "Cannot pass by-reference argument %pu of %s%s%s()" " by unpacking a Traversable, passing by-value instead", arg_num, EX(call)->fbc->common.scope ? EX(call)->fbc->common.scope->name : "", EX(call)->fbc->common.scope ? "::" : "", @@ -3393,7 +3393,7 @@ ZEND_VM_HANDLER(63, ZEND_RECV, ANY, ANY) ptr = EX(prev_execute_data); if(ptr && ptr->op_array) { - zend_error(E_WARNING, "Missing argument %u for %s%s%s(), called in %s on line %d and defined", opline->op1.num, class_name, space, get_active_function_name(TSRMLS_C), ptr->op_array->filename, ptr->opline->lineno); + zend_error(E_WARNING, "Missing argument %u for %s%s%s(), called in %s on line %pu and defined", opline->op1.num, class_name, space, get_active_function_name(TSRMLS_C), ptr->op_array->filename, ptr->opline->lineno); } else { zend_error(E_WARNING, "Missing argument %u for %s%s%s()", opline->op1.num, class_name, space, get_active_function_name(TSRMLS_C)); } diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index e5388a3..985675b 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -814,7 +814,7 @@ static int ZEND_FASTCALL ZEND_SEND_UNPACK_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS if (ARG_MUST_BE_SENT_BY_REF(EX(call)->fbc, arg_num)) { zend_error( - E_WARNING, "Cannot pass by-reference argument %d of %s%s%s()" + E_WARNING, "Cannot pass by-reference argument %pu of %s%s%s()" " by unpacking a Traversable, passing by-value instead", arg_num, EX(call)->fbc->common.scope ? EX(call)->fbc->common.scope->name : "", EX(call)->fbc->common.scope ? "::" : "", @@ -875,7 +875,7 @@ static int ZEND_FASTCALL ZEND_RECV_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS) ptr = EX(prev_execute_data); if(ptr && ptr->op_array) { - zend_error(E_WARNING, "Missing argument %u for %s%s%s(), called in %s on line %d and defined", opline->op1.num, class_name, space, get_active_function_name(TSRMLS_C), ptr->op_array->filename, ptr->opline->lineno); + zend_error(E_WARNING, "Missing argument %u for %s%s%s(), called in %s on line %pu and defined", opline->op1.num, class_name, space, get_active_function_name(TSRMLS_C), ptr->op_array->filename, ptr->opline->lineno); } else { zend_error(E_WARNING, "Missing argument %u for %s%s%s()", opline->op1.num, class_name, space, get_active_function_name(TSRMLS_C)); } @@ -2738,7 +2738,7 @@ static int ZEND_FASTCALL ZEND_SEND_VAL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_A if (opline->extended_value == ZEND_DO_FCALL_BY_NAME) { zend_size_t arg_num = opline->op2.num + EX(call)->num_additional_args; if (ARG_MUST_BE_SENT_BY_REF(EX(call)->fbc, arg_num)) { - zend_error_noreturn(E_ERROR, "Cannot pass parameter %d by reference", arg_num); + zend_error_noreturn(E_ERROR, "Cannot pass parameter %pu by reference", arg_num); } } @@ -8036,7 +8036,7 @@ static int ZEND_FASTCALL ZEND_SEND_VAL_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARG if (opline->extended_value == ZEND_DO_FCALL_BY_NAME) { zend_size_t arg_num = opline->op2.num + EX(call)->num_additional_args; if (ARG_MUST_BE_SENT_BY_REF(EX(call)->fbc, arg_num)) { - zend_error_noreturn(E_ERROR, "Cannot pass parameter %d by reference", arg_num); + zend_error_noreturn(E_ERROR, "Cannot pass parameter %pu by reference", arg_num); } } diff --git a/main/main.c b/main/main.c index 0141359..834adcc 100644 --- a/main/main.c +++ b/main/main.c @@ -1073,14 +1073,14 @@ static void php_error_cb(int type, const char *error_filename, const php_size_t MessageBox(NULL, buffer, error_type_str, MB_OK|ZEND_SERVICE_MB_STYLE); } #endif - spprintf(&log_buffer, 0, "PHP %s: %s in %s on line %d", error_type_str, buffer, error_filename, error_lineno); + spprintf(&log_buffer, 0, "PHP %s: %s in %s on line %pu", error_type_str, buffer, error_filename, error_lineno); php_log_err(log_buffer TSRMLS_CC); efree(log_buffer); } if (PG(display_errors) && ((module_initialized && !PG(during_request_startup)) || (PG(display_startup_errors)))) { if (PG(xmlrpc_errors)) { - php_printf("<?xml version=\"1.0\"?><methodResponse><fault><value><struct><member><name>faultCode</name><value><int>%ld</int></value></member><member><name>faultString</name><value><string>%s:%s in %s on line %d</string></value></member></struct></value></fault></methodResponse>", PG(xmlrpc_error_number), error_type_str, buffer, error_filename, error_lineno); + php_printf("<?xml version=\"1.0\"?><methodResponse><fault><value><struct><member><name>faultCode</name><value><int>%ld</int></value></member><member><name>faultString</name><value><string>%s:%s in %s on line %pu</string></value></member></struct></value></fault></methodResponse>", PG(xmlrpc_error_number), error_type_str, buffer, error_filename, error_lineno); } else { char *prepend_string = INI_STR("error_prepend_string"); char *append_string = INI_STR("error_append_string"); @@ -1089,10 +1089,10 @@ static void php_error_cb(int type, const char *error_filename, const php_size_t if (type == E_ERROR || type == E_PARSE) { size_t len; char *buf = php_escape_html_entities(buffer, buffer_len, &len, 0, ENT_COMPAT, NULL TSRMLS_CC); - php_printf("%s<br />\n<b>%s</b>: %s in <b>%s</b> on line <b>%d</b><br />\n%s", STR_PRINT(prepend_string), error_type_str, buf, error_filename, error_lineno, STR_PRINT(append_string)); + php_printf("%s<br />\n<b>%s</b>: %s in <b>%s</b> on line <b>%pu</b><br />\n%s", STR_PRINT(prepend_string), error_type_str, buf, error_filename, error_lineno, STR_PRINT(append_string)); efree(buf); } else { - php_printf("%s<br />\n<b>%s</b>: %s in <b>%s</b> on line <b>%d</b><br />\n%s", STR_PRINT(prepend_string), error_type_str, buffer, error_filename, error_lineno, STR_PRINT(append_string)); + php_printf("%s<br />\n<b>%s</b>: %s in <b>%s</b> on line <b>%pu</b><br />\n%s", STR_PRINT(prepend_string), error_type_str, buffer, error_filename, error_lineno, STR_PRINT(append_string)); } } else { /* Write CLI/CGI errors to stderr if display_errors = "stderr" */ @@ -1100,13 +1100,13 @@ static void php_error_cb(int type, const char *error_filename, const php_size_t PG(display_errors) == PHP_DISPLAY_ERRORS_STDERR ) { #ifdef PHP_WIN32 - fprintf(stderr, "%s: %s in %s on line %d\n", error_type_str, buffer, error_filename, error_lineno); + fprintf(stderr, "%s: %s in %s on line %pu\n", error_type_str, buffer, error_filename, error_lineno); fflush(stderr); #else - fprintf(stderr, "%s: %s in %s on line %d\n", error_type_str, buffer, error_filename, error_lineno); + fprintf(stderr, "%s: %s in %s on line %pu\n", error_type_str, buffer, error_filename, error_lineno); #endif } else { - php_printf("%s\n%s: %s in %s on line %d\n%s", STR_PRINT(prepend_string), error_type_str, buffer, error_filename, error_lineno, STR_PRINT(append_string)); + php_printf("%s\n%s: %s in %s on line %pu\n%s", STR_PRINT(prepend_string), error_type_str, buffer, error_filename, error_lineno, STR_PRINT(append_string)); } } }