diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-11-18 14:57:53 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-11-18 14:57:53 -0800 |
| commit | 1282a67fe6c96cd609a9d5a88b0aa4a59ec09d24 (patch) | |
| tree | 98e1fe4b623d75c0b40fef1e73ca1e955169df33 /src/core | |
| parent | 9ecadce1e089901ca0c9317f7d8f6d41689f8f61 (diff) | |
Take advantage of grpc_metadata/grpc_mdelem equivalency
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/lib/surface/call.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/lib/surface/call.c b/src/core/lib/surface/call.c index 009163037e..ec7f1a92c3 100644 --- a/src/core/lib/surface/call.c +++ b/src/core/lib/surface/call.c @@ -596,19 +596,19 @@ static int prepare_application_metadata( get_md_elem(metadata, additional_metadata, i, count); grpc_linked_mdelem *l = (grpc_linked_mdelem *)&md->internal_data; GPR_ASSERT(sizeof(grpc_linked_mdelem) == sizeof(md->internal_data)); - l->md = grpc_mdelem_from_slices(exec_ctx, md->key, md->value); - if (!grpc_header_key_is_legal(GRPC_MDKEY(l->md))) { + if (!grpc_header_key_is_legal(md->key)) { char *str = grpc_dump_slice(md->key, GPR_DUMP_ASCII); gpr_log(GPR_ERROR, "attempt to send invalid metadata key: %s", str); gpr_free(str); break; - } else if (!grpc_is_binary_header(GRPC_MDKEY(l->md)) && + } else if (!grpc_is_binary_header(md->value) && !grpc_header_nonbin_value_is_legal(GRPC_MDVALUE(l->md))) { char *str = grpc_dump_slice(md->value, GPR_DUMP_HEX | GPR_DUMP_ASCII); gpr_log(GPR_ERROR, "attempt to send invalid metadata value: %s", str); gpr_free(str); break; } + l->md = grpc_mdelem_from_grpc_metadata(exec_ctx, (grpc_metadata *)md); } if (i != total_count) { for (int j = 0; j <= i; j++) { |