diff options
Diffstat (limited to 'src/core/channel')
-rw-r--r-- | src/core/channel/channel_stack.c | 2 | ||||
-rw-r--r-- | src/core/channel/compress_filter.c | 10 | ||||
-rw-r--r-- | src/core/channel/http_server_filter.c | 14 | ||||
-rw-r--r-- | src/core/channel/subchannel_call_holder.c | 4 |
4 files changed, 15 insertions, 15 deletions
diff --git a/src/core/channel/channel_stack.c b/src/core/channel/channel_stack.c index 5e09a050ee..3e61688364 100644 --- a/src/core/channel/channel_stack.c +++ b/src/core/channel/channel_stack.c @@ -137,7 +137,7 @@ void grpc_channel_stack_init(grpc_exec_ctx *exec_ctx, int initial_refs, } GPR_ASSERT(user_data > (char *)stack); - GPR_ASSERT((gpr_uintptr)(user_data - (char *)stack) == + GPR_ASSERT((uintptr_t)(user_data - (char *)stack) == grpc_channel_stack_size(filters, filter_count)); stack->call_stack_size = call_size; diff --git a/src/core/channel/compress_filter.c b/src/core/channel/compress_filter.c index cc8e191628..3de1ef8a35 100644 --- a/src/core/channel/compress_filter.c +++ b/src/core/channel/compress_filter.c @@ -51,7 +51,7 @@ typedef struct call_data { gpr_slice_buffer slices; /**< Buffers up input slices to be compressed */ grpc_linked_mdelem compression_algorithm_storage; grpc_linked_mdelem accept_encoding_storage; - gpr_uint32 remaining_slice_bytes; + uint32_t remaining_slice_bytes; /** Compression algorithm we'll try to use. It may be given by incoming * metadata, or by the channel's default compression settings. */ grpc_compression_algorithm compression_algorithm; @@ -59,8 +59,8 @@ typedef struct call_data { int has_compression_algorithm; grpc_transport_stream_op send_op; - gpr_uint32 send_length; - gpr_uint32 send_flags; + uint32_t send_length; + uint32_t send_flags; gpr_slice incoming_slice; grpc_slice_buffer_stream replacement_stream; grpc_closure *post_send; @@ -74,7 +74,7 @@ typedef struct channel_data { /** Compression options for the channel */ grpc_compression_options compression_options; /** Supported compression algorithms */ - gpr_uint32 supported_compression_algorithms; + uint32_t supported_compression_algorithms; } channel_data; /** For each \a md element from the incoming metadata, filter out the entry for @@ -262,7 +262,7 @@ static void init_channel_elem(grpc_exec_ctx *exec_ctx, grpc_compression_options_init(&channeld->compression_options); channeld->compression_options.enabled_algorithms_bitset = - (gpr_uint32)grpc_channel_args_compression_algorithm_get_states( + (uint32_t)grpc_channel_args_compression_algorithm_get_states( args->channel_args); channeld->default_compression_algorithm = diff --git a/src/core/channel/http_server_filter.c b/src/core/channel/http_server_filter.c index ae8660da92..a10b105494 100644 --- a/src/core/channel/http_server_filter.c +++ b/src/core/channel/http_server_filter.c @@ -40,12 +40,12 @@ #include "src/core/transport/static_metadata.h" typedef struct call_data { - gpr_uint8 seen_path; - gpr_uint8 seen_post; - gpr_uint8 sent_status; - gpr_uint8 seen_scheme; - gpr_uint8 seen_te_trailers; - gpr_uint8 seen_authority; + uint8_t seen_path; + uint8_t seen_post; + uint8_t sent_status; + uint8_t seen_scheme; + uint8_t seen_te_trailers; + uint8_t seen_authority; grpc_linked_mdelem status; grpc_linked_mdelem content_type; @@ -58,7 +58,7 @@ typedef struct call_data { grpc_closure hs_on_recv; } call_data; -typedef struct channel_data { gpr_uint8 unused; } channel_data; +typedef struct channel_data { uint8_t unused; } channel_data; typedef struct { grpc_call_element *elem; diff --git a/src/core/channel/subchannel_call_holder.c b/src/core/channel/subchannel_call_holder.c index f5da41f3cd..1e8f4ba1b6 100644 --- a/src/core/channel/subchannel_call_holder.c +++ b/src/core/channel/subchannel_call_holder.c @@ -155,7 +155,7 @@ retry: holder->connected_subchannel != NULL) { gpr_atm_rel_store( &holder->subchannel_call, - (gpr_atm)(gpr_uintptr)grpc_connected_subchannel_create_call( + (gpr_atm)(uintptr_t)grpc_connected_subchannel_create_call( exec_ctx, holder->connected_subchannel, holder->pollset)); retry_waiting_locked(exec_ctx, holder); goto retry; @@ -180,7 +180,7 @@ static void subchannel_ready(grpc_exec_ctx *exec_ctx, void *arg, int success) { } else { gpr_atm_rel_store( &holder->subchannel_call, - (gpr_atm)(gpr_uintptr)grpc_connected_subchannel_create_call( + (gpr_atm)(uintptr_t)grpc_connected_subchannel_create_call( exec_ctx, holder->connected_subchannel, holder->pollset)); retry_waiting_locked(exec_ctx, holder); } |