diff options
Diffstat (limited to 'ext/standard/image.c')
| -rw-r--r-- | ext/standard/image.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/ext/standard/image.c b/ext/standard/image.c index 22b2d7ed2f..9deb5a8a74 100644 --- a/ext/standard/image.c +++ b/ext/standard/image.c @@ -1217,9 +1217,9 @@ PHP_FUNCTION(image_type_to_mime_type) { zend_long p_image_type; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &p_image_type) == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_LONG(p_image_type) + ZEND_PARSE_PARAMETERS_END(); ZVAL_STRING(return_value, (char*)php_image_type_to_mime_type(p_image_type)); } @@ -1232,9 +1232,11 @@ PHP_FUNCTION(image_type_to_extension) zend_long image_type; zend_bool inc_dot=1; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|b", &image_type, &inc_dot) == FAILURE) { - RETURN_FALSE; - } + ZEND_PARSE_PARAMETERS_START(1, 2) + Z_PARAM_LONG(image_type) + Z_PARAM_OPTIONAL + Z_PARAM_BOOL(inc_dot) + ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE); switch (image_type) { case IMAGE_FILETYPE_GIF: @@ -1470,12 +1472,14 @@ static void php_getimagesize_from_any(INTERNAL_FUNCTION_PARAMETERS, int mode) { size_t input_len; const int argc = ZEND_NUM_ARGS(); - if (zend_parse_parameters(argc, "s|z/", &input, &input_len, &info) == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_START(1, 2) + Z_PARAM_STRING(input, input_len) + Z_PARAM_OPTIONAL + Z_PARAM_ZVAL_DEREF(info) + ZEND_PARSE_PARAMETERS_END(); if (argc == 2) { - zval_dtor(info); + zval_ptr_dtor(info); array_init(info); } |