svn commit: r293409 - stable/10/usr.sbin/camdd

Marcelo Araujo araujo at FreeBSD.org
Fri Jan 8 02:56:23 UTC 2016


Author: araujo
Date: Fri Jan  8 02:56:21 2016
New Revision: 293409
URL: https://svnweb.freebsd.org/changeset/base/293409

Log:
  MFC: r292971
  
  Clean up unused-but-set-variable spotted by gcc-4.9.
  
  Reviewed by:	ngie
  Approved by:	rodrigc (mentor)
  Sponsored by:	gandi.net
  Differential Revision:	https://reviews.freebsd.org/D4776

Modified:
  stable/10/usr.sbin/camdd/camdd.c

Modified: stable/10/usr.sbin/camdd/camdd.c
==============================================================================
--- stable/10/usr.sbin/camdd/camdd.c	Fri Jan  8 02:54:21 2016	(r293408)
+++ stable/10/usr.sbin/camdd/camdd.c	Fri Jan  8 02:56:21 2016	(r293409)
@@ -1276,7 +1276,6 @@ camdd_probe_pass(struct cam_device *cam_
 	struct camdd_dev_pass *pass_dev;
 	struct kevent ke;
 	int scsi_dev_type;
-	int retval;
 
 	dev = NULL;
 
@@ -1336,7 +1335,6 @@ camdd_probe_pass(struct cam_device *cam_
 
 	if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
 		cam_error_print(cam_dev, ccb, CAM_ESF_ALL, CAM_EPF_ALL, stderr);
-		retval = 1;
 		goto bailout;
 	}
 
@@ -1371,11 +1369,8 @@ camdd_probe_pass(struct cam_device *cam_
 
 	if (cam_send_ccb(cam_dev, ccb) < 0) {
 		warn("error sending READ CAPACITY (16) command");
-
 		cam_error_print(cam_dev, ccb, CAM_ESF_ALL,
 				CAM_EPF_ALL, stderr);
-
-		retval = 1;
 		goto bailout;
 	}
 


More information about the svn-src-all mailing list