com php-src: fix zpp: Zend/zend_builtin_functions.c

From: Date: Thu, 21 Aug 2014 13:25:39 +0000
Subject: com php-src: fix zpp: Zend/zend_builtin_functions.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-80706@lists.php.net to get a copy of this message
Commit: f7c8213741cb3e19b8f8e7889c760491843fc13f Author: Anatol Belski <ab@php.net> Thu, 21 Aug 2014 15:25:39 +0200 Parents: 8b2f1ac1771e6c18993dbea8bbfad24dca07de36 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f7c8213741cb3e19b8f8e7889c760491843fc13f Log: fix zpp Changed paths: M Zend/zend_builtin_functions.c Diff: diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 04d10c3..e89f199 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -438,7 +438,7 @@ ZEND_FUNCTION(func_get_arg) arg_count = ex->num_args; if (requested_offset >= arg_count) { - zend_error(E_WARNING, "func_get_arg(): Argument %ld not passed to function", requested_offset); + zend_error(E_WARNING, "func_get_arg(): Argument " ZEND_INT_FMT " not passed to function", requested_offset); RETURN_FALSE; } @@ -1546,7 +1546,7 @@ ZEND_FUNCTION(trigger_error) char *message; int message_len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &message, &message_len, &error_type) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|i", &message, &message_len, &error_type) == FAILURE) { return; } @@ -1576,7 +1576,7 @@ ZEND_FUNCTION(set_error_handler) zend_string *error_handler_name = NULL; zend_int_t error_type = E_ALL; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|l", &error_handler, &error_type) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|i", &error_handler, &error_type) == FAILURE) { return; }

« previous php.cvs (#80706) next »