summaryrefslogtreecommitdiff
path: root/src/upb_glue.c
diff options
context:
space:
mode:
authorJoshua Haberman <joshua@reverberate.org>2011-05-21 17:35:21 -0700
committerJoshua Haberman <joshua@reverberate.org>2011-05-21 17:35:21 -0700
commita503b8859c37906ab5012db163daca43bfe393bb (patch)
treebabc144389856dbe29bacb48bdbe267b9a48e5b8 /src/upb_glue.c
parent2ccebb74c309c7ea4c4589b35893cdd6c996ac4b (diff)
Make all handlers objects refcounted.
I'm realizing that basically all upb objects will need to be refcounted to be sharable across languages, but *not* messages which are on their way out so we can get out of the business of data representations. Things which must be refcounted: - encoders, decoders - handlers objects - defs
Diffstat (limited to 'src/upb_glue.c')
-rw-r--r--src/upb_glue.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/upb_glue.c b/src/upb_glue.c
index d54b446..1422463 100644
--- a/src/upb_glue.c
+++ b/src/upb_glue.c
@@ -17,13 +17,13 @@ void upb_strtomsg(upb_string *str, upb_msg *msg, upb_msgdef *md,
upb_stringsrc_init(&strsrc);
upb_stringsrc_reset(&strsrc, str);
- upb_handlers h;
- upb_handlers_init(&h);
- upb_msg_reghandlers(&h, md);
+ upb_handlers *h = upb_handlers_new();
+ upb_msg_reghandlers(h, md);
upb_decoder d;
- upb_decoder_init(&d, &h);
+ upb_decoder_init(&d, h);
upb_decoder_reset(&d, upb_stringsrc_bytesrc(&strsrc), msg);
+ upb_handlers_unref(h);
upb_decoder_decode(&d, status);
@@ -38,13 +38,12 @@ void upb_msgtotext(upb_string *str, upb_msg *msg, upb_msgdef *md,
upb_stringsink_reset(&strsink, str);
upb_textprinter *p = upb_textprinter_new();
- upb_handlers h;
- upb_handlers_init(&h);
- upb_textprinter_reghandlers(&h, md);
+ upb_handlers *h = upb_handlers_new();
+ upb_textprinter_reghandlers(h, md);
upb_textprinter_reset(p, upb_stringsink_bytesink(&strsink), single_line);
upb_status status = UPB_STATUS_INIT;
- upb_msg_runhandlers(msg, md, &h, p, &status);
+ upb_msg_runhandlers(msg, md, h, p, &status);
// None of {upb_msg_runhandlers, upb_textprinter, upb_stringsink} should be
// capable of returning an error.
assert(upb_ok(&status));
@@ -52,6 +51,7 @@ void upb_msgtotext(upb_string *str, upb_msg *msg, upb_msgdef *md,
upb_stringsink_uninit(&strsink);
upb_textprinter_free(p);
+ upb_handlers_unref(h);
}
void upb_parsedesc(upb_symtab *symtab, upb_string *str, upb_status *status) {
@@ -59,12 +59,12 @@ void upb_parsedesc(upb_symtab *symtab, upb_string *str, upb_status *status) {
upb_stringsrc_init(&strsrc);
upb_stringsrc_reset(&strsrc, str);
- upb_handlers h;
- upb_handlers_init(&h);
- upb_defbuilder_reghandlers(&h);
+ upb_handlers *h = upb_handlers_new();
+ upb_defbuilder_reghandlers(h);
upb_decoder d;
- upb_decoder_init(&d, &h);
+ upb_decoder_init(&d, h);
+ upb_handlers_unref(h);
upb_defbuilder *b = upb_defbuilder_new(symtab);
upb_decoder_reset(&d, upb_stringsrc_bytesrc(&strsrc), b);
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback