diff options
| author | Anatol Belski <ab@php.net> | 2014-08-16 11:37:14 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-16 11:37:14 +0200 |
| commit | cb25136f4ef1042295650475b2c20ace81e2b9b7 (patch) | |
| tree | 9d6a509c80f2ac1e094cd9d42772654781a79715 /Zend | |
| parent | f790043e30513c56f108289ec44ea6eb493f7773 (diff) | |
| download | php-git-cb25136f4ef1042295650475b2c20ace81e2b9b7.tar.gz | |
fix macros in the 5 basic extensions
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_API.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 91d2e40e7b..e94d49eabc 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -426,7 +426,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons double d; int type; - if ((type = is_numeric_string(Z_STRVAL_P(arg), Z_STRLEN_P(arg), p, &d, -1)) == 0) { + if ((type = is_numeric_string(Z_STRVAL_P(arg), Z_STRSIZE_P(arg), p, &d, -1)) == 0) { return "long"; } else if (type == IS_DOUBLE) { if (c == 'L') { @@ -439,7 +439,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons } } - *p = zend_dval_to_lval(d); + *p = zend_dval_to_ival(d); } } break; @@ -457,7 +457,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons case IS_NULL: case IS_FALSE: case IS_TRUE: - case IS_LONG: + case IS_INT: convert_to_int_ex(arg); *p = Z_IVAL_P(arg); break; @@ -472,7 +472,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons break; case 'i': - case 'i': + case 'I': { zend_int_t *p = va_arg(*va, zend_int_t *); @@ -490,7 +490,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons if ((type = is_numeric_string(Z_STRVAL_P(arg), Z_STRSIZE_P(arg), p, &d, -1)) == 0) { return "long"; } else if (type == IS_DOUBLE) { - if (c == 'L') { + if (c == 'I') { if (d > ZEND_INT_MAX) { *p = ZEND_INT_MAX; break; @@ -506,7 +506,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons break; case IS_DOUBLE: - if (c == 'L') { + if (c == 'I') { if (Z_DVAL_P(arg) > ZEND_INT_MAX) { *p = ZEND_INT_MAX; break; |