Fix some actual bugs exposed by compiler warnings.

(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...)

diff --git a/src/backend/utils/adt/network.c b/src/backend/utils/adt/network.c
index 7df72bb5c805fe13f3bde9a1b60c81ce38c4d88a..4e09af623d5425a1be8bbf13bec246821d6ed619 100644 (file)
--- a/src/backend/utils/adt/network.c
+++ b/src/backend/utils/adt/network.c
@@ -3,7 +3,7 @@
  *     is for IP V4 CIDR notation, but prepared for V6: just
  *     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
  */
 
@@ -313,7 +313,7 @@ network_host(inet *ip)
        if (ip_family(ip) == AF_INET)
        {
                /* 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));
                        return (NULL);
@@ -358,7 +358,7 @@ network_broadcast(inet *ip)
                /* It's an IP V4 address: */
                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));
                        return (NULL);
@@ -397,7 +397,7 @@ network_network(inet *ip)
                /* It's an IP V4 address: */
                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));
                        return (NULL);
@@ -436,7 +436,7 @@ network_netmask(inet *ip)
                /* It's an IP V4 address: */
                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));
                        return (NULL);