Fix JSON_INTEGER overflow on Windows by changing datatype to 'long long'

Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/json.c b/json.c
index cba370ab4bdc59f70c425f9cea38fd63f4e47829..7480a61fa98939519f3306fa583977fd8d331f40 100644 (file)
--- a/json.c
+++ b/json.c
@@ -35,7 +35,7 @@ static struct json_pair *json_create_pair(const char *name, struct json_value *v
        return pair;
 }
 
        return pair;
 }
 

-static struct json_value *json_create_value_int(long number)
+static struct json_value *json_create_value_int(long long number)

 {
        struct json_value *value = malloc(sizeof(struct json_value));
 
 {
        struct json_value *value = malloc(sizeof(struct json_value));
 


@@ -212,7 +212,7 @@ int json_object_add_value_type(struct json_object *obj, const char *name, int ty
        if (type == JSON_TYPE_STRING)
                value = json_create_value_string(va_arg(args, char *));
        else if (type == JSON_TYPE_INTEGER)
        if (type == JSON_TYPE_STRING)
                value = json_create_value_string(va_arg(args, char *));
        else if (type == JSON_TYPE_INTEGER)

-               value = json_create_value_int(va_arg(args, long));
+               value = json_create_value_int(va_arg(args, long long));

        else if (type == JSON_TYPE_FLOAT)
                value = json_create_value_float(va_arg(args, double));
        else if (type == JSON_TYPE_OBJECT)
        else if (type == JSON_TYPE_FLOAT)
                value = json_create_value_float(va_arg(args, double));
        else if (type == JSON_TYPE_OBJECT)


@@ -248,7 +248,7 @@ int json_array_add_value_type(struct json_array *array, int type, ...)
        if (type == JSON_TYPE_STRING)
                value = json_create_value_string(va_arg(args, char *));
        else if (type == JSON_TYPE_INTEGER)
        if (type == JSON_TYPE_STRING)
                value = json_create_value_string(va_arg(args, char *));
        else if (type == JSON_TYPE_INTEGER)

-               value = json_create_value_int(va_arg(args, long));
+               value = json_create_value_int(va_arg(args, long long));

        else if (type == JSON_TYPE_FLOAT)
                value = json_create_value_float(va_arg(args, double));
        else if (type == JSON_TYPE_OBJECT)
        else if (type == JSON_TYPE_FLOAT)
                value = json_create_value_float(va_arg(args, double));
        else if (type == JSON_TYPE_OBJECT)


@@ -350,7 +350,7 @@ static void json_print_value(struct json_value *value)
                log_info("\"%s\"", value->string);
                break;
        case JSON_TYPE_INTEGER:
                log_info("\"%s\"", value->string);
                break;
        case JSON_TYPE_INTEGER:

-               log_info("%ld", value->integer_number);
+               log_info("%lld", value->integer_number);

                break;
        case JSON_TYPE_FLOAT:
                log_info("%.2f", value->float_number);
                break;
        case JSON_TYPE_FLOAT:
                log_info("%.2f", value->float_number);

diff --git a/json.h b/json.h
index 2a798ceb4b06d4fc41203096fbb3eb9f4f9749b2..081afd6c6f0b4adfe929648b0f4d5b60639d1ee1 100644 (file)
--- a/json.h
+++ b/json.h
@@ -14,7 +14,7 @@ struct json_pair;
 struct json_value {
        int type;
        union {
 struct json_value {
        int type;
        union {

-               long integer_number;
+               long long integer_number;

                double float_number;
                char *string;
                struct json_object *object;
                double float_number;
                char *string;
                struct json_object *object;