Commit: 0b8f946ea5648da8ac0830fb64d14cf43827eee1 Author: Anatol Belski <a...@php.net> Wed, 18 Dec 2013 14:53:48 -0800 Parents: d5daea505f852e211ed097f1acbaf13fdf4d59b8 Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0b8f946ea5648da8ac0830fb64d14cf43827eee1 Log: size_t part for *.y files Changed paths: M Zend/zend_ini_parser.y M Zend/zend_language_parser.y Diff: diff --git a/Zend/zend_ini_parser.y b/Zend/zend_ini_parser.y index 1fa70c6..f2bb419 100644 --- a/Zend/zend_ini_parser.y +++ b/Zend/zend_ini_parser.y @@ -104,7 +104,7 @@ static void zend_ini_init_string(zval *result) */ static void zend_ini_add_string(zval *result, zval *op1, zval *op2) { - zend_str_size length = Z_STRSIZE_P(op1) + Z_STRSIZE_P(op2); + zend_size_t length = Z_STRSIZE_P(op1) + Z_STRSIZE_P(op2); Z_STRVAL_P(result) = (char *) realloc(Z_STRVAL_P(op1), length+1); memcpy(Z_STRVAL_P(result)+Z_STRSIZE_P(op1), Z_STRVAL_P(op2), Z_STRSIZE_P(op2)); @@ -163,7 +163,7 @@ static void zend_ini_get_var(zval *result, zval *name TSRMLS_DC) static void ini_error(char *msg) { char *error_buf; - zend_str_size error_buf_len; + zend_size_t error_buf_len; char *currently_parsed_filename; TSRMLS_FETCH(); diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 6028f8d..bf80230 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -1300,7 +1300,7 @@ static YYSIZE_T zend_yytnamerr(char *yyres, const char *yystr) if (CG(parse_error) == 0) { char buffer[120]; const unsigned char *end, *str, *tok1 = NULL, *tok2 = NULL; - zend_str_size len = 0, toklen = 0, yystr_len; + zend_size_t len = 0, toklen = 0, yystr_len; CG(parse_error) = 1; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
