Merge pull request #4402 from ctiller/hpack_enc

Use assert instead of writing out something very similar
pull/4325/head^2
David G. Quintas 9 years ago
commit ce4bbbce76
  1. 7
      src/core/transport/chttp2/hpack_encoder.c

@ -365,10 +365,9 @@ static void hpack_enc(grpc_chttp2_hpack_compressor *c, grpc_mdelem *elem,
GPR_ASSERT(GPR_SLICE_LENGTH(elem->key->slice) > 0); GPR_ASSERT(GPR_SLICE_LENGTH(elem->key->slice) > 0);
if (GPR_SLICE_START_PTR(elem->key->slice)[0] != ':') { /* regular header */ if (GPR_SLICE_START_PTR(elem->key->slice)[0] != ':') { /* regular header */
st->seen_regular_header = 1; st->seen_regular_header = 1;
} else if (st->seen_regular_header != 0) { /* reserved header */ } else {
gpr_log(GPR_ERROR, GPR_ASSERT(st->seen_regular_header == 0 &&
"Reserved header (colon-prefixed) happening after regular ones."); "Reserved header (colon-prefixed) happening after regular ones.");
abort();
} }
inc_filter(HASH_FRAGMENT_1(elem_hash), &c->filter_elems_sum, c->filter_elems); inc_filter(HASH_FRAGMENT_1(elem_hash), &c->filter_elems_sum, c->filter_elems);

Loading…
Cancel
Save