diff options
| author | Anatol Belski <ab@php.net> | 2015-03-25 10:59:05 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-03-25 15:32:35 +0100 |
| commit | fe36285de20a09760777fa674614a36b00b13cd1 (patch) | |
| tree | 6066c28df2b2fa4b5e12ab4bb95444664cebf5e6 | |
| parent | 0ae011f3a7ed17fb1d0081f766ce5b5b73c759a6 (diff) | |
| download | php-git-fe36285de20a09760777fa674614a36b00b13cd1.tar.gz | |
fix datatype mismatches
| -rw-r--r-- | ext/json/json_encoder.c | 2 | ||||
| -rw-r--r-- | ext/json/json_parser.tab.c | 2 | ||||
| -rw-r--r-- | ext/json/json_parser.y | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ext/json/json_encoder.c b/ext/json/json_encoder.c index 39b93b3adc..11630c9e58 100644 --- a/ext/json/json_encoder.c +++ b/ext/json/json_encoder.c @@ -104,7 +104,7 @@ static inline void php_json_encode_double(smart_str *buf, double d, int options) { size_t len; char num[PHP_JSON_DOUBLE_MAX_LENGTH]; - php_gcvt(d, EG(precision), '.', 'e', &num[0]); + php_gcvt(d, (int)EG(precision), '.', 'e', &num[0]); len = strlen(num); if (options & PHP_JSON_PRESERVE_ZERO_FRACTION && strchr(num, '.') == NULL && len < PHP_JSON_DOUBLE_MAX_LENGTH - 2) { num[len++] = '.'; diff --git a/ext/json/json_parser.tab.c b/ext/json/json_parser.tab.c index 3ddf260e7c..7c0754a483 100644 --- a/ext/json/json_parser.tab.c +++ b/ext/json/json_parser.tab.c @@ -1817,7 +1817,7 @@ void php_json_parser_object_init(php_json_parser *parser, zval *object) void php_json_parser_object_update(php_json_parser *parser, zval *object, zval *zkey, zval *zvalue) { char *key = Z_STRVAL_P(zkey); - int key_len = Z_STRLEN_P(zkey); + size_t key_len = Z_STRLEN_P(zkey); if (parser->scanner.options & PHP_JSON_OBJECT_AS_ARRAY) { add_assoc_zval_ex(object, key, key_len, zvalue); diff --git a/ext/json/json_parser.y b/ext/json/json_parser.y index 474602ad34..38d520150d 100644 --- a/ext/json/json_parser.y +++ b/ext/json/json_parser.y @@ -188,7 +188,7 @@ void php_json_parser_object_init(php_json_parser *parser, zval *object) void php_json_parser_object_update(php_json_parser *parser, zval *object, zval *zkey, zval *zvalue) { char *key = Z_STRVAL_P(zkey); - int key_len = Z_STRLEN_P(zkey); + size_t key_len = Z_STRLEN_P(zkey); if (parser->scanner.options & PHP_JSON_OBJECT_AS_ARRAY) { add_assoc_zval_ex(object, key, key_len, zvalue); |