diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-10-09 17:07:56 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-10-09 17:07:56 -0700 |
| commit | 2b15f1e25ae4aec6ef0de92b7e99e50188eb6438 (patch) | |
| tree | 4dd4838255a12fd477a00f15062c8b7f8d034ebb /src/core/iomgr | |
| parent | 8e30e25b14acf9e0fcd62eae96ad1c57280787f2 (diff) | |
| parent | b733c74ffce5f6d58a69060c00f23cc6c13e506a (diff) | |
Merge github.com:grpc/grpc into latent-see
Diffstat (limited to 'src/core/iomgr')
| -rw-r--r-- | src/core/iomgr/tcp_client_posix.c | 2 | ||||
| -rw-r--r-- | src/core/iomgr/tcp_server_posix.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/iomgr/tcp_client_posix.c b/src/core/iomgr/tcp_client_posix.c index aca2691c41..fe20039264 100644 --- a/src/core/iomgr/tcp_client_posix.c +++ b/src/core/iomgr/tcp_client_posix.c @@ -191,7 +191,7 @@ static void on_writable(grpc_exec_ctx *exec_ctx, void *acp, int success) { goto finish; } - abort(); + GPR_UNREACHABLE_CODE(return ); finish: if (fd != NULL) { diff --git a/src/core/iomgr/tcp_server_posix.c b/src/core/iomgr/tcp_server_posix.c index 13bd67576f..99c76dcbe9 100644 --- a/src/core/iomgr/tcp_server_posix.c +++ b/src/core/iomgr/tcp_server_posix.c @@ -352,7 +352,7 @@ static void on_read(grpc_exec_ctx *exec_ctx, void *arg, int success) { gpr_free(addr_str); } - abort(); + GPR_UNREACHABLE_CODE(return ); error: gpr_mu_lock(&sp->server->mu); |