Merge remote-tracking branch 'origin/stable/10' into devel

3 files changed, 59 insertions, 56 deletions

diff --git a/lib/libcam/camlib.c b/lib/libcam/camlib.c
index b7024a6..8986230 100644
--- a/lib/libcam/camlib.c
+++ b/lib/libcam/camlib.c
@@ -102,7 +102,7 @@ cam_freeccb(union ccb *ccb)
  * /dev/foo0
  * foo0
  * nfoo0
- * 
+ *
  * Some peripheral drivers create separate device nodes with 'n' prefix for
  * non-rewind operations.  Currently only sa(4) tape driver has this feature.
  * We extract pure peripheral name as device name for this special case.
@@ -194,7 +194,7 @@ cam_get_device(const char *path, char *dev_name, int devnamelen, int *unit)
 
 	/*
 	 * At this point, if the last character of the string isn't a
-	 * number, we know the user either didn't give us a device number, 
+	 * number, we know the user either didn't give us a device number,
 	 * or he gave us a device name/number format we don't recognize.
 	 */
 	if (!isdigit(tmpstr[strlen(tmpstr) - 1])) {
@@ -275,7 +275,7 @@ cam_open_btl(path_id_t path_id, target_id_t target_id, lun_id_t target_lun,
 	int fd, bufsize;
 
 	if ((fd = open(XPT_DEVICE, O_RDWR)) < 0) {
-		snprintf(cam_errbuf, CAM_ERRBUF_SIZE, 
+		snprintf(cam_errbuf, CAM_ERRBUF_SIZE,
 			 "%s: couldn't open %s\n%s: %s", func_name, XPT_DEVICE,
 			 func_name, strerror(errno));
 		return(NULL);
@@ -292,7 +292,7 @@ cam_open_btl(path_id_t path_id, target_id_t target_id, lun_id_t target_lun,
 	ccb.cdm.match_buf_len = bufsize;
 	ccb.cdm.matches = (struct dev_match_result *)malloc(bufsize);
 	if (ccb.cdm.matches == NULL) {
-		snprintf(cam_errbuf, CAM_ERRBUF_SIZE, 
+		snprintf(cam_errbuf, CAM_ERRBUF_SIZE,
 			 "%s: couldn't malloc match buffer", func_name);
 		close(fd);
 		return(NULL);
@@ -305,14 +305,14 @@ cam_open_btl(path_id_t path_id, target_id_t target_id, lun_id_t target_lun,
 	ccb.cdm.patterns = (struct dev_match_pattern *)malloc(
 		sizeof(struct dev_match_pattern));
 	if (ccb.cdm.patterns == NULL) {
-		snprintf(cam_errbuf, CAM_ERRBUF_SIZE, 
+		snprintf(cam_errbuf, CAM_ERRBUF_SIZE,
 			 "%s: couldn't malloc pattern buffer", func_name);
 		free(ccb.cdm.matches);
 		close(fd);
 		return(NULL);
 	}
 	ccb.cdm.patterns[0].type = DEV_MATCH_PERIPH;
-	match_pat = &ccb.cdm.patterns[0].pattern.periph_pattern; 
+	match_pat = &ccb.cdm.patterns[0].pattern.periph_pattern;
 
 	/*
 	 * We're looking for the passthrough device associated with this
@@ -421,7 +421,7 @@ cam_lookup_pass(const char *dev_name, int unit, int flags,
 	 * passthrough device.
 	 */
 	if ((fd = open(XPT_DEVICE, O_RDWR)) < 0) {
-		snprintf(cam_errbuf, CAM_ERRBUF_SIZE, 
+		snprintf(cam_errbuf, CAM_ERRBUF_SIZE,
 			 "%s: couldn't open %s\n%s: %s", func_name, XPT_DEVICE,
 			 func_name, strerror(errno));
 		return(NULL);
@@ -435,7 +435,7 @@ cam_lookup_pass(const char *dev_name, int unit, int flags,
 	ccb.cgdl.unit_number = unit;
 
 	/*
-	 * Attempt to get the passthrough device.  This ioctl will fail if 
+	 * Attempt to get the passthrough device.  This ioctl will fail if
 	 * the device name is null, if the device doesn't exist, or if the
 	 * passthrough driver isn't in the kernel.
 	 */
@@ -512,7 +512,7 @@ cam_real_open_device(const char *path, int flags, struct cam_device *device,
 		}
 		device->fd = -1;
 		malloced_device = 1;
-	} 
+	}
 
 	/*
 	 * If the user passed in a path, save it for him.
@@ -551,7 +551,7 @@ cam_real_open_device(const char *path, int flags, struct cam_device *device,
 	 * we don't have to set any fields.
 	 */
 	ccb.ccb_h.func_code = XPT_GDEVLIST;
-	
+
 	/*
 	 * We're only doing this to get some information on the device in
 	 * question.  Otherwise, we'd have to pass in yet another
@@ -611,7 +611,7 @@ cam_real_open_device(const char *path, int flags, struct cam_device *device,
 		goto crod_bailout;
 	}
 	device->pd_type = SID_TYPE(&ccb.cgd.inq_data);
-	bcopy(&ccb.cgd.inq_data, &device->inq_data, 
+	bcopy(&ccb.cgd.inq_data, &device->inq_data,
 	      sizeof(struct scsi_inquiry_data));
 	device->serial_num_len = ccb.cgd.serial_num_len;
 	bcopy(&ccb.cgd.serial_num, &device->serial_num, device->serial_num_len);
@@ -719,7 +719,7 @@ cam_device_dup(struct cam_device *device)
 
 	newdev = malloc(sizeof(struct cam_device));
 	if (newdev == NULL) {
-		snprintf(cam_errbuf, CAM_ERRBUF_SIZE, 
+		snprintf(cam_errbuf, CAM_ERRBUF_SIZE,
 			"%s: couldn't malloc CAM device structure", func_name);
 		return(NULL);
 	}
diff --git a/lib/libcam/camlib.h b/lib/libcam/camlib.h
index e505c77..4fa6a67 100644
--- a/lib/libcam/camlib.h
+++ b/lib/libcam/camlib.h
@@ -83,7 +83,7 @@ extern char cam_errbuf[];
 
 struct cam_device {
 	char 		device_path[MAXPATHLEN];/*
-						   * Pathname of the device 
+						   * Pathname of the device
 						   * given by the user. This
 						   * may be null if the
 						   * user states the device
@@ -98,15 +98,15 @@ struct cam_device {
 						     * Unit number given by
 						     * the user.
 						     */
-	char		device_name[DEV_IDLEN+1];/* 
-						  * Name of the device, 
-						  * e.g. 'pass' 
+	char		device_name[DEV_IDLEN+1];/*
+						  * Name of the device,
+						  * e.g. 'pass'
 						  */
 	u_int32_t	dev_unit_num;	/* Unit number of the passthrough
 					 * device associated with this
 					 * particular device.
 					 */
-	
+
 	char		sim_name[SIM_IDLEN+1]; /* Controller name, e.g. 'ahc' */
 	u_int32_t	sim_unit_number; /* Controller unit number */
 	u_int32_t	bus_id;		 /* Controller bus number */
@@ -142,7 +142,7 @@ int			cam_send_ccb(struct cam_device *device, union ccb *ccb);
 char *			cam_path_string(struct cam_device *dev, char *str,
 					int len);
 struct cam_device *	cam_device_dup(struct cam_device *device);
-void			cam_device_copy(struct cam_device *src, 
+void			cam_device_copy(struct cam_device *src,
 					struct cam_device *dst);
 int			cam_get_device(const char *path, char *dev_name,
 				       int devnamelen, int *unit);
diff --git a/lib/libcam/scsi_cmdparse.c b/lib/libcam/scsi_cmdparse.c
index 3d977e1..4a322ba 100644
--- a/lib/libcam/scsi_cmdparse.c
+++ b/lib/libcam/scsi_cmdparse.c
@@ -102,7 +102,7 @@ __FBSDID("$FreeBSD$");
 static int
 do_buff_decode(u_int8_t *databuf, size_t len,
 	       void (*arg_put)(void *, int , void *, int, char *),
-	       void *puthook, const char *fmt, va_list ap)
+	       void *puthook, const char *fmt, va_list *ap)
 {
 	int assigned = 0;
 	int width;
@@ -128,7 +128,7 @@ do_buff_decode(u_int8_t *databuf, size_t len,
 					(void *)((long)(ARG)), width, \
 					field_name); \
 			else \
-				*(va_arg(ap, int *)) = (ARG); \
+				*(va_arg(*ap, int *)) = (ARG); \
 			assigned++; \
 		} \
 		field_name[0] = 0; \
@@ -255,7 +255,7 @@ do_buff_decode(u_int8_t *databuf, size_t len,
 						databuf, width, field_name);
 				else {
 					char *dest;
-					dest = va_arg(ap, char *);
+					dest = va_arg(*ap, char *);
 					bcopy(databuf, dest, width);
 					if (letter == 'z') {
 						char *p;
@@ -287,7 +287,7 @@ do_buff_decode(u_int8_t *databuf, size_t len,
 				 * can't have a variable seek when you are using
 				 * "arg_put".
 				 */
-				width = (arg_put) ? 0 : va_arg(ap, int);
+				width = (arg_put) ? 0 : va_arg(*ap, int);
 				fmt++;
 			} else {
 				width = strtol(fmt, &intendp, 10);
@@ -539,7 +539,7 @@ next_field(const char **pp, char *fmt, int *width_p, int *value_p, char *name,
 static int
 do_encode(u_char *buff, size_t vec_max, size_t *used,
 	  int (*arg_get)(void *, char *), void *gethook, const char *fmt,
-	  va_list ap)
+	  va_list *ap)
 {
 	int ind;
 	int shift;
@@ -564,7 +564,7 @@ do_encode(u_char *buff, size_t vec_max, size_t *used,
 			else
 				value = arg_get ?
 					(*arg_get)(gethook, field_name) :
-					va_arg(ap, int);
+					va_arg(*ap, int);
 		}
 
 #if 0
@@ -662,11 +662,16 @@ int
 csio_decode(struct ccb_scsiio *csio, const char *fmt, ...)
 {
 	va_list ap;
+	int retval;
 
 	va_start(ap, fmt);
 
-	return(do_buff_decode(csio->data_ptr, (size_t)csio->dxfer_len,
-			      0, 0, fmt, ap));
+	retval = do_buff_decode(csio->data_ptr, (size_t)csio->dxfer_len, 0, 0,
+		 fmt, &ap);
+
+	va_end(ap);
+
+	return (retval);
 }
 
 int
@@ -674,29 +679,31 @@ csio_decode_visit(struct ccb_scsiio *csio, const char *fmt,
 		  void (*arg_put)(void *, int, void *, int, char *),
 		  void *puthook)
 {
-	va_list ap;
 
 	/*
 	 * We need some way to output things; we can't do it without
 	 * the arg_put function.
 	 */
 	if (arg_put == NULL)
-		return(-1);
-
-	bzero(&ap, sizeof(ap));
+		return (-1);
 
-	return(do_buff_decode(csio->data_ptr, (size_t)csio->dxfer_len,
-			      arg_put, puthook, fmt, ap));
+	return (do_buff_decode(csio->data_ptr, (size_t)csio->dxfer_len,
+		    arg_put, puthook, fmt, NULL));
 }
 
 int
 buff_decode(u_int8_t *buff, size_t len, const char *fmt, ...)
 {
 	va_list ap;
+	int retval;
 
 	va_start(ap, fmt);
 
-	return(do_buff_decode(buff, len, 0, 0, fmt, ap));
+	retval = do_buff_decode(buff, len, 0, 0, fmt, &ap);
+
+	va_end(ap);
+
+	return (retval);
 }
 
 int
@@ -704,7 +711,6 @@ buff_decode_visit(u_int8_t *buff, size_t len, const char *fmt,
 		  void (*arg_put)(void *, int, void *, int, char *),
 		  void *puthook)
 {
-	va_list ap;
 
 	/*
 	 * We need some way to output things; we can't do it without
@@ -713,9 +719,7 @@ buff_decode_visit(u_int8_t *buff, size_t len, const char *fmt,
 	if (arg_put == NULL)
 		return(-1);
 
-	bzero(&ap, sizeof(ap));
-
-	return(do_buff_decode(buff, len, arg_put, puthook, fmt, ap));
+	return (do_buff_decode(buff, len, arg_put, puthook, fmt, NULL));
 }
 
 /*
@@ -732,15 +736,15 @@ csio_build(struct ccb_scsiio *csio, u_int8_t *data_ptr, u_int32_t dxfer_len,
 	va_list ap;
 
 	if (csio == NULL)
-		return(0);
+		return (0);
 
 	bzero(csio, sizeof(struct ccb_scsiio));
 
 	va_start(ap, cmd_spec);
 
 	if ((retval = do_encode(csio->cdb_io.cdb_bytes, SCSI_MAX_CDBLEN,
-				&cmdlen, NULL, NULL, cmd_spec, ap)) == -1)
-		return(retval);
+				&cmdlen, NULL, NULL, cmd_spec, &ap)) == -1)
+		goto done;
 
 	cam_fill_csio(csio,
 		      /* retries */ retry_count,
@@ -753,7 +757,10 @@ csio_build(struct ccb_scsiio *csio, u_int8_t *data_ptr, u_int32_t dxfer_len,
 		      /* cdb_len */ cmdlen,
 		      /* timeout */ timeout ? timeout : 5000);
 
-	return(retval);
+done:
+	va_end(ap);
+
+	return (retval);
 }
 
 int
@@ -762,7 +769,6 @@ csio_build_visit(struct ccb_scsiio *csio, u_int8_t *data_ptr,
 		 int timeout, const char *cmd_spec,
 		 int (*arg_get)(void *hook, char *field_name), void *gethook)
 {
-	va_list ap;
 	size_t cmdlen;
 	int retval;
 
@@ -776,12 +782,10 @@ csio_build_visit(struct ccb_scsiio *csio, u_int8_t *data_ptr,
 	if (arg_get == NULL)
 		return(-1);
 
-	bzero(&ap, sizeof(ap));
-
 	bzero(csio, sizeof(struct ccb_scsiio));
 
 	if ((retval = do_encode(csio->cdb_io.cdb_bytes, SCSI_MAX_CDBLEN,
-				&cmdlen, arg_get, gethook, cmd_spec, ap)) == -1)
+				&cmdlen, arg_get, gethook, cmd_spec, NULL)) == -1)
 		return(retval);
 
 	cam_fill_csio(csio,
@@ -802,20 +806,24 @@ int
 csio_encode(struct ccb_scsiio *csio, const char *fmt, ...)
 {
 	va_list ap;
+	int retval;
 
 	if (csio == NULL)
-		return(0);
+		return (0);
 
 	va_start(ap, fmt);
 
-	return(do_encode(csio->data_ptr, csio->dxfer_len, 0, 0, 0, fmt, ap));
+	retval = do_encode(csio->data_ptr, csio->dxfer_len, 0, 0, 0, fmt, &ap);
+
+	va_end(ap);
+
+	return (retval);
 }
 
 int
 buff_encode_visit(u_int8_t *buff, size_t len, const char *fmt,
 		  int (*arg_get)(void *hook, char *field_name), void *gethook)
 {
-	va_list ap;
 
 	/*
 	 * We need something to encode, but we can't get it without the
@@ -824,16 +832,13 @@ buff_encode_visit(u_int8_t *buff, size_t len, const char *fmt,
 	if (arg_get == NULL)
 		return(-1);
 
-	bzero(&ap, sizeof(ap));
-
-	return(do_encode(buff, len, 0, arg_get, gethook, fmt, ap));
+	return (do_encode(buff, len, 0, arg_get, gethook, fmt, NULL));
 }
 
 int
 csio_encode_visit(struct ccb_scsiio *csio, const char *fmt,
 		  int (*arg_get)(void *hook, char *field_name), void *gethook)
 {
-	va_list ap;
 
 	/*
 	 * We need something to encode, but we can't get it without the
@@ -842,8 +847,6 @@ csio_encode_visit(struct ccb_scsiio *csio, const char *fmt,
 	if (arg_get == NULL)
 		return(-1);
 
-	bzero(&ap, sizeof(ap));
-
-	return(do_encode(csio->data_ptr, csio->dxfer_len, 0, arg_get,
-			 gethook, fmt, ap));
+	return (do_encode(csio->data_ptr, csio->dxfer_len, 0, arg_get,
+			 gethook, fmt, NULL));
 }