diff options
| author | Tom Lane | 2019-08-18 23:27:23 +0000 |
|---|---|---|
| committer | Tom Lane | 2019-08-18 23:27:23 +0000 |
| commit | 927f34ce8a215c8b254136f710cca9ca4da1352c (patch) | |
| tree | 08193b74ccd8c5afa2d9f37f0d99c1fbb5ad0f00 /src/interfaces | |
| parent | 232720be9b6412ec2b6bee405299bcbbbe700f0b (diff) | |
Avoid conflicts with library versions of inet_net_ntop() and friends.
Prefix inet_net_ntop and sibling routines with "pg_" to ensure that
they aren't mistaken for C-library functions. This fixes warnings
from cpluspluscheck on some platforms, and should help reduce reader
confusion everywhere, since our functions aren't exactly interchangeable
with the library versions (they may have different ideas about address
family codes).
This shouldn't be fixing any actual bugs, unless somebody's linker
is misbehaving, so no need to back-patch.
Discussion: https://postgr.es/m/[email protected]
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/libpq/fe-connect.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index fa5af18ffac..7f1fd2f45eb 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -1539,19 +1539,19 @@ getHostaddr(PGconn *conn, char *host_addr, int host_addr_len) if (addr->ss_family == AF_INET) { - if (inet_net_ntop(AF_INET, - &((struct sockaddr_in *) addr)->sin_addr.s_addr, - 32, - host_addr, host_addr_len) == NULL) + if (pg_inet_net_ntop(AF_INET, + &((struct sockaddr_in *) addr)->sin_addr.s_addr, + 32, + host_addr, host_addr_len) == NULL) host_addr[0] = '\0'; } #ifdef HAVE_IPV6 else if (addr->ss_family == AF_INET6) { - if (inet_net_ntop(AF_INET6, - &((struct sockaddr_in6 *) addr)->sin6_addr.s6_addr, - 128, - host_addr, host_addr_len) == NULL) + if (pg_inet_net_ntop(AF_INET6, + &((struct sockaddr_in6 *) addr)->sin6_addr.s6_addr, + 128, + host_addr, host_addr_len) == NULL) host_addr[0] = '\0'; } #endif |