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/json/json_parser.y | |
| 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/json/json_parser.y')
| -rw-r--r-- | ext/json/json_parser.y | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/ext/json/json_parser.y b/ext/json/json_parser.y index dbacc3d483..4af46ecbd1 100644 --- a/ext/json/json_parser.y +++ b/ext/json/json_parser.y @@ -158,14 +158,13 @@ errlex: %% /* Functions */ -void php_json_parser_init(php_json_parser *parser, zval *return_value, char *str, int str_len, long options, long max_depth TSRMLS_DC) +void php_json_parser_init(php_json_parser *parser, zval *return_value, char *str, int str_len, long options, long max_depth) { memset(parser, 0, sizeof(php_json_parser)); php_json_scanner_init(&parser->scanner, str, str_len, options); parser->depth = 1; parser->max_depth = max_depth; parser->return_value = return_value; - TSRMLS_SET_CTX(parser->zts_ctx); } php_json_error_code php_json_parser_error_code(php_json_parser *parser) @@ -175,7 +174,6 @@ php_json_error_code php_json_parser_error_code(php_json_parser *parser) void php_json_parser_object_init(php_json_parser *parser, zval *object) { - TSRMLS_FETCH_FROM_CTX(parser->zts_ctx); if (parser->scanner.options & PHP_JSON_OBJECT_AS_ARRAY) { array_init(object); } else { @@ -187,7 +185,6 @@ void php_json_parser_object_update(php_json_parser *parser, zval *object, zval * { char *key = Z_STRVAL_P(zkey); int key_len = Z_STRLEN_P(zkey); - TSRMLS_FETCH_FROM_CTX(parser->zts_ctx); if (parser->scanner.options & PHP_JSON_OBJECT_AS_ARRAY) { add_assoc_zval_ex(object, key, key_len, zvalue); @@ -217,8 +214,7 @@ void php_json_parser_array_append(zval *array, zval *zvalue) int php_json_yylex(union YYSTYPE *value, php_json_parser *parser) { - TSRMLS_FETCH_FROM_CTX(parser->zts_ctx); - int token = php_json_scan(&parser->scanner TSRMLS_CC); + int token = php_json_scan(&parser->scanner); value->value = parser->scanner.value; return token; } |