database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-25 21:42:33 +03:00
Code

Fix some actual bugs exposed by compiler warnings.

Browse Source 
(Someone forgot whether their subroutine signaled errors by a NULL pointer
return value, or a negative integer... I'm surprised gcc -Wall doesn't
catch this...)
This commit is contained in:
Tom Lane 1998-10-26 01:03:24 +00:00
parent 3d87216ab9
commit 0bdf46a37f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/backend/utils/adt/network.c
View File

@ -3,7 +3,7 @@
* is for IP V4 CIDR notation, but prepared for V6: just * is for IP V4 CIDR notation, but prepared for V6: just
* add the necessary bits where the comments indicate. * add the necessary bits where the comments indicate.
* *
* $Id: network.c,v 1.1 1998/10/22 20:40:46 momjian Exp $ * $Id: network.c,v 1.2 1998/10/26 01:03:24 tgl Exp $
* Jon Postel RIP 16 Oct 1998 * Jon Postel RIP 16 Oct 1998
*/ */
@ -313,7 +313,7 @@ network_host(inet *ip)
if (ip_family(ip) == AF_INET) if (ip_family(ip) == AF_INET)
{ {
/* It's an IP V4 address: */ /* It's an IP V4 address: */
if (inet_net_ntop(AF_INET, &ip_v4addr(ip), 32, tmp, sizeof(tmp)) < 0) if (inet_net_ntop(AF_INET, &ip_v4addr(ip), 32, tmp, sizeof(tmp)) == NULL)
{ {
elog(ERROR, "unable to print host (%s)", strerror(errno)); elog(ERROR, "unable to print host (%s)", strerror(errno));
return (NULL); return (NULL);
@ -358,7 +358,7 @@ network_broadcast(inet *ip)
/* It's an IP V4 address: */ /* It's an IP V4 address: */
int addr = htonl(ntohl(ip_v4addr(ip)) | (0xffffffff >> ip_bits(ip))); int addr = htonl(ntohl(ip_v4addr(ip)) | (0xffffffff >> ip_bits(ip)));
if (inet_net_ntop(AF_INET, &addr, 32, tmp, sizeof(tmp)) < 0) if (inet_net_ntop(AF_INET, &addr, 32, tmp, sizeof(tmp)) == NULL)
{ {
elog(ERROR, "unable to print address (%s)", strerror(errno)); elog(ERROR, "unable to print address (%s)", strerror(errno));
return (NULL); return (NULL);
@ -397,7 +397,7 @@ network_network(inet *ip)
/* It's an IP V4 address: */ /* It's an IP V4 address: */
int addr = ntohl(ip_v4addr(ip)) & (0xffffffff << (32 - ip_bits(ip))); int addr = ntohl(ip_v4addr(ip)) & (0xffffffff << (32 - ip_bits(ip)));
if (inet_cidr_ntop(AF_INET, &addr, 32, tmp, sizeof(tmp)) < 0) if (inet_cidr_ntop(AF_INET, &addr, 32, tmp, sizeof(tmp)) == NULL)
{ {
elog(ERROR, "unable to print network (%s)", strerror(errno)); elog(ERROR, "unable to print network (%s)", strerror(errno));
return (NULL); return (NULL);
@ -436,7 +436,7 @@ network_netmask(inet *ip)
/* It's an IP V4 address: */ /* It's an IP V4 address: */
int addr = htonl((-1 << (32 - ip_bits(ip))) & 0xffffffff); int addr = htonl((-1 << (32 - ip_bits(ip))) & 0xffffffff);
if (inet_net_ntop(AF_INET, &addr, 32, tmp, sizeof(tmp)) < 0) if (inet_net_ntop(AF_INET, &addr, 32, tmp, sizeof(tmp)) == NULL)
{ {
elog(ERROR, "unable to print netmask (%s)", strerror(errno)); elog(ERROR, "unable to print netmask (%s)", strerror(errno));
return (NULL); return (NULL);