diff options
| author | Jakub Zelenka <bukka@php.net> | 2014-12-27 19:42:04 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2014-12-27 19:42:04 +0000 |
| commit | b68da91d52801fb2cc4d2a4a44c859ea5b6c622b (patch) | |
| tree | 290f7c8ea7fd2df02c995b07c1d490c2de333db5 /ext/tokenizer/tokenizer.c | |
| parent | 4f6539bdaf62f0343f4ec67638d2f96e8c1c00ae (diff) | |
| parent | a9e86957c70c181e830ba05bb030c468d0cb15e1 (diff) | |
| download | php-git-b68da91d52801fb2cc4d2a4a44c859ea5b6c622b.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/config.m4
ext/json/config.w32
ext/json/json.c
ext/json/php_json.h
Diffstat (limited to 'ext/tokenizer/tokenizer.c')
| -rw-r--r-- | ext/tokenizer/tokenizer.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ext/tokenizer/tokenizer.c b/ext/tokenizer/tokenizer.c index 26e05c2be3..379fe5db7e 100644 --- a/ext/tokenizer/tokenizer.c +++ b/ext/tokenizer/tokenizer.c @@ -101,7 +101,7 @@ PHP_MINFO_FUNCTION(tokenizer) } /* }}} */ -static void tokenize(zval *return_value TSRMLS_DC) +static void tokenize(zval *return_value) { zval token; zval keyword; @@ -113,7 +113,7 @@ static void tokenize(zval *return_value TSRMLS_DC) array_init(return_value); ZVAL_NULL(&token); - while ((token_type = lex_scan(&token TSRMLS_CC))) { + while ((token_type = lex_scan(&token))) { destroy = 1; switch (token_type) { case T_CLOSE_TAG: @@ -181,23 +181,23 @@ PHP_FUNCTION(token_get_all) zval source_zval; zend_lex_state original_lex_state; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &source) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &source) == FAILURE) { return; } ZVAL_STR_COPY(&source_zval, source); - zend_save_lexical_state(&original_lex_state TSRMLS_CC); + zend_save_lexical_state(&original_lex_state); - if (zend_prepare_string_for_scanning(&source_zval, "" TSRMLS_CC) == FAILURE) { - zend_restore_lexical_state(&original_lex_state TSRMLS_CC); + if (zend_prepare_string_for_scanning(&source_zval, "") == FAILURE) { + zend_restore_lexical_state(&original_lex_state); RETURN_FALSE; } LANG_SCNG(yy_state) = yycINITIAL; - tokenize(return_value TSRMLS_CC); + tokenize(return_value); - zend_restore_lexical_state(&original_lex_state TSRMLS_CC); + zend_restore_lexical_state(&original_lex_state); zval_dtor(&source_zval); } /* }}} */ @@ -208,7 +208,7 @@ PHP_FUNCTION(token_name) { zend_long type; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &type) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &type) == FAILURE) { return; } |