diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2020-12-14 08:11:51 +0100 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2020-12-15 18:14:47 +0100 |
| commit | 5953d8b910920e81ece32ac89468eee995df836e (patch) | |
| tree | 27a7e953bc0609b3058c35eb01b5d0186c0ca252 /src/udev/scsi_id | |
| parent | journalctl: don't skip the entries that have the same seqnum (diff) | |
| download | systemd-5953d8b910920e81ece32ac89468eee995df836e.tar.xz systemd-5953d8b910920e81ece32ac89468eee995df836e.zip | |
udev: move util_replace_whitespace() to udev-util.c
Diffstat (limited to 'src/udev/scsi_id')
| -rw-r--r-- | src/udev/scsi_id/scsi_id.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/udev/scsi_id/scsi_id.c b/src/udev/scsi_id/scsi_id.c index 57202564da..162bd4e7df 100644 --- a/src/udev/scsi_id/scsi_id.c +++ b/src/udev/scsi_id/scsi_id.c @@ -456,12 +456,12 @@ static int set_inq_values(struct scsi_id_device *dev_scsi, const char *path) { 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)); - util_replace_whitespace(dev_scsi->vendor, vendor_str, sizeof(vendor_str)-1); + udev_replace_whitespace(dev_scsi->vendor, vendor_str, sizeof(vendor_str)-1); util_replace_chars(vendor_str, NULL); - util_replace_whitespace(dev_scsi->model, model_str, sizeof(model_str)-1); + udev_replace_whitespace(dev_scsi->model, model_str, sizeof(model_str)-1); util_replace_chars(model_str, NULL); set_type(dev_scsi->type, type_str, sizeof(type_str)); - util_replace_whitespace(dev_scsi->revision, revision_str, sizeof(revision_str)-1); + udev_replace_whitespace(dev_scsi->revision, revision_str, sizeof(revision_str)-1); util_replace_chars(revision_str, NULL); return 0; } @@ -502,10 +502,10 @@ static int scsi_id(char *maj_min_dev) { printf("ID_REVISION=%s\n", revision_str); printf("ID_TYPE=%s\n", type_str); if (dev_scsi.serial[0] != '\0') { - util_replace_whitespace(dev_scsi.serial, serial_str, sizeof(serial_str)-1); + udev_replace_whitespace(dev_scsi.serial, serial_str, sizeof(serial_str)-1); util_replace_chars(serial_str, NULL); printf("ID_SERIAL=%s\n", serial_str); - util_replace_whitespace(dev_scsi.serial_short, serial_str, sizeof(serial_str)-1); + udev_replace_whitespace(dev_scsi.serial_short, serial_str, sizeof(serial_str)-1); util_replace_chars(serial_str, NULL); printf("ID_SERIAL_SHORT=%s\n", serial_str); } @@ -532,7 +532,7 @@ static int scsi_id(char *maj_min_dev) { if (reformat_serial) { char serial_str[MAX_SERIAL_LEN]; - util_replace_whitespace(dev_scsi.serial, serial_str, sizeof(serial_str)-1); + udev_replace_whitespace(dev_scsi.serial, serial_str, sizeof(serial_str)-1); util_replace_chars(serial_str, NULL); printf("%s\n", serial_str); goto out; |