===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cdio/cdio.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- src/usr.bin/cdio/cdio.c	2019/04/01 03:57:07	1.76
+++ src/usr.bin/cdio/cdio.c	2019/06/28 13:35:00	1.77
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cdio.c,v 1.76 2019/04/01 03:57:07 naddy Exp $	*/
+/*	$OpenBSD: cdio.c,v 1.77 2019/06/28 13:35:00 deraadt Exp $	*/
 
 /*  Copyright (c) 1995 Serge V. Vakulenko
  * All rights reserved.
@@ -378,7 +378,7 @@
 			return (0);
 
 		rc = ioctl(fd, CDIOCRESET);
-		if (rc < 0)
+		if (rc == -1)
 			return rc;
 		close(fd);
 		fd = -1;
@@ -424,7 +424,7 @@
 
 		(void) ioctl(fd, CDIOCALLOW);
 		rc = ioctl(fd, CDIOCEJECT);
-		if (rc < 0)
+		if (rc == -1)
 			return (rc);
 #if defined(__OpenBSD__)
 		close(fd);
@@ -442,7 +442,7 @@
 
 		(void) ioctl(fd, CDIOCALLOW);
 		rc = ioctl(fd, CDIOCCLOSE);
-		if (rc < 0)
+		if (rc == -1)
 			return (rc);
 		close(fd);
 		fd = -1;
@@ -694,7 +694,7 @@
 
 	rc = ioctl(fd, CDIOREADTOCHEADER, &h);
 
-	if (rc < 0)
+	if (rc == -1)
 		return (rc);
 
 	if (h.starting_track > h.ending_track) {
@@ -1037,7 +1037,7 @@
 		trk--;
 
 		rc = ioctl(fd, CDIOREADTOCHEADER, &h);
-		if (rc < 0) {
+		if (rc == -1) {
 			warn("getting toc header");
 			return (rc);
 		}
@@ -1060,7 +1060,7 @@
 
 	if (status (&trk, &min, &sec, &frm) >= 0) {
 		rc = ioctl(fd, CDIOREADTOCHEADER, &h);
-		if (rc < 0) {
+		if (rc == -1) {
 			warn("getting toc header");
 			return (rc);
 		}
@@ -1081,7 +1081,7 @@
 	if (status(&trk, &min, &sec, &frm) >= 0) {
 		trk++;
 		rc = ioctl(fd, CDIOREADTOCHEADER, &h);
-		if (rc < 0) {
+		if (rc == -1) {
 			warn("getting toc header");
 			return (rc);
 		}
@@ -1474,7 +1474,7 @@
 	s.address_format = msf ? CD_MSF_FORMAT : CD_LBA_FORMAT;
 	s.data_format = CD_CURRENT_POSITION;
 
-	if (ioctl(fd, CDIOCREADSUBCHANNEL, (char *) &s) < 0)
+	if (ioctl(fd, CDIOCREADSUBCHANNEL, (char *) &s) == -1)
 		return -1;
 
 	*trk = s.data->what.position.track_number;
@@ -1598,7 +1598,7 @@
 			fd = opendev(dev, O_RDWR, OPENDEV_PART, &realdev);
 		else
 			fd = opendev(dev, O_RDONLY, OPENDEV_PART, &realdev);
-		if (fd < 0) {
+		if (fd == -1) {
 			if (errno == ENXIO) {
 				/*  ENXIO has an overloaded meaning here.
 				 *  The original "Device not configured" should
@@ -1614,7 +1614,7 @@
 		}
 		sleep(1);
 	}
-	if (fd < 0) {
+	if (fd == -1) {
 		warn("Can't open %s", realdev);
 		return (0);
 	}