fix datatype mismatches

diff --git a/ext/json/json_encoder.c b/ext/json/json_encoder.c
index 39b93b3adc7b4bcf26a724dd49d4c0eefd0ac157..11630c9e5829877f13135330d16d38cd67a95247 100644 (file)
--- 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 3ddf260e7c8ad120eef2387140814a992a9d54c9..7c0754a483875f2e07b0a7bef529f4f420aa9246 100644 (file)
--- 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 474602ad341dfb90565f80902bf7cde5d97feb4f..38d520150d5a3362195dd12816b918599fd6cc97 100644 (file)
--- 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);