diff options
author | Joshua Haberman <joshua@reverberate.org> | 2011-02-05 18:53:32 -0800 |
---|---|---|
committer | Joshua Haberman <joshua@reverberate.org> | 2011-02-05 18:53:32 -0800 |
commit | 3affb319260263efc3cee502896d9f981186c7da (patch) | |
tree | 6d519e32a23dc1d3b03c3da0791fd2ea00f154f4 /stream/upb_strstream.c | |
parent | e170259e4ababf39829fa9339fdf0817e38c949e (diff) |
Tons of work: we're close to passing test_vs_proto2 again.
Diffstat (limited to 'stream/upb_strstream.c')
-rw-r--r-- | stream/upb_strstream.c | 44 |
1 files changed, 19 insertions, 25 deletions
diff --git a/stream/upb_strstream.c b/stream/upb_strstream.c index d3fd4e0..8a230ae 100644 --- a/stream/upb_strstream.c +++ b/stream/upb_strstream.c @@ -9,25 +9,6 @@ #include <stdlib.h> #include "upb_string.h" -struct upb_stringsrc { - upb_bytesrc bytesrc; - upb_string *str; - upb_strlen_t offset; -}; - -void upb_stringsrc_reset(upb_stringsrc *s, upb_string *str) { - if (str != s->str) { - if (s->str) upb_string_unref(s->str); - s->str = upb_string_getref(str); - } - s->bytesrc.eof = false; -} - -void upb_stringsrc_free(upb_stringsrc *s) { - if (s->str) upb_string_unref(s->str); - free(s); -} - static upb_strlen_t upb_stringsrc_read(upb_bytesrc *_src, void *buf, upb_strlen_t count, upb_status *status) { upb_stringsrc *src = (upb_stringsrc*)_src; @@ -45,27 +26,40 @@ static upb_strlen_t upb_stringsrc_read(upb_bytesrc *_src, void *buf, static bool upb_stringsrc_getstr(upb_bytesrc *_src, upb_string *str, upb_status *status) { upb_stringsrc *src = (upb_stringsrc*)_src; - if (src->offset == upb_string_len(str)) { + if (src->offset == upb_string_len(src->str)) { upb_seterr(status, UPB_EOF, ""); return false; } else { - upb_string_substr(str, src->str, 0, upb_string_len(src->str)); + upb_strlen_t len = upb_string_len(src->str) - src->offset; + upb_string_substr(str, src->str, src->offset, len); + src->offset += len; + assert(src->offset == upb_string_len(src->str)); return true; } } -upb_stringsrc *upb_stringsrc_new() { +void upb_stringsrc_init(upb_stringsrc *s) { static upb_bytesrc_vtbl bytesrc_vtbl = { upb_stringsrc_read, upb_stringsrc_getstr, }; - - upb_stringsrc *s = malloc(sizeof(*s)); s->str = NULL; upb_bytesrc_init(&s->bytesrc, &bytesrc_vtbl); - return s; } +void upb_stringsrc_reset(upb_stringsrc *s, upb_string *str) { + if (str != s->str) { + upb_string_unref(s->str); + s->str = upb_string_getref(str); + } + s->offset = 0; +} + +void upb_stringsrc_uninit(upb_stringsrc *s) { + upb_string_unref(s->str); +} + + upb_bytesrc *upb_stringsrc_bytesrc(upb_stringsrc *s) { return &s->bytesrc; } |