X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fjson.c;h=58b248a06725893ec1800f95c5e180346c50a00c;hb=HEAD;hp=06a9a424ae2119ca738de2fa412891e4ed338389;hpb=780325b5b8d4c0552b4b7719e0a38200d99f6b08;p=sliver-openvswitch.git diff --git a/lib/json.c b/lib/json.c index 06a9a424a..58b248a06 100644 --- a/lib/json.c +++ b/lib/json.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, 2011, 2012, 2013 Nicira, Inc. + * Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -355,7 +355,7 @@ json_destroy(struct json *json) break; case JSON_N_TYPES: - NOT_REACHED(); + OVS_NOT_REACHED(); } free(json); } @@ -417,7 +417,7 @@ json_clone(const struct json *json) case JSON_N_TYPES: default: - NOT_REACHED(); + OVS_NOT_REACHED(); } } @@ -502,7 +502,7 @@ json_hash(const struct json *json, size_t basis) case JSON_N_TYPES: default: - NOT_REACHED(); + OVS_NOT_REACHED(); } } @@ -573,7 +573,7 @@ json_equal(const struct json *a, const struct json *b) case JSON_N_TYPES: default: - NOT_REACHED(); + OVS_NOT_REACHED(); } } @@ -620,11 +620,11 @@ json_lex_number(struct json_parser *p) significand = 0; if (*cp == '0') { cp++; - if (isdigit(*cp)) { + if (isdigit((unsigned char) *cp)) { json_error(p, "leading zeros not allowed"); return; } - } else if (isdigit(*cp)) { + } else if (isdigit((unsigned char) *cp)) { do { if (significand <= ULLONG_MAX / 10) { significand = significand * 10 + (*cp - '0'); @@ -635,7 +635,7 @@ json_lex_number(struct json_parser *p) } } cp++; - } while (isdigit(*cp)); + } while (isdigit((unsigned char) *cp)); } else { json_error(p, "'-' must be followed by digit"); return; @@ -644,7 +644,7 @@ json_lex_number(struct json_parser *p) /* Optional fraction. */ if (*cp == '.') { cp++; - if (!isdigit(*cp)) { + if (!isdigit((unsigned char) *cp)) { json_error(p, "decimal point must be followed by digit"); return; } @@ -656,7 +656,7 @@ json_lex_number(struct json_parser *p) imprecise = true; } cp++; - } while (isdigit(*cp)); + } while (isdigit((unsigned char) *cp)); } /* Optional exponent. */ @@ -672,7 +672,7 @@ json_lex_number(struct json_parser *p) cp++; } - if (!isdigit(*cp)) { + if (!isdigit((unsigned char) *cp)) { json_error(p, "exponent must contain at least one digit"); return; } @@ -685,7 +685,7 @@ json_lex_number(struct json_parser *p) } exponent = exponent * 10 + (*cp - '0'); cp++; - } while (isdigit(*cp)); + } while (isdigit((unsigned char) *cp)); if (negative_exponent) { pow10 -= exponent; @@ -1026,7 +1026,8 @@ json_from_file(const char *file_name) stream = fopen(file_name, "r"); if (!stream) { return json_string_create_nocopy( - xasprintf("error opening \"%s\": %s", file_name, strerror(errno))); + xasprintf("error opening \"%s\": %s", file_name, + ovs_strerror(errno))); } json = json_from_stream(stream); fclose(stream); @@ -1063,7 +1064,7 @@ json_from_stream(FILE *stream) if (ferror(stream)) { json_destroy(json); json = json_string_create_nocopy( - xasprintf("error reading JSON stream: %s", strerror(errno))); + xasprintf("error reading JSON stream: %s", ovs_strerror(errno))); } return json; @@ -1174,7 +1175,7 @@ json_parser_put_value(struct json_parser *p, struct json *value) } else if (node->json->type == JSON_ARRAY) { json_array_add(node->json, value); } else { - NOT_REACHED(); + OVS_NOT_REACHED(); } } @@ -1294,7 +1295,7 @@ json_parser_pop(struct json_parser *p) } else if (node->json->type == JSON_OBJECT) { p->parse_state = JSON_PARSE_OBJECT_NEXT; } else { - NOT_REACHED(); + OVS_NOT_REACHED(); } } } @@ -1501,7 +1502,7 @@ json_serialize(const struct json *json, struct json_serializer *s) case JSON_N_TYPES: default: - NOT_REACHED(); + OVS_NOT_REACHED(); } } @@ -1639,116 +1640,3 @@ json_serialize_string(const char *string, struct ds *ds) } ds_put_char(ds, '"'); } - -static size_t -json_string_serialized_length(const char *string) -{ - size_t length; - uint8_t c; - - length = strlen("\"\""); - - while ((c = *string++) != '\0') { - switch (c) { - case '"': - case '\\': - case '\b': - case '\f': - case '\n': - case '\r': - case '\t': - length += 2; - break; - - default: - if (c >= 32) { - length++; - } else { - /* \uXXXX */ - length += 6; - } - break; - } - } - - return length; -} - -static size_t -json_object_serialized_length(const struct shash *object) -{ - size_t length = strlen("{}"); - - if (!shash_is_empty(object)) { - struct shash_node *node; - - /* Commas and colons. */ - length += 2 * shash_count(object) - 1; - - SHASH_FOR_EACH (node, object) { - const struct json *value = node->data; - - length += json_string_serialized_length(node->name); - length += json_serialized_length(value); - } - } - - return length; -} - -static size_t -json_array_serialized_length(const struct json_array *array) -{ - size_t length = strlen("[]"); - - if (array->n) { - size_t i; - - /* Commas. */ - length += array->n - 1; - - for (i = 0; i < array->n; i++) { - length += json_serialized_length(array->elems[i]); - } - } - - return length; -} - -/* Returns strlen(json_to_string(json, 0)), that is, the number of bytes in the - * JSON output by json_to_string() for 'json' when JSSF_PRETTY is not - * requested. (JSSF_SORT does not affect the length of json_to_string()'s - * output.) */ -size_t -json_serialized_length(const struct json *json) -{ - switch (json->type) { - case JSON_NULL: - return strlen("null"); - - case JSON_FALSE: - return strlen("false"); - - case JSON_TRUE: - return strlen("true"); - - case JSON_OBJECT: - return json_object_serialized_length(json->u.object); - - case JSON_ARRAY: - return json_array_serialized_length(&json->u.array); - - case JSON_INTEGER: - return snprintf(NULL, 0, "%lld", json->u.integer); - - case JSON_REAL: - return snprintf(NULL, 0, "%.*g", DBL_DIG, json->u.real); - - case JSON_STRING: - return json_string_serialized_length(json->u.string); - - case JSON_N_TYPES: - default: - NOT_REACHED(); - } -}