simple_parse.c (jansson-2.13.1.tar.bz2) | : | simple_parse.c (jansson-2.14.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 33 | skipping to change at line 33 | |||
*/ | */ | |||
#include <jansson.h> | #include <jansson.h> | |||
#include <stdio.h> | #include <stdio.h> | |||
#include <stdlib.h> | #include <stdlib.h> | |||
/* forward refs */ | /* forward refs */ | |||
void print_json(json_t *root); | void print_json(json_t *root); | |||
void print_json_aux(json_t *element, int indent); | void print_json_aux(json_t *element, int indent); | |||
void print_json_indent(int indent); | void print_json_indent(int indent); | |||
const char *json_plural(int count); | const char *json_plural(size_t count); | |||
void print_json_object(json_t *element, int indent); | void print_json_object(json_t *element, int indent); | |||
void print_json_array(json_t *element, int indent); | void print_json_array(json_t *element, int indent); | |||
void print_json_string(json_t *element, int indent); | void print_json_string(json_t *element, int indent); | |||
void print_json_integer(json_t *element, int indent); | void print_json_integer(json_t *element, int indent); | |||
void print_json_real(json_t *element, int indent); | void print_json_real(json_t *element, int indent); | |||
void print_json_true(json_t *element, int indent); | void print_json_true(json_t *element, int indent); | |||
void print_json_false(json_t *element, int indent); | void print_json_false(json_t *element, int indent); | |||
void print_json_null(json_t *element, int indent); | void print_json_null(json_t *element, int indent); | |||
void print_json(json_t *root) { print_json_aux(root, 0); } | void print_json(json_t *root) { print_json_aux(root, 0); } | |||
skipping to change at line 83 | skipping to change at line 83 | |||
} | } | |||
} | } | |||
void print_json_indent(int indent) { | void print_json_indent(int indent) { | |||
int i; | int i; | |||
for (i = 0; i < indent; i++) { | for (i = 0; i < indent; i++) { | |||
putchar(' '); | putchar(' '); | |||
} | } | |||
} | } | |||
const char *json_plural(int count) { return count == 1 ? "" : "s"; } | const char *json_plural(size_t count) { return count == 1 ? "" : "s"; } | |||
void print_json_object(json_t *element, int indent) { | void print_json_object(json_t *element, int indent) { | |||
size_t size; | size_t size; | |||
const char *key; | const char *key; | |||
json_t *value; | json_t *value; | |||
print_json_indent(indent); | print_json_indent(indent); | |||
size = json_object_size(element); | size = json_object_size(element); | |||
printf("JSON Object of %ld pair%s:\n", size, json_plural(size)); | printf("JSON Object of %lld pair%s:\n", (long long)size, json_plural(size)); | |||
json_object_foreach(element, key, value) { | json_object_foreach(element, key, value) { | |||
print_json_indent(indent + 2); | print_json_indent(indent + 2); | |||
printf("JSON Key: \"%s\"\n", key); | printf("JSON Key: \"%s\"\n", key); | |||
print_json_aux(value, indent + 2); | print_json_aux(value, indent + 2); | |||
} | } | |||
} | } | |||
void print_json_array(json_t *element, int indent) { | void print_json_array(json_t *element, int indent) { | |||
size_t i; | size_t i; | |||
size_t size = json_array_size(element); | size_t size = json_array_size(element); | |||
print_json_indent(indent); | print_json_indent(indent); | |||
printf("JSON Array of %ld element%s:\n", size, json_plural(size)); | printf("JSON Array of %lld element%s:\n", (long long)size, json_plural(size) ); | |||
for (i = 0; i < size; i++) { | for (i = 0; i < size; i++) { | |||
print_json_aux(json_array_get(element, i), indent + 2); | print_json_aux(json_array_get(element, i), indent + 2); | |||
} | } | |||
} | } | |||
void print_json_string(json_t *element, int indent) { | void print_json_string(json_t *element, int indent) { | |||
print_json_indent(indent); | print_json_indent(indent); | |||
printf("JSON String: \"%s\"\n", json_string_value(element)); | printf("JSON String: \"%s\"\n", json_string_value(element)); | |||
} | } | |||
End of changes. 4 change blocks. | ||||
4 lines changed or deleted | 4 lines changed or added |