diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2011-08-09 18:28:35 +0300 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2011-08-09 18:30:32 +0300 |
| commit | f4a9da0a150ead846be33c38f665f4337a81054e (patch) | |
| tree | 1ef9e989cfd08f373860eeba525ac466376f14a1 /src/backend/utils/adt/pgstatfuncs.c | |
| parent | 77949a2913b3cbaa7b2e2a73f014d541e251f18b (diff) | |
| download | postgresql-f4a9da0a150ead846be33c38f665f4337a81054e.tar.gz postgresql-f4a9da0a150ead846be33c38f665f4337a81054e.zip | |
Use clearer notation for getnameinfo() return handling
Writing
if (getnameinfo(...))
handle_error();
reads quite strangely, so use something like
if (getnameinfo(...) != 0)
handle_error();
instead.
Diffstat (limited to 'src/backend/utils/adt/pgstatfuncs.c')
| -rw-r--r-- | src/backend/utils/adt/pgstatfuncs.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c index 12dbff4c9a9..d065542e047 100644 --- a/src/backend/utils/adt/pgstatfuncs.c +++ b/src/backend/utils/adt/pgstatfuncs.c @@ -682,13 +682,7 @@ pg_stat_get_activity(PG_FUNCTION_ARGS) remote_host, sizeof(remote_host), remote_port, sizeof(remote_port), NI_NUMERICHOST | NI_NUMERICSERV); - if (ret) - { - nulls[9] = true; - nulls[10] = true; - nulls[11] = true; - } - else + if (ret == 0) { clean_ipv6_addr(beentry->st_clientaddr.addr.ss_family, remote_host); values[9] = DirectFunctionCall1(inet_in, @@ -699,6 +693,12 @@ pg_stat_get_activity(PG_FUNCTION_ARGS) nulls[10] = true; values[11] = Int32GetDatum(atoi(remote_port)); } + else + { + nulls[9] = true; + nulls[10] = true; + nulls[11] = true; + } } else if (beentry->st_clientaddr.addr.ss_family == AF_UNIX) { @@ -939,7 +939,7 @@ pg_stat_get_backend_client_addr(PG_FUNCTION_ARGS) remote_host, sizeof(remote_host), NULL, 0, NI_NUMERICHOST | NI_NUMERICSERV); - if (ret) + if (ret != 0) PG_RETURN_NULL(); clean_ipv6_addr(beentry->st_clientaddr.addr.ss_family, remote_host); @@ -988,7 +988,7 @@ pg_stat_get_backend_client_port(PG_FUNCTION_ARGS) NULL, 0, remote_port, sizeof(remote_port), NI_NUMERICHOST | NI_NUMERICSERV); - if (ret) + if (ret != 0) PG_RETURN_NULL(); PG_RETURN_DATUM(DirectFunctionCall1(int4in, |