diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-01-08 15:50:45 -0800 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-01-08 15:50:45 -0800 |
| commit | 4dfe317e5dc1c11688e8ab95c1a62c12553f43ad (patch) | |
| tree | 30461dcf9f15a6e656440dcbc47302713741c111 /src/core/transport/chttp2/varint.h | |
| parent | 8974a6681c430357632f5da4cc98f88ac46fe9e9 (diff) | |
| parent | 7f34c783c4735ce16c22cd4c92d989d4bb0e2822 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into grpclb_api
Diffstat (limited to 'src/core/transport/chttp2/varint.h')
| -rw-r--r-- | src/core/transport/chttp2/varint.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/core/transport/chttp2/varint.h b/src/core/transport/chttp2/varint.h index 5acb15d032..2d92b6693e 100644 --- a/src/core/transport/chttp2/varint.h +++ b/src/core/transport/chttp2/varint.h @@ -41,17 +41,16 @@ /* length of a value that needs varint tail encoding (it's bigger than can be bitpacked into the opcode byte) - returned value includes the length of the opcode byte */ -gpr_uint32 grpc_chttp2_hpack_varint_length(gpr_uint32 tail_value); +uint32_t grpc_chttp2_hpack_varint_length(uint32_t tail_value); -void grpc_chttp2_hpack_write_varint_tail(gpr_uint32 tail_value, - gpr_uint8* target, - gpr_uint32 tail_length); +void grpc_chttp2_hpack_write_varint_tail(uint32_t tail_value, uint8_t* target, + uint32_t tail_length); /* maximum value that can be bitpacked with the opcode if the opcode has a prefix of length prefix_bits */ #define GRPC_CHTTP2_MAX_IN_PREFIX(prefix_bits) \ - ((gpr_uint32)((1 << (8 - (prefix_bits))) - 1)) + ((uint32_t)((1 << (8 - (prefix_bits))) - 1)) /* length required to bitpack a value */ #define GRPC_CHTTP2_VARINT_LENGTH(n, prefix_bits) \ @@ -62,12 +61,12 @@ void grpc_chttp2_hpack_write_varint_tail(gpr_uint32 tail_value, #define GRPC_CHTTP2_WRITE_VARINT(n, prefix_bits, prefix_or, target, length) \ do { \ - gpr_uint8* tgt = target; \ + uint8_t* tgt = target; \ if ((length) == 1u) { \ - (tgt)[0] = (gpr_uint8)((prefix_or) | (n)); \ + (tgt)[0] = (uint8_t)((prefix_or) | (n)); \ } else { \ (tgt)[0] = \ - (prefix_or) | (gpr_uint8)GRPC_CHTTP2_MAX_IN_PREFIX(prefix_bits); \ + (prefix_or) | (uint8_t)GRPC_CHTTP2_MAX_IN_PREFIX(prefix_bits); \ grpc_chttp2_hpack_write_varint_tail( \ (n)-GRPC_CHTTP2_MAX_IN_PREFIX(prefix_bits), (tgt) + 1, (length)-1); \ } \ |