From b70d19288e97d55a69e74de5f05dd6f062e5e254 Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Wed, 3 Jun 2015 11:31:41 -0700 Subject: [PATCH] Get back in sync with json-pull --- jsonpull.c | 25 +++++++++---------------- jsonpull.h | 3 --- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/jsonpull.c b/jsonpull.c index 764b1a2..5c5928d 100644 --- a/jsonpull.c +++ b/jsonpull.c @@ -58,29 +58,22 @@ json_pull *json_begin_file(FILE *f) { return json_begin(read_file, f); } -#if 0 -static int read_string(json_pull *j) { +static int read_string(json_pull *j, char *buffer, int n) { char *cp = j->source; - if (*cp == '\0') { - return EOF; - } - int c = (unsigned char) *cp; - j->source = cp + 1; - return c; -} + int out = 0; -static int peek_string(json_pull *p) { - char *cp = p->source; - if (*cp == '\0') { - return EOF; + while (out < n && cp[out] != '\0') { + buffer[out] = cp[out]; + out++; } - return (unsigned char) *cp; + + j->source = cp + out; + return out; } json_pull *json_begin_string(char *s) { - return json_begin(read_string, peek_string, s); + return json_begin(read_string, s); } -#endif void json_end(json_pull *p) { free(p->buffer); diff --git a/jsonpull.h b/jsonpull.h index 2915329..f5ccbee 100644 --- a/jsonpull.h +++ b/jsonpull.h @@ -48,10 +48,7 @@ typedef struct json_pull { } json_pull; json_pull *json_begin_file(FILE *f); - -#if 0 json_pull *json_begin_string(char *s); -#endif json_pull *json_begin(int (*read)(struct json_pull *, char *buffer, int n), void *source); void json_end(json_pull *p);