From 5a49a3360598abbb2250bd5ebd01ed173a65f8ac Mon Sep 17 00:00:00 2001 From: Josh Haberman Date: Mon, 12 Sep 2016 11:06:56 -0700 Subject: Responded to CR comments. --- upb/descriptor/reader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'upb/descriptor/reader.c') diff --git a/upb/descriptor/reader.c b/upb/descriptor/reader.c index 2b9e0e9..e219f18 100644 --- a/upb/descriptor/reader.c +++ b/upb/descriptor/reader.c @@ -651,7 +651,6 @@ static void *msg_startext(void *closure, const void *hd) { return r; } -#include static void *msg_startfield(void *closure, const void *hd) { upb_descreader *r = closure; r->f = upb_fielddef_new(&r->f); @@ -667,6 +666,8 @@ static bool msg_endfield(void *closure, const void *hd) { bool ok; UPB_UNUSED(hd); + /* Oneof fields are added to the msgdef through their oneof, so don't need to + * be added here. */ if (upb_fielddef_containingoneof(r->f) == NULL) { ok = upb_msgdef_addfield(m, r->f, &r->f, NULL); UPB_ASSERT(ok); -- cgit v1.2.3