diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2019-01-15 06:54:54 -0800 |
|---|---|---|
| committer | Joshua Haberman <jhaberman@gmail.com> | 2019-01-15 06:54:54 -0800 |
| commit | 9ae5a3af5be8650950c9647b121f23c3a8ae8e83 (patch) | |
| tree | 8e6837bbeb38202d7591453ecf6fa22f1850761e /upb/encode.c | |
| parent | 1508648f30cbaf5a3590572b2313fb5b595a7946 (diff) | |
| parent | 9ea6bb467810b958c8c2fb0bcf96d0af2b243801 (diff) | |
Merge branch 'arrayapi' into defcleanup
Diffstat (limited to 'upb/encode.c')
| -rw-r--r-- | upb/encode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/upb/encode.c b/upb/encode.c index c874281..18b35d9 100644 --- a/upb/encode.c +++ b/upb/encode.c @@ -208,8 +208,8 @@ do { ; } while(0) VARINT_CASE(int64_t, upb_zzencode_64(*ptr)); case UPB_DESCRIPTOR_TYPE_STRING: case UPB_DESCRIPTOR_TYPE_BYTES: { - upb_stringview *start = arr->data; - upb_stringview *ptr = start + arr->len; + upb_strview *start = arr->data; + upb_strview *ptr = start + arr->len; do { ptr--; CHK(upb_put_bytes(e, ptr->data, ptr->size) && @@ -293,7 +293,7 @@ static bool upb_encode_scalarfield(upb_encstate *e, const char *field_mem, CASE(int64_t, varint, UPB_WIRE_TYPE_VARINT, upb_zzencode_64(val)); case UPB_DESCRIPTOR_TYPE_STRING: case UPB_DESCRIPTOR_TYPE_BYTES: { - upb_stringview view = *(upb_stringview*)field_mem; + upb_strview view = *(upb_strview*)field_mem; if (skip_zero_value && view.size == 0) { return true; } |