diff options
| author |  vjpai <vpai@google.com> | 2015-05-28 10:09:32 -0700 |
|---|---|---|
| committer | vjpai <vpai@google.com> | 2015-05-28 10:09:32 -0700 |
| commit | 675140ca1d394f564f2156add8a1a18a2dc132b7 (patch) | |
| tree | 78fd267e9b416c1ef00514052b54b93ecdbdb4d1 /src/core/iomgr/sockaddr_utils.c | |
| parent | efad2ae67478ca70c064683af42c7f4bcfca5908 (diff) | |
| parent | 5e9757bf0f8ada75068038c3e29d8b1e875d2ce3 (diff) | |
Merge branch 'master' into poisson
Conflicts:
Makefile
test/cpp/qps/client_async.cc
test/cpp/qps/qpstest.proto
Diffstat (limited to 'src/core/iomgr/sockaddr_utils.c')
| -rw-r--r-- | src/core/iomgr/sockaddr_utils.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/iomgr/sockaddr_utils.c b/src/core/iomgr/sockaddr_utils.c index 740bbe716e..3d202a5cc8 100644 --- a/src/core/iomgr/sockaddr_utils.c +++ b/src/core/iomgr/sockaddr_utils.c @@ -169,8 +169,7 @@ int grpc_sockaddr_get_port(const struct sockaddr *addr) { case AF_UNIX: return 1; default: - gpr_log(GPR_ERROR, "Unknown socket family %d in %s", addr->sa_family, - __FUNCTION__); + gpr_log(GPR_ERROR, "Unknown socket family %d in grpc_sockaddr_get_port", addr->sa_family); return 0; } } @@ -184,8 +183,7 @@ int grpc_sockaddr_set_port(const struct sockaddr *addr, int port) { ((struct sockaddr_in6 *)addr)->sin6_port = htons(port); return 1; default: - gpr_log(GPR_ERROR, "Unknown socket family %d in %s", addr->sa_family, - __FUNCTION__); + gpr_log(GPR_ERROR, "Unknown socket family %d in grpc_sockaddr_set_port", addr->sa_family); return 0; } } |