ExternalVendorCode/tippecanoe
1
0
Fork 0
mirror of https://github.com/mapbox/tippecanoe.git synced 2025-05-29 22:04:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Match documented function names

Browse Source
This commit is contained in:
Eric Fischer 2014-02-07 16:49:52 -08:00
parent 45049fb874
commit 1cbf8a813e
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jsoncat.c
View File

@ -112,7 +112,7 @@ void process_callback(FILE *f, char *fname) {
json_object *j; json_object *j;
int level = 0; int level = 0;
while ((j = json_parse_with_separators(jp, callback, &level)) != NULL) { while ((j = json_read_with_separators(jp, callback, &level)) != NULL) {
json_print_one(j, &level); json_print_one(j, &level);
json_free(j); json_free(j);
} }
@ -126,7 +126,7 @@ void process(FILE *f, char *fname) {
json_pull *jp = json_begin_file(f); json_pull *jp = json_begin_file(f);
json_object *j; json_object *j;
while ((j = json_parse(jp)) != NULL) { while ((j = json_read(jp)) != NULL) {
if (j->parent == NULL) { if (j->parent == NULL) {
json_print(j, 0); json_print(j, 0);
json_free(j); json_free(j);

6
jsonpull.c
View File

@ -174,7 +174,7 @@ static void string_free(struct string *s) {
free(s->buf); free(s->buf);
} }
json_object *json_parse_with_separators(json_pull *j, json_separator_callback cb, void *state) { json_object *json_read_with_separators(json_pull *j, json_separator_callback cb, void *state) {
int c; int c;
again: again:
/////////////////////////// Whitespace /////////////////////////// Whitespace
@ -474,8 +474,8 @@ again:
return NULL; return NULL;
} }
json_object *json_parse(json_pull *j) { json_object *json_read(json_pull *j) {
return json_parse_with_separators(j, NULL, NULL); return json_read_with_separators(j, NULL, NULL);
} }
void json_free(json_object *o) { void json_free(json_object *o) {

8
jsonpull.h
View File

@ -1,8 +1,8 @@
typedef enum json_type { typedef enum json_type {
// These types can be returned by json_parse() // These types can be returned by json_read()
JSON_HASH, JSON_ARRAY, JSON_NUMBER, JSON_STRING, JSON_TRUE, JSON_FALSE, JSON_NULL, JSON_HASH, JSON_ARRAY, JSON_NUMBER, JSON_STRING, JSON_TRUE, JSON_FALSE, JSON_NULL,
// These and JSON_HASH and JSON_ARRAY can be called back by json_parse_with_separators() // These and JSON_HASH and JSON_ARRAY can be called back by json_read_with_separators()
JSON_COMMA, JSON_COLON, JSON_COMMA, JSON_COLON,
// These are only used internally as expectations of what comes next // These are only used internally as expectations of what comes next
@ -43,8 +43,8 @@ json_pull *json_begin_file(FILE *f);
json_pull *json_begin_string(char *s); json_pull *json_begin_string(char *s);
json_pull *json_begin(int (*read)(struct json_pull *), int (*peek)(struct json_pull *), void *source); json_pull *json_begin(int (*read)(struct json_pull *), int (*peek)(struct json_pull *), void *source);
json_object *json_parse(json_pull *j); json_object *json_read(json_pull *j);
json_object *json_parse_with_separators(json_pull *j, json_separator_callback cb, void *state); json_object *json_read_with_separators(json_pull *j, json_separator_callback cb, void *state);
void json_free(json_object *j); void json_free(json_object *j);
json_object *json_hash_get(json_object *o, char *s); json_object *json_hash_get(json_object *o, char *s);