com php-src: fixed ext/tokenizer: ext/tokenizer/php_tokenizer .h ext/tokenizer/tokenizer.c ext/tokenizer/tokenizer_ data.c

Commit: 22779fa66bfa7e464c690d865cdd5ea68a220b80 Author: Anatol Belski <ab@php.net> Fri, 29 Nov 2013 22:54:58 +0100 Parents: 9c16a4b96d23c66cd3b7f4f0bef3dc970f43e889 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=22779fa66bfa7e464c690d865cdd5ea68a220b80 Log: fixed ext/tokenizer Changed paths: M ext/tokenizer/php_tokenizer.h M ext/tokenizer/tokenizer..c M ext/tokenizer/tokenizer_data.c Diff: diff --git a/ext/tokenizer/php_tokenizer.h b/ext/tokenizer/php_tokenizer.h index 761556a..c1f8cd4 100644 --- a/ext/tokenizer/php_tokenizer.h +++ b/ext/tokenizer/php_tokenizer.h @@ -29,7 +29,7 @@ extern zend_module_entry tokenizer_module_entry; #endif void tokenizer_register_constants(INIT_FUNC_ARGS); -char *get_token_type_name(int token_type); +char *get_token_type_name(php_int_t token_type); PHP_MINIT_FUNCTION(tokenizer); diff --git a/ext/tokenizer/tokenizer.c b/ext/tokenizer/tokenizer.c index ee96e2e..900c721 100644 --- a/ext/tokenizer/tokenizer.c +++ b/ext/tokenizer/tokenizer.c @@ -181,11 +181,11 @@ PHP_FUNCTION(token_get_all) { char *source = NULL; int argc = ZEND_NUM_ARGS(); - int source_len; + zend_str_size_int source_len; zval source_z; zend_lex_state original_lex_state; - if (zend_parse_parameters(argc TSRMLS_CC, "s", &source, &source_len) == FAILURE) { + if (zend_parse_parameters(argc TSRMLS_CC, "S", &source, &source_len) == FAILURE) { return; } @@ -211,9 +211,9 @@ PHP_FUNCTION(token_get_all) PHP_FUNCTION(token_name) { int argc = ZEND_NUM_ARGS(); - long type; + php_int_t type; - if (zend_parse_parameters(argc TSRMLS_CC, "l", &type) == FAILURE) { + if (zend_parse_parameters(argc TSRMLS_CC, "i", &type) == FAILURE) { return; } RETVAL_STRING(get_token_type_name(type), 1); diff --git a/ext/tokenizer/tokenizer_data.c b/ext/tokenizer/tokenizer_data.c index 8c47865..9d94cb7 100644 --- a/ext/tokenizer/tokenizer_data.c +++ b/ext/tokenizer/tokenizer_data.c @@ -162,7 +162,7 @@ void tokenizer_register_constants(INIT_FUNC_ARGS) { REGISTER_LONG_CONSTANT("T_DOUBLE_COLON", T_PAAMAYIM_NEKUDOTAYIM, CONST_CS | CONST_PERSISTENT); } -char *get_token_type_name(int token_type) +char *get_token_type_name(php_int_t token_type) { switch (token_type) {