diff options
author | 2015-12-10 08:27:59 -0800 | |
---|---|---|
committer | 2015-12-10 08:27:59 -0800 | |
commit | 150109576c606cb241f345ec1cd45bf877d94e78 (patch) | |
tree | ebc32c94849f77835a54d7f7a15921daf6127134 /src | |
parent | d5bd3b6abe069be951c3922c791a30bc15ead209 (diff) | |
parent | 13830d009796f7232ac5826a6307874bc0d64d41 (diff) |
Merge branch 'connected-subchannel' into ping-ping-ping-ping-ping-ping-ping-ping-ping
Diffstat (limited to 'src')
-rw-r--r-- | src/core/transport/connectivity_state.c | 3 | ||||
-rw-r--r-- | src/core/transport/connectivity_state.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/core/transport/connectivity_state.c b/src/core/transport/connectivity_state.c index c409d983da..3c3fd4671d 100644 --- a/src/core/transport/connectivity_state.c +++ b/src/core/transport/connectivity_state.c @@ -54,8 +54,7 @@ const char *grpc_connectivity_state_name(grpc_connectivity_state state) { case GRPC_CHANNEL_FATAL_FAILURE: return "FATAL_FAILURE"; } - abort(); - return "UNKNOWN"; + GPR_UNREACHABLE_CODE(return "UNKNOWN"); } void grpc_connectivity_state_init(grpc_connectivity_state_tracker *tracker, diff --git a/src/core/transport/connectivity_state.h b/src/core/transport/connectivity_state.h index 1f3a130e90..a4eb6652e5 100644 --- a/src/core/transport/connectivity_state.h +++ b/src/core/transport/connectivity_state.h @@ -57,6 +57,8 @@ typedef struct { extern int grpc_connectivity_state_trace; +const char *grpc_connectivity_state_name(grpc_connectivity_state state); + void grpc_connectivity_state_init(grpc_connectivity_state_tracker *tracker, grpc_connectivity_state init_state, const char *name); |