X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fscsi_id%2Fscsi_id.c;h=26b92e3fcda70a6f6626da90dd4b93f551275f66;hb=0bbe8838e75bf97792d61b33f8592a32f1fc8bd4;hp=c14d411841ab6d85e3431721565817fb078aaa8c;hpb=1e47c28bc575cfed063be7df6bbb822422e2db75;p=elogind.git

diff --git a/extras/scsi_id/scsi_id.c b/extras/scsi_id/scsi_id.c
index c14d41184..26b92e3fc 100644
--- a/extras/scsi_id/scsi_id.c
+++ b/extras/scsi_id/scsi_id.c
@@ -510,13 +510,13 @@ static int set_inq_values(struct udev *udev, struct scsi_id_device *dev_scsi, co
 	udev_util_encode_string(dev_scsi->vendor, vendor_enc_str, sizeof(vendor_enc_str));
 	udev_util_encode_string(dev_scsi->model, model_enc_str, sizeof(model_enc_str));
 
-	udev_util_replace_whitespace(dev_scsi->vendor, vendor_str, sizeof(vendor_str));
-	udev_util_replace_chars(vendor_str, NULL);
-	udev_util_replace_whitespace(dev_scsi->model, model_str, sizeof(model_str));
-	udev_util_replace_chars(model_str, NULL);
+	util_replace_whitespace(dev_scsi->vendor, vendor_str, sizeof(vendor_str));
+	util_replace_chars(vendor_str, NULL);
+	util_replace_whitespace(dev_scsi->model, model_str, sizeof(model_str));
+	util_replace_chars(model_str, NULL);
 	set_type(dev_scsi->type, type_str, sizeof(type_str));
-	udev_util_replace_whitespace(dev_scsi->revision, revision_str, sizeof(revision_str));
-	udev_util_replace_chars(revision_str, NULL);
+	util_replace_whitespace(dev_scsi->revision, revision_str, sizeof(revision_str));
+	util_replace_chars(revision_str, NULL);
 	return 0;
 }
 
@@ -560,11 +560,11 @@ static int scsi_id(struct udev *udev, char *maj_min_dev)
 		printf("ID_REVISION=%s\n", revision_str);
 		printf("ID_TYPE=%s\n", type_str);
 		if (dev_scsi.serial[0] != '\0') {
-			udev_util_replace_whitespace(dev_scsi.serial, serial_str, sizeof(serial_str));
-			udev_util_replace_chars(serial_str, NULL);
+			util_replace_whitespace(dev_scsi.serial, serial_str, sizeof(serial_str));
+			util_replace_chars(serial_str, NULL);
 			printf("ID_SERIAL=%s\n", serial_str);
-			udev_util_replace_whitespace(dev_scsi.serial_short, serial_str, sizeof(serial_str));
-			udev_util_replace_chars(serial_str, NULL);
+			util_replace_whitespace(dev_scsi.serial_short, serial_str, sizeof(serial_str));
+			util_replace_chars(serial_str, NULL);
 			printf("ID_SERIAL_SHORT=%s\n", serial_str);
 		}
 		if (dev_scsi.wwn[0] != '\0') {
@@ -593,8 +593,8 @@ static int scsi_id(struct udev *udev, char *maj_min_dev)
 	if (reformat_serial) {
 		char serial_str[MAX_SERIAL_LEN];
 
-		udev_util_replace_whitespace(dev_scsi.serial, serial_str, sizeof(serial_str));
-		udev_util_replace_chars(serial_str, NULL);
+		util_replace_whitespace(dev_scsi.serial, serial_str, sizeof(serial_str));
+		util_replace_chars(serial_str, NULL);
 		printf("%s\n", serial_str);
 		goto out;
 	}