diff options
| -rw-r--r-- | ext/json/json.c | 6 | ||||
| -rw-r--r-- | ext/json/json_parser.y | 2 | ||||
| -rw-r--r-- | ext/json/php_json_parser.h | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/ext/json/json.c b/ext/json/json.c index 0f8fdfb132..b40cb695d7 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -191,7 +191,7 @@ PHP_JSON_API void php_json_decode_ex(zval *return_value, char *str, size_t str_l { php_json_parser parser; - php_json_parser_init(&parser, return_value, str, str_len, options, depth); + php_json_parser_init(&parser, return_value, str, str_len, (int)options, (int)depth); if (php_json_yyparse(&parser)) { JSON_G(error_code) = php_json_parser_error_code(&parser); @@ -215,9 +215,9 @@ static PHP_FUNCTION(json_encode) JSON_G(error_code) = PHP_JSON_ERROR_NONE; - JSON_G(encode_max_depth) = depth; + JSON_G(encode_max_depth) = (int)depth; - php_json_encode(&buf, parameter, options); + php_json_encode(&buf, parameter, (int)options); if (JSON_G(error_code) != PHP_JSON_ERROR_NONE && !(options & PHP_JSON_PARTIAL_OUTPUT_ON_ERROR)) { smart_str_free(&buf); diff --git a/ext/json/json_parser.y b/ext/json/json_parser.y index eef2c4a98c..221dcb6982 100644 --- a/ext/json/json_parser.y +++ b/ext/json/json_parser.y @@ -163,7 +163,7 @@ errlex: %% /* Functions */ -void php_json_parser_init(php_json_parser *parser, zval *return_value, char *str, size_t str_len, long options, long max_depth) +void php_json_parser_init(php_json_parser *parser, zval *return_value, char *str, size_t str_len, int options, int max_depth) { memset(parser, 0, sizeof(php_json_parser)); php_json_scanner_init(&parser->scanner, str, str_len, options); diff --git a/ext/json/php_json_parser.h b/ext/json/php_json_parser.h index cc43d44e9d..a9d9279a89 100644 --- a/ext/json/php_json_parser.h +++ b/ext/json/php_json_parser.h @@ -25,11 +25,11 @@ typedef struct _php_json_parser { php_json_scanner scanner; zval *return_value; - long depth; - long max_depth; + int depth; + int max_depth; } php_json_parser; -void php_json_parser_init(php_json_parser *parser, zval *return_value, char *str, size_t str_len, long options, long max_depth); +void php_json_parser_init(php_json_parser *parser, zval *return_value, char *str, size_t str_len, int options, int max_depth); php_json_error_code php_json_parser_error_code(php_json_parser *parser); |