===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/radioctl/radioctl.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -c -r1.19 -r1.20
*** src/usr.bin/radioctl/radioctl.c	2013/12/21 06:54:53	1.19
--- src/usr.bin/radioctl/radioctl.c	2019/06/28 13:35:03	1.20
***************
*** 1,4 ****
! /* $OpenBSD: radioctl.c,v 1.19 2013/12/21 06:54:53 guenther Exp $ */
  /* $RuOBSD: radioctl.c,v 1.4 2001/10/20 18:09:10 pva Exp $ */
  
  /*
--- 1,4 ----
! /* $OpenBSD: radioctl.c,v 1.20 2019/06/28 13:35:03 deraadt Exp $ */
  /* $RuOBSD: radioctl.c,v 1.4 2001/10/20 18:09:10 pva Exp $ */
  
  /*
***************
*** 183,192 ****
  		}
  
  	rd = open(radiodev, mode);
! 	if (rd < 0)
  		err(1, "%s open error", radiodev);
  
! 	if (ioctl(rd, RIOCGINFO, &ri) < 0)
  		err(1, "RIOCGINFO");
  
  	if (!argc && show_vars)
--- 183,192 ----
  		}
  
  	rd = open(radiodev, mode);
! 	if (rd == -1)
  		err(1, "%s open error", radiodev);
  
! 	if (ioctl(rd, RIOCGINFO, &ri) == -1)
  		err(1, "RIOCGINFO");
  
  	if (!argc && show_vars)
***************
*** 208,214 ****
  		}
  	}
  
! 	if (close(rd) < 0)
  		warn("%s close error", radiodev);
  
  	return 0;
--- 208,214 ----
  		}
  	}
  
! 	if (close(rd) == -1)
  		warn("%s close error", radiodev);
  
  	return 0;
***************
*** 260,266 ****
  
  	if (o->option == OPTION_SEARCH) {
  
! 		if (ioctl(fd, RIOCSSRCH, &o->value) < 0) {
  			warn("RIOCSSRCH");
  			return;
  		}
--- 260,266 ----
  
  	if (o->option == OPTION_SEARCH) {
  
! 		if (ioctl(fd, RIOCSSRCH, &o->value) == -1) {
  			warn("RIOCSSRCH");
  			return;
  		}
***************
*** 268,281 ****
  	} else {
  
  		change_value(*o);
! 		if (ioctl(fd, RIOCSINFO, &ri) < 0) {
  			warn("RIOCSINFO");
  			return;
  		}
  
  	}
  
! 	if (ioctl(fd, RIOCGINFO, &ri) < 0) {
  		warn("RIOCGINFO");
  		return;
  	}
--- 268,281 ----
  	} else {
  
  		change_value(*o);
! 		if (ioctl(fd, RIOCSINFO, &ri) == -1) {
  			warn("RIOCSINFO");
  			return;
  		}
  
  	}
  
! 	if (ioctl(fd, RIOCGINFO, &ri) == -1) {
  		warn("RIOCGINFO");
  		return;
  	}