From 1198d8dfc625ce123c591d8f5079e75f23f772e5 Mon Sep 17 00:00:00 2001 From: ncteisen Date: Mon, 11 Jun 2018 15:19:06 -0700 Subject: Reviewer feedback --- src/core/lib/iomgr/tcp_client_posix.cc | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'src/core/lib/iomgr/tcp_client_posix.cc') diff --git a/src/core/lib/iomgr/tcp_client_posix.cc b/src/core/lib/iomgr/tcp_client_posix.cc index 7c4a437dbf..30015fc203 100644 --- a/src/core/lib/iomgr/tcp_client_posix.cc +++ b/src/core/lib/iomgr/tcp_client_posix.cc @@ -66,6 +66,7 @@ typedef struct { static grpc_error* prepare_socket(const grpc_resolved_address* addr, int fd, const grpc_channel_args* channel_args) { grpc_error* err = GRPC_ERROR_NONE; + grpc_socket_mutator* mutator = nullptr; GPR_ASSERT(fd >= 0); @@ -79,15 +80,11 @@ static grpc_error* prepare_socket(const grpc_resolved_address* addr, int fd, } err = grpc_set_socket_no_sigpipe_if_possible(fd); if (err != GRPC_ERROR_NONE) goto error; - if (channel_args) { - const grpc_arg* arg = - grpc_channel_args_find(channel_args, GRPC_ARG_SOCKET_MUTATOR); - grpc_socket_mutator* mutator = - grpc_channel_arg_get_pointer(arg); - if (mutator) { - err = grpc_set_socket_with_mutator(fd, mutator); - if (err != GRPC_ERROR_NONE) goto error; - } + mutator = grpc_channel_args_get_pointer( + channel_args, GRPC_ARG_SOCKET_MUTATOR); + if (mutator != nullptr) { + err = grpc_set_socket_with_mutator(fd, mutator); + if (err != GRPC_ERROR_NONE) goto error; } goto done; -- cgit v1.2.3