==-1 is cheaper than <0

diff --git a/client.c b/client.c
index 234c600a780910315b68c47d69f7ddb4574dd289..9ba63314683b59b2f4b735fd7012d87e985fbf9c 100644 (file)
--- a/client.c
+++ b/client.c
@@ -93,7 +93,7 @@
        if (iface->fd >= 0) close (iface->fd); \
        iface->fd = -1; \
        if (_mode == SOCKET_OPEN) \
-       if (open_socket (iface, false) < 0) { retval = EXIT_FAILURE; goto eexit; } \
+       if (open_socket (iface, false) == -1) { retval = EXIT_FAILURE; goto eexit; } \
        mode = _mode; \
 }
 
@@ -116,7 +116,7 @@ static bool daemonise (int *pidfd)
 
        logger (LOG_DEBUG, "forking to background");
 
-       if (daemon (0, 0) < 0) {
+       if (daemon (0, 0) == -1) {
                logger (LOG_ERR, "daemon: %s", strerror (errno));
                return (false);
        }
@@ -438,7 +438,7 @@ int dhcp_run (const options_t *options, int *pidfd)
 #if defined (ENABLE_INFO) || defined (ENABLE_IPV4LL)
                                                if (dhcp->address.s_addr)
                                                {
-                                                       if (configure (options, iface, dhcp, true) < 0 &&
+                                                       if (configure (options, iface, dhcp, true) == -1 &&
                                                                ! daemonised)
                                                        {
                                                                retval = EXIT_FAILURE;
@@ -447,7 +447,7 @@ int dhcp_run (const options_t *options, int *pidfd)
 
                                                        state = STATE_BOUND;
                                                        if (! daemonised && options->daemonise) {
-                                                               if ((daemonise (pidfd)) < 0) {
+                                                               if ((daemonise (pidfd)) == -1) {
                                                                        retval = EXIT_FAILURE;
                                                                        goto eexit;
                                                                }
@@ -561,7 +561,7 @@ int dhcp_run (const options_t *options, int *pidfd)
 
                        while (buffer_pos != 0) {
                                if (get_packet (iface, (unsigned char *) &message, buffer,
-                                                               &buffer_len, &buffer_pos) < 0)
+                                                               &buffer_len, &buffer_pos) == -1)
                                        break;
 
                                if (xid != message.xid) {
@@ -573,7 +573,7 @@ int dhcp_run (const options_t *options, int *pidfd)
 
                                logger (LOG_DEBUG, "got a packet with xid 0x%x", message.xid);
                                memset (new_dhcp, 0, sizeof (dhcp_t));
-                               if ((type = parse_dhcpmessage (new_dhcp, &message)) < 0) {
+                               if ((type = parse_dhcpmessage (new_dhcp, &message)) == -1) {
                                        logger (LOG_ERR, "failed to parse packet");
                                        free_dhcp (new_dhcp);
                                        continue;
@@ -737,13 +737,13 @@ int dhcp_run (const options_t *options, int *pidfd)
 
                                                xid = 0;
 
-                                               if (configure (options, iface, dhcp, true) < 0 && ! daemonised) {
+                                               if (configure (options, iface, dhcp, true) == -1 && ! daemonised) {
                                                        retval = EXIT_FAILURE;
                                                        goto eexit;
                                                }
 
                                                if (! daemonised && options->daemonise) {
-                                                       if ((daemonise (pidfd)) < 0 ) {
+                                                       if ((daemonise (pidfd)) == -1 ) {
                                                                retval = EXIT_FAILURE;
                                                                goto eexit;
                                                        }

diff --git a/configure.c b/configure.c
index 8cfb7ed2aaed7d6b26da525963428f63c7f6e9d4..f0194bfad4132cebf97b52c7938d2f1681cb3b5f 100644 (file)
--- a/configure.c
+++ b/configure.c
@@ -95,7 +95,7 @@ static void exec_script (const char *script, const char *infofile,
        if (! script || ! infofile || ! arg)
                return;
 
-       if (stat (script, &buf) < 0) {
+       if (stat (script, &buf) == -1) {
                if (strcmp (script, DEFAULT_SCRIPT) != 0)
                        logger (LOG_ERR, "`%s': %s", script, strerror (ENOENT));
                return;
@@ -156,7 +156,7 @@ static void restore_resolv(const char *ifname)
 #ifdef RESOLVCONF
        struct stat buf;
 
-       if (stat (RESOLVCONF, &buf) < 0)
+       if (stat (RESOLVCONF, &buf) == -1)
                return;
 
        logger (LOG_DEBUG, "removing information from resolvconf");
@@ -409,7 +409,7 @@ int configure (const options_t *options, interface_t *iface,
        /* This also changes netmask */
        if (! options->doinform || ! has_address (iface->name, dhcp->address))
                if (add_address (iface->name, dhcp->address, dhcp->netmask,
-                                                dhcp->broadcast) < 0 && errno != EEXIST)
+                                                dhcp->broadcast) == -1 && errno != EEXIST)
                        return (false);
        
        /* Now delete the old address if different */

diff --git a/dhcpcd.c b/dhcpcd.c
index 429b0f4c2e97d8997c60a1f10b241f96d8446b21..b9ee650ec3947bee3c990b3f4a5972c3eacb6960 100644 (file)
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -474,8 +474,8 @@ int main(int argc, char **argv)
                }
 
                /* dhcpcd.sh should not interhit this fd */
-               if ((i = fcntl (pidfd, F_GETFD, 0)) < 0 ||
-                       fcntl (pidfd, F_SETFD, i | FD_CLOEXEC) < 0)
+               if ((i = fcntl (pidfd, F_GETFD, 0)) == -1 ||
+                       fcntl (pidfd, F_SETFD, i | FD_CLOEXEC) == -1)
                        logger (LOG_ERR, "fcntl: %s", strerror (errno));
 
                logger (LOG_INFO, PACKAGE " " VERSION " starting");

diff --git a/interface.c b/interface.c
index 0918f14f98e904f0b119bf7edc269d73a63185b1..194a140854193204243c0fe4077fe308f8fda70a 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -230,7 +230,7 @@ interface_t *read_interface (const char *ifname, int metric)
 
        memset (&ifr, 0, sizeof (struct ifreq));
        strlcpy (ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
-       if ((s = socket (AF_INET, SOCK_DGRAM, 0)) < 0) {
+       if ((s = socket (AF_INET, SOCK_DGRAM, 0)) == -1) {
                logger (LOG_ERR, "socket: %s", strerror (errno));
                return NULL;
        }
@@ -266,7 +266,7 @@ interface_t *read_interface (const char *ifname, int metric)
 #else
        ifr.ifr_metric = metric;
        strlcpy (ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
-       if (ioctl (s, SIOCSIFMETRIC, &ifr) < 0) {
+       if (ioctl (s, SIOCSIFMETRIC, &ifr) == -1) {
                logger (LOG_ERR, "ioctl SIOCSIFMETRIC: %s", strerror (errno));
                close (s);
                return NULL;
@@ -274,7 +274,7 @@ interface_t *read_interface (const char *ifname, int metric)
 #endif
 
        strlcpy (ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
-       if (ioctl(s, SIOCGIFMTU, &ifr) < 0) {
+       if (ioctl (s, SIOCGIFMTU, &ifr) == -1) {
                logger (LOG_ERR, "ioctl SIOCGIFMTU: %s", strerror (errno));
                close (s);
                return NULL;
@@ -284,7 +284,7 @@ interface_t *read_interface (const char *ifname, int metric)
                logger (LOG_DEBUG, "MTU of %d is too low, setting to %d", ifr.ifr_mtu, MTU_MIN);
                ifr.ifr_mtu = MTU_MIN;
                strlcpy (ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
-               if (ioctl(s, SIOCSIFMTU, &ifr) < 0) {
+               if (ioctl (s, SIOCSIFMTU, &ifr) == -1) {
                        logger (LOG_ERR, "ioctl SIOCSIFMTU,: %s", strerror (errno));
                        close (s);
                        return NULL;
@@ -298,7 +298,7 @@ interface_t *read_interface (const char *ifname, int metric)
        if ((p = strchr (ifr.ifr_name, ':')))
                *p = '\0';
 #endif
-       if (ioctl(s, SIOCGIFFLAGS, &ifr) < 0) {
+       if (ioctl (s, SIOCGIFFLAGS, &ifr) == -1) {
                logger (LOG_ERR, "ioctl SIOCGIFFLAGS: %s", strerror (errno));
                close (s);
                return NULL;
@@ -306,7 +306,7 @@ interface_t *read_interface (const char *ifname, int metric)
 
        if (! (ifr.ifr_flags & IFF_UP) || ! (ifr.ifr_flags & IFF_RUNNING)) {
                ifr.ifr_flags |= IFF_UP | IFF_RUNNING;
-               if (ioctl(s, SIOCSIFFLAGS, &ifr) < 0) {
+               if (ioctl (s, SIOCSIFFLAGS, &ifr) == -1) {
                        logger (LOG_ERR, "ioctl SIOCSIFFLAGS: %s", strerror (errno));
                        close (s);
                        return NULL;
@@ -343,7 +343,7 @@ int get_mtu (const char *ifname)
        int r;
        int s;
 
-       if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
+       if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == -1) {
                logger (LOG_ERR, "socket: %s", strerror (errno));
                return (-1);
        }
@@ -353,7 +353,7 @@ int get_mtu (const char *ifname)
        r = ioctl (s, SIOCGIFMTU, &ifr);
        close (s);
 
-       if (r < 0) {
+       if (r == -1) {
                logger (LOG_ERR, "ioctl SIOCGIFMTU: %s", strerror (errno));
                return (-1);
        }
@@ -367,7 +367,7 @@ int set_mtu (const char *ifname, short int mtu)
        int r;
        int s;
 
-       if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
+       if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == -1) {
                logger (LOG_ERR, "socket: %s", strerror (errno));
                return (-1);
        }
@@ -379,7 +379,7 @@ int set_mtu (const char *ifname, short int mtu)
        r = ioctl (s, SIOCSIFMTU, &ifr);
        close (s);
 
-       if (r < 0)
+       if (r == -1)
                logger (LOG_ERR, "ioctl SIOCSIFMTU: %s", strerror (errno));
 
        return (r == 0 ? 0 : -1);
@@ -396,7 +396,7 @@ static int do_address (const char *ifname, struct in_addr address,
        if (! ifname)
                return -1;
 
-       if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
+       if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == -1) {
                logger (LOG_ERR, "socket: %s", strerror (errno));
                return -1;
        }
@@ -480,7 +480,7 @@ static int do_route (const char *ifname,
        if (dstd)
                free (dstd);
 
-       if ((s = socket (PF_ROUTE, SOCK_RAW, 0)) < 0) {
+       if ((s = socket (PF_ROUTE, SOCK_RAW, 0)) == -1) {
                logger (LOG_ERR, "socket: %s", strerror (errno));
                return -1;
        }
@@ -541,7 +541,7 @@ static int do_route (const char *ifname,
 #undef ADDADDR
 
        rtm.hdr.rtm_msglen = sizeof (rtm);
-       if (write(s, &rtm, sizeof (rtm)) < 0) {
+       if (write (s, &rtm, sizeof (rtm)) == -1) {
                /* Don't report error about routes already existing */
                if (errno != EEXIST)
                        logger (LOG_ERR, "write: %s", strerror (errno));
@@ -579,14 +579,14 @@ static int send_netlink(struct nlmsghdr *hdr)
                struct nlmsghdr *nlm;
        } h;
 
-       if ((s = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE)) < 0) {
+       if ((s = socket (AF_NETLINK, SOCK_RAW, NETLINK_ROUTE)) == -1) {
                logger (LOG_ERR, "socket: %s", strerror (errno));
                return -1;
        }
 
        memset (&nl, 0, sizeof (struct sockaddr_nl));
        nl.nl_family = AF_NETLINK;
-       if (bind (s, (struct sockaddr *) &nl, sizeof (nl)) < 0) {
+       if (bind (s, (struct sockaddr *) &nl, sizeof (nl)) == -1) {
                logger (LOG_ERR, "bind: %s", strerror (errno));
                close (s);
                return -1;
@@ -606,7 +606,7 @@ static int send_netlink(struct nlmsghdr *hdr)
        hdr->nlmsg_flags |= NLM_F_ACK;
        hdr->nlmsg_seq = ++seq;
 
-       if (sendmsg (s, &msg, 0) < 0) {
+       if (sendmsg (s, &msg, 0) == -1) {
                logger (LOG_ERR, "write: %s", strerror (errno));
                close (s);
                return -1;
@@ -617,9 +617,9 @@ static int send_netlink(struct nlmsghdr *hdr)
 
        while (1) {
                iov.iov_len = sizeof (buffer);
-               bytes = recvmsg(s, &msg, 0);
+               bytes = recvmsg (s, &msg, 0);
 
-               if (bytes < 0) {
+               if (bytes == -1) {
                        if (errno != EINTR)
                                logger (LOG_ERR, "netlink: overrun");
                        continue;
@@ -938,7 +938,7 @@ static int _do_addresses (const char *ifname, struct in_addr *addr, bool flush,
                if (us_a.sin->sin_family == AF_INET) {
                        if (flush) {
                                if (del_address (ifname, us_a.sin->sin_addr, us_m.sin->sin_addr)
-                                       < 0)
+                                       == -1)
                                        retval = -1;
                        } else if (get) {
                                addr->s_addr = us_a.sin->sin_addr.s_addr;
@@ -968,21 +968,21 @@ static int _do_addresses (const char *ifname, struct in_addr address, bool flush
        int nifs;
        struct ifreq *ifr;
 
-       if ((s = socket (AF_INET, SOCK_DGRAM, 0)) < 0) {
+       if ((s = socket (AF_INET, SOCK_DGRAM, 0)) == -1) {
                logger (LOG_ERR, "socket: %s", strerror (errno));
                return -1;
        }
 
        memset (&ifc, 0, sizeof (struct ifconf));
        ifc.ifc_buf = NULL;
-       if (ioctl (s, SIOCGIFCONF, &ifc) < 0) {
+       if (ioctl (s, SIOCGIFCONF, &ifc) == -1) {
                logger (LOG_ERR, "ioctl SIOCGIFCONF: %s", strerror (errno));
                close (s);
        }
 
        ifrs = xmalloc (ifc.ifc_len);
        ifc.ifc_buf = ifrs;
-       if (ioctl (s, SIOCGIFCONF, &ifc) < 0) {
+       if (ioctl (s, SIOCGIFCONF, &ifc) == -1) {
                logger (LOG_ERR, "ioctl SIOCGIFCONF: %s", strerror (errno));
                close (s);
                free (ifrs);
@@ -1001,7 +1001,7 @@ static int _do_addresses (const char *ifname, struct in_addr address, bool flush
                        && strcmp (ifname, ifr->ifr_name) == 0)
                {
                        if (flush) {
-                               if (del_address (ifname, addr->sin_addr, netm->sin_addr) < 0)
+                               if (del_address (ifname, addr->sin_addr, netm->sin_addr) == -1)
                                        retval = -1;
                        } else if (addr->sin_addr.s_addr == address.s_addr) {
                                retval = 1;

diff --git a/signals.c b/signals.c
index 8a77bd8c8aa76de9b0b613b79f8b58e2201c150c..cfc58b8ecec14216eefa8b9a4dcc0ec2712b1d22 100644 (file)
--- a/signals.c
+++ b/signals.c
@@ -44,7 +44,7 @@ static void signal_handler (int sig)
                return;
        }
 
-       if (send (signal_pipe[1], &sig, sizeof (sig), MSG_DONTWAIT) < 0)
+       if (send (signal_pipe[1], &sig, sizeof (sig), MSG_DONTWAIT) == -1)
                logger (LOG_ERR, "Could not send signal: %s", strerror (errno));
 }
 
@@ -59,8 +59,8 @@ void signal_setup(void)
 
        /* Stop any scripts from inheriting us */
        for (i = 0; i < 2; i++)
-               if ((flags = fcntl (signal_pipe[i], F_GETFD, 0)) < 0 ||
-                       fcntl (signal_pipe[i], F_SETFD, flags | FD_CLOEXEC) < 0)
+               if ((flags = fcntl (signal_pipe[i], F_GETFD, 0)) == -1 ||
+                       fcntl (signal_pipe[i], F_SETFD, flags | FD_CLOEXEC) == -1)
                        logger (LOG_ERR ,"fcntl: %s", strerror (errno));
 
        signal (SIGHUP, signal_handler);
@@ -92,7 +92,7 @@ int signal_read (const fd_set *rfds)
        if (! FD_ISSET (signal_pipe[0], rfds))
                return 0;
 
-       if (read (signal_pipe[0], &sig, sizeof (sig)) < 0)
+       if (read (signal_pipe[0], &sig, sizeof (sig)) == -1)
                return -1;
 
        return sig;

diff --git a/socket.c b/socket.c
index 860a98b43927261f250859131fe71c8af2843aaa..6d344d178b8a5b4b2a821a60c7a0dad9b151a262 100644 (file)
--- a/socket.c
+++ b/socket.c
@@ -241,15 +241,15 @@ int open_socket (interface_t *iface, bool arp)
        do {
                snprintf (device, PATH_MAX, "/dev/bpf%d",  n++);
                fd = open (device, O_RDWR);
-       } while (fd < 0 && errno == EBUSY);
+       } while (fd == -1 && errno == EBUSY);
 
-       if (fd < 0) {
+       if (fd == -1) {
                logger (LOG_ERR, "unable to open a BPF device");
                return -1;
        }
 
-       if ((flags = fcntl (fd, F_GETFD, 0)) < 0
-               || fcntl (fd, F_SETFD, flags | FD_CLOEXEC) < 0)
+       if ((flags = fcntl (fd, F_GETFD, 0)) == -1
+               || fcntl (fd, F_SETFD, flags | FD_CLOEXEC) == -1)
        {
                logger (LOG_ERR, "fcntl: %s", strerror (errno));
                close (fd);
@@ -258,7 +258,7 @@ int open_socket (interface_t *iface, bool arp)
 
        memset (&ifr, 0, sizeof (struct ifreq));
        strlcpy (ifr.ifr_name, iface->name, sizeof (ifr.ifr_name));
-       if (ioctl (fd, BIOCSETIF, &ifr) < 0) {
+       if (ioctl (fd, BIOCSETIF, &ifr) == -1) {
                logger (LOG_ERR, "cannot attach interface `%s' to bpf device `%s': %s",
                                iface->name, device, strerror (errno));
                close (fd);
@@ -266,7 +266,7 @@ int open_socket (interface_t *iface, bool arp)
        }
 
        /* Get the required BPF buffer length from the kernel. */
-       if (ioctl (fd, BIOCGBLEN, &buf) < 0) {
+       if (ioctl (fd, BIOCGBLEN, &buf) == -1) {
                logger (LOG_ERR, "ioctl BIOCGBLEN: %s", strerror (errno));
                close (fd);
                return -1;
@@ -274,7 +274,7 @@ int open_socket (interface_t *iface, bool arp)
        iface->buffer_length = buf;
 
        flags = 1;
-       if (ioctl (fd, BIOCIMMEDIATE, &flags) < 0) {
+       if (ioctl (fd, BIOCIMMEDIATE, &flags) == -1) {
                logger (LOG_ERR, "ioctl BIOCIMMEDIATE: %s", strerror (errno));
                close (fd);
                return -1;
@@ -288,7 +288,7 @@ int open_socket (interface_t *iface, bool arp)
                p.bf_insns = dhcp_bpf_filter;
                p.bf_len = sizeof (dhcp_bpf_filter) / sizeof (struct bpf_insn);
        }
-       if (ioctl (fd, BIOCSETF, &p) < 0) {
+       if (ioctl (fd, BIOCSETF, &p) == -1) {
                logger (LOG_ERR, "ioctl BIOCSETF: %s", strerror (errno));
                close (fd);
                return -1;
@@ -421,13 +421,13 @@ int open_socket (interface_t *iface, bool arp)
        int flags;
        struct sockaddr_ll sll;
 
-       if ((fd = socket (PF_PACKET, SOCK_DGRAM, htons (ETH_P_IP))) < 0) {
+       if ((fd = socket (PF_PACKET, SOCK_DGRAM, htons (ETH_P_IP))) == -1) {
                logger (LOG_ERR, "socket: %s", strerror (errno));
                return -1;
        }
 
-       if ((flags = fcntl (fd, F_GETFD, 0)) < 0
-               || fcntl (fd, F_SETFD, flags | FD_CLOEXEC) < 0)
+       if ((flags = fcntl (fd, F_GETFD, 0)) == -1
+               || fcntl (fd, F_SETFD, flags | FD_CLOEXEC) == -1)
        {
                logger (LOG_ERR, "fcntl: %s", strerror (errno));
                close (fd);
@@ -486,7 +486,7 @@ int send_packet (const interface_t *iface, const int type,
        memset(sll.sll_addr, 0xff, sizeof (sll.sll_addr));
 
        if ((retval = sendto (iface->fd, data, len, 0, (struct sockaddr *) &sll,
-                                                 sizeof (struct sockaddr_ll))) < 0)
+                                                 sizeof (struct sockaddr_ll))) == -1) 
 
                logger (LOG_ERR, "sendto: %s", strerror (errno));
        return retval;
@@ -510,7 +510,7 @@ int get_packet (const interface_t *iface, unsigned char *data,
        memset (buffer, 0, iface->buffer_length);
        bytes = read (iface->fd, buffer, iface->buffer_length);
 
-       if (bytes < 0) {
+       if (bytes == -1) {
                struct timeval tv;
                logger (LOG_ERR, "read: %s", strerror (errno));
                tv.tv_sec = 3;
@@ -550,7 +550,7 @@ int get_packet (const interface_t *iface, unsigned char *data,
                return -1;
        }
 
-       if (valid_dhcp_packet (buffer) < 0)
+       if (valid_dhcp_packet (buffer) == -1)
                return -1;
 
        memcpy(data, &pay.packet->dhcp,