diff options
Diffstat (limited to 'grpc/src/core/lib/surface/validate_metadata.cc')
| -rw-r--r-- | grpc/src/core/lib/surface/validate_metadata.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/grpc/src/core/lib/surface/validate_metadata.cc b/grpc/src/core/lib/surface/validate_metadata.cc index 138f5745..c1ec936e 100644 --- a/grpc/src/core/lib/surface/validate_metadata.cc +++ b/grpc/src/core/lib/surface/validate_metadata.cc @@ -30,9 +30,9 @@ #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/lib/surface/validate_metadata.h" -static grpc_error* conforms_to(const grpc_slice& slice, - const uint8_t* legal_bits, - const char* err_desc) { +static grpc_error_handle conforms_to(const grpc_slice& slice, + const uint8_t* legal_bits, + const char* err_desc) { const uint8_t* p = GRPC_SLICE_START_PTR(slice); const uint8_t* e = GRPC_SLICE_END_PTR(slice); for (; p != e; p++) { @@ -40,7 +40,7 @@ static grpc_error* conforms_to(const grpc_slice& slice, int byte = idx / 8; int bit = idx % 8; if ((legal_bits[byte] & (1 << bit)) == 0) { - grpc_error* error = grpc_error_set_str( + grpc_error_handle error = grpc_error_set_str( grpc_error_set_int(GRPC_ERROR_CREATE_FROM_COPIED_STRING(err_desc), GRPC_ERROR_INT_OFFSET, p - GRPC_SLICE_START_PTR(slice)), @@ -52,13 +52,13 @@ static grpc_error* conforms_to(const grpc_slice& slice, return GRPC_ERROR_NONE; } -static int error2int(grpc_error* error) { +static int error2int(grpc_error_handle error) { int r = (error == GRPC_ERROR_NONE); GRPC_ERROR_UNREF(error); return r; } -grpc_error* grpc_validate_header_key_is_legal(const grpc_slice& slice) { +grpc_error_handle grpc_validate_header_key_is_legal(const grpc_slice& slice) { static const uint8_t legal_header_bits[256 / 8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0xff, 0x03, 0x00, 0x00, 0x00, 0x80, 0xfe, 0xff, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -82,7 +82,7 @@ int grpc_header_key_is_legal(grpc_slice slice) { return error2int(grpc_validate_header_key_is_legal(slice)); } -grpc_error* grpc_validate_header_nonbin_value_is_legal( +grpc_error_handle grpc_validate_header_nonbin_value_is_legal( const grpc_slice& slice) { static const uint8_t legal_header_bits[256 / 8] = { 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, |