summaryrefslogtreecommitdiff
path: root/upb/encode.c
diff options
context:
space:
mode:
authorBo Yang <teboring@google.com>2018-03-07 21:13:32 +0000
committerBo Yang <teboring@google.com>2018-03-07 21:13:32 +0000
commitdfe7d3a3749ff1cdb55d839e3dbfda46b8b2ee72 (patch)
tree1c5176ef5236b74a099ee60b3a9dc40ef982533a /upb/encode.c
parentba93474aa223bdaf7cb524c002824096a4837146 (diff)
swap condition branches to remove negation
Diffstat (limited to 'upb/encode.c')
-rw-r--r--upb/encode.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/upb/encode.c b/upb/encode.c
index 67678fe..abcf17c 100644
--- a/upb/encode.c
+++ b/upb/encode.c
@@ -360,12 +360,12 @@ bool upb_encode_message(upb_encstate* e, const char *msg,
CHK(upb_encode_array(e, msg + f->offset, m, f));
} else {
if (upb_encode_hasscalarfield(msg, m, f)) {
- if (f->oneof_index != UPB_NOT_IN_ONEOF) {
+ if (f->oneof_index == UPB_NOT_IN_ONEOF) {
+ CHK(upb_encode_scalarfield(e, msg + f->offset, m, f, !m->is_proto2));
+ } else {
const upb_msglayout_oneofinit_v1 *o = &m->oneofs[f->oneof_index];
CHK(upb_encode_scalarfield(e, msg + o->data_offset,
m, f, !m->is_proto2));
- } else {
- CHK(upb_encode_scalarfield(e, msg + f->offset, m, f, !m->is_proto2));
}
}
}
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback