X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fscsi_id%2Fscsi_serial.c;h=cbacf379fee8cff055b9d44d01792837eb222159;hp=20d30cf0df64f8398392cf38271aeb79924e0782;hb=18cff5c3b2e3591fa46107288ea2d7026a15ccf3;hpb=a4354f9385fa6854360729678491da64be996f03

diff --git a/extras/scsi_id/scsi_serial.c b/extras/scsi_id/scsi_serial.c
index 20d30cf0d..cbacf379f 100644
--- a/extras/scsi_id/scsi_serial.c
+++ b/extras/scsi_id/scsi_serial.c
@@ -837,7 +837,7 @@ out:
 
 int scsi_get_serial(struct udev *udev,
 		    struct scsi_id_device *dev_scsi, const char *devname,
-		    int page_code, char *serial_short, int len)
+		    int page_code, int len)
 {
 	unsigned char page0[SCSI_INQ_BUFF_LEN];
 	int fd = -1;
@@ -860,7 +860,7 @@ int scsi_get_serial(struct udev *udev,
 		return 1;
 
 	if (page_code == PAGE_80) {
-		if (do_scsi_page80_inquiry(udev, dev_scsi, fd, dev_scsi->serial, serial_short, len)) {
+		if (do_scsi_page80_inquiry(udev, dev_scsi, fd, dev_scsi->serial, dev_scsi->serial_short, len)) {
 			retval = 1;
 			goto completed;
 		} else  {
@@ -868,7 +868,7 @@ int scsi_get_serial(struct udev *udev,
 			goto completed;
 		}
 	} else if (page_code == PAGE_83) {
-		if (do_scsi_page83_inquiry(udev, dev_scsi, fd, dev_scsi->serial, serial_short, len)) {
+		if (do_scsi_page83_inquiry(udev, dev_scsi, fd, dev_scsi->serial, dev_scsi->serial_short, len)) {
 			retval = 1;
 			goto completed;
 		} else  {
@@ -876,7 +876,7 @@ int scsi_get_serial(struct udev *udev,
 			goto completed;
 		}
 	} else if (page_code == PAGE_83_PRE_SPC3) {
-		retval = do_scsi_page83_prespc3_inquiry(udev, dev_scsi, fd, dev_scsi->serial, serial_short, len);
+		retval = do_scsi_page83_prespc3_inquiry(udev, dev_scsi, fd, dev_scsi->serial, dev_scsi->serial_short, len);
 		if (retval) {
 			/*
 			 * Fallback to servicing a SPC-2/3 compliant page 83
@@ -884,7 +884,7 @@ int scsi_get_serial(struct udev *udev,
 			 * conform to pre-SPC3 expectations.
 			 */
 			if (retval == 2) {
-				if (do_scsi_page83_inquiry(udev, dev_scsi, fd, dev_scsi->serial, serial_short, len)) {
+				if (do_scsi_page83_inquiry(udev, dev_scsi, fd, dev_scsi->serial, dev_scsi->serial_short, len)) {
 					retval = 1;
 					goto completed;
 				} else  {
@@ -924,7 +924,7 @@ int scsi_get_serial(struct udev *udev,
 	for (ind = 4; ind <= page0[3] + 3; ind++)
 		if (page0[ind] == PAGE_83)
 			if (!do_scsi_page83_inquiry(udev, dev_scsi, fd,
-						    dev_scsi->serial, serial_short, len)) {
+						    dev_scsi->serial, dev_scsi->serial_short, len)) {
 				/*
 				 * Success
 				 */
@@ -935,7 +935,7 @@ int scsi_get_serial(struct udev *udev,
 	for (ind = 4; ind <= page0[3] + 3; ind++)
 		if (page0[ind] == PAGE_80)
 			if (!do_scsi_page80_inquiry(udev, dev_scsi, fd,
-						    dev_scsi->serial, serial_short, len)) {
+						    dev_scsi->serial, dev_scsi->serial_short, len)) {
 				/*
 				 * Success
 				 */