Metadata: replace usage of grpc_metadata_batch_clear with Clear function (#27423)

pull/27372/head^2
Craig Tiller 4 years ago committed by GitHub
parent fe9ad53c66
commit c21ca4dd30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      src/core/ext/transport/inproc/inproc_transport.cc
  2. 4
      src/core/lib/surface/call.cc

@ -171,14 +171,14 @@ struct inproc_stream {
cs->write_buffer_initial_md_flags, &to_read_initial_md,
&to_read_initial_md_flags, &to_read_initial_md_filled);
deadline = std::min(deadline, cs->write_buffer_deadline);
grpc_metadata_batch_clear(&cs->write_buffer_initial_md);
cs->write_buffer_initial_md.Clear();
cs->write_buffer_initial_md_filled = false;
}
if (cs->write_buffer_trailing_md_filled) {
fill_in_metadata(this, &cs->write_buffer_trailing_md, 0,
&to_read_trailing_md, nullptr,
&to_read_trailing_md_filled);
grpc_metadata_batch_clear(&cs->write_buffer_trailing_md);
cs->write_buffer_trailing_md.Clear();
cs->write_buffer_trailing_md_filled = false;
}
if (cs->write_buffer_cancel_error != GRPC_ERROR_NONE) {
@ -703,7 +703,7 @@ void op_state_machine_locked(inproc_stream* s, grpc_error_handle error) {
.trailing_metadata_available =
(other != nullptr && other->send_trailing_md_op != nullptr);
}
grpc_metadata_batch_clear(&s->to_read_initial_md);
s->to_read_initial_md.Clear();
s->to_read_initial_md_filled = false;
INPROC_LOG(GPR_INFO,
"op_state_machine %p scheduling initial-metadata-ready %s", s,
@ -740,7 +740,7 @@ void op_state_machine_locked(inproc_stream* s, grpc_error_handle error) {
"op_state_machine %p already implicitly received trailing "
"metadata, so ignoring new trailing metadata from client",
s);
grpc_metadata_batch_clear(&s->to_read_trailing_md);
s->to_read_trailing_md.Clear();
s->to_read_trailing_md_filled = false;
s->trailing_md_recvd_implicit_only = false;
} else {
@ -787,7 +787,7 @@ void op_state_machine_locked(inproc_stream* s, grpc_error_handle error) {
s->recv_trailing_md_op->payload
->recv_trailing_metadata.recv_trailing_metadata,
nullptr, nullptr);
grpc_metadata_batch_clear(&s->to_read_trailing_md);
s->to_read_trailing_md.Clear();
s->to_read_trailing_md_filled = false;
// We should schedule the recv_trailing_md_op completion if

@ -1935,7 +1935,7 @@ done_with_error:
/* reverse any mutations that occurred */
if (stream_op->send_initial_metadata) {
call->sent_initial_metadata = false;
grpc_metadata_batch_clear(&call->metadata_batch[0][0]);
call->metadata_batch[0][0].Clear();
}
if (stream_op->send_message) {
call->sending_message = false;
@ -1943,7 +1943,7 @@ done_with_error:
}
if (stream_op->send_trailing_metadata) {
call->sent_final_op = false;
grpc_metadata_batch_clear(&call->metadata_batch[0][1]);
call->metadata_batch[0][1].Clear();
}
if (stream_op->recv_initial_metadata) {
call->received_initial_metadata = false;

Loading…
Cancel
Save