summaryrefslogtreecommitdiff
path: root/sysutils/cdrdao/files/patch-dao_ScsiIf-freebsd-cam.cc
blob: 6b39efbe9ab9bebc73589fa066ca0b97d7735b3e (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
--- dao/ScsiIf-freebsd-cam.cc.orig	2023-01-25 14:30:35 UTC
+++ dao/ScsiIf-freebsd-cam.cc
@@ -112,11 +112,11 @@ int ScsiIf::sendCmd(const unsigned char *cmd, int cmdL
 {
 	int		retval;
 	int		flags = CAM_DIR_NONE;
-	u_int8_t *	data_ptr;
-	size_t		data_len;
+	u_int8_t *	data_ptr = NULL;
+	size_t		data_len = 0;
 
-	bzero(impl_->ccb, sizeof(union ccb));
-	bcopy(cmd, &impl_->ccb->csio.cdb_io.cdb_bytes, cmdLen);
+	memset(impl_->ccb, 0, sizeof(union ccb));
+	memmove(&impl_->ccb->csio.cdb_io.cdb_bytes, cmd, cmdLen);
 
 	if (dataOut && dataOutLen > 0) {
 		data_ptr = (u_int8_t*) dataOut;
@@ -176,8 +176,8 @@ int ScsiIf::inquiry()
 	int i;
 	struct scsi_inquiry_data inq_data;
 
-	bzero(impl_->ccb, sizeof(union ccb));
-	bzero(&inq_data, sizeof(inq_data));
+	memset(impl_->ccb, 0, sizeof(union ccb));
+	memset(&inq_data, 0, sizeof(inq_data));
 
 	scsi_inquiry(&impl_->ccb->csio,
 		     DEF_RETRY_COUNT,