diff options
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/ata_id/Makefile.am | 5 | ||||
| -rw-r--r-- | extras/cdrom_id/Makefile.am | 5 | ||||
| -rw-r--r-- | extras/edd_id/Makefile.am | 5 | ||||
| -rw-r--r-- | extras/edd_id/edd_id.c | 2 | ||||
| -rw-r--r-- | extras/fstab_import/Makefile.am | 5 | ||||
| -rw-r--r-- | extras/fstab_import/fstab_import.c | 4 | ||||
| -rw-r--r-- | extras/scsi_id/Makefile.am | 5 | ||||
| -rw-r--r-- | extras/usb_id/Makefile.am | 1 | ||||
| -rw-r--r-- | extras/volume_id/Makefile.am | 5 | ||||
| -rw-r--r-- | extras/volume_id/vol_id.c | 2 |
10 files changed, 10 insertions, 29 deletions
diff --git a/extras/ata_id/Makefile.am b/extras/ata_id/Makefile.am index bc3b7001a4..ce4a32330f 100644 --- a/extras/ata_id/Makefile.am +++ b/extras/ata_id/Makefile.am @@ -12,10 +12,7 @@ ata_id_SOURCES = \ ata_id.c \ ../../udev/lib/libudev.h \ ../../udev/lib/libudev.c \ - ../../udev/lib/libudev-util.c \ - ../../udev/udev_sysdeps.c \ - ../../udev/udev_utils.c \ - ../../udev/udev_utils_string.c + ../../udev/lib/libudev-util.c if USE_SELINUX ata_id_LDADD = \ diff --git a/extras/cdrom_id/Makefile.am b/extras/cdrom_id/Makefile.am index 595d710965..d4db32b783 100644 --- a/extras/cdrom_id/Makefile.am +++ b/extras/cdrom_id/Makefile.am @@ -15,10 +15,7 @@ cdrom_id_SOURCES = \ cdrom_id.c \ ../../udev/lib/libudev.h \ ../../udev/lib/libudev.c \ - ../../udev/lib/libudev-util.c \ - ../../udev/udev_sysdeps.c \ - ../../udev/udev_utils.c \ - ../../udev/udev_utils_string.c + ../../udev/lib/libudev-util.c if USE_SELINUX cdrom_id_LDADD = \ diff --git a/extras/edd_id/Makefile.am b/extras/edd_id/Makefile.am index e494c1e672..3bdbbd85b2 100644 --- a/extras/edd_id/Makefile.am +++ b/extras/edd_id/Makefile.am @@ -15,10 +15,7 @@ edd_id_SOURCES = \ edd_id.c \ ../../udev/lib/libudev.h \ ../../udev/lib/libudev.c \ - ../../udev/lib/libudev-util.c \ - ../../udev/udev_sysdeps.c \ - ../../udev/udev_utils.c \ - ../../udev/udev_utils_string.c + ../../udev/lib/libudev-util.c if USE_SELINUX edd_id_LDADD = \ diff --git a/extras/edd_id/edd_id.c b/extras/edd_id/edd_id.c index b53700e756..4ba60393a0 100644 --- a/extras/edd_id/edd_id.c +++ b/extras/edd_id/edd_id.c @@ -156,7 +156,7 @@ int main(int argc, char *argv[]) if (disk_id == sysfs_id) { if (match[0] == '\0') { /* store id */ - strlcpy(match, dent->d_name, sizeof(match)); + util_strlcpy(match, dent->d_name, sizeof(match)); } else { /* error, same signature for another device */ info(udev, "'%s' does not have a unique signature\n", node); diff --git a/extras/fstab_import/Makefile.am b/extras/fstab_import/Makefile.am index 7b99471fa2..2ed383d95e 100644 --- a/extras/fstab_import/Makefile.am +++ b/extras/fstab_import/Makefile.am @@ -15,10 +15,7 @@ fstab_import_SOURCES = \ fstab_import.c \ ../../udev/lib/libudev.h \ ../../udev/lib/libudev.c \ - ../../udev/lib/libudev-util.c \ - ../../udev/udev_sysdeps.c \ - ../../udev/udev_utils.c \ - ../../udev/udev_utils_string.c + ../../udev/lib/libudev-util.c if USE_SELINUX fstab_import_LDADD = \ diff --git a/extras/fstab_import/fstab_import.c b/extras/fstab_import/fstab_import.c index 0f4685ae2a..245a72fffb 100644 --- a/extras/fstab_import/fstab_import.c +++ b/extras/fstab_import/fstab_import.c @@ -146,7 +146,7 @@ int main(int argc, char *argv[]) if (label[0] == '"' || label[0] == '\'') { char *pos; - strlcpy(str, &label[1], sizeof(str)); + util_strlcpy(str, &label[1], sizeof(str)); pos = strrchr(str, label[0]); if (pos == NULL) continue; @@ -170,7 +170,7 @@ int main(int argc, char *argv[]) if (uuid[0] == '"' || uuid[0] == '\'') { char *pos; - strlcpy(str, &uuid[1], sizeof(str)); + util_strlcpy(str, &uuid[1], sizeof(str)); pos = strrchr(str, uuid[0]); if (pos == NULL) continue; diff --git a/extras/scsi_id/Makefile.am b/extras/scsi_id/Makefile.am index 62e14e5adb..b6bebb69a5 100644 --- a/extras/scsi_id/Makefile.am +++ b/extras/scsi_id/Makefile.am @@ -15,10 +15,7 @@ scsi_id_SOURCES = \ bsg.h \ ../../udev/lib/libudev.h \ ../../udev/lib/libudev.c \ - ../../udev/lib/libudev-util.c \ - ../../udev/udev_sysdeps.c \ - ../../udev/udev_utils.c \ - ../../udev/udev_utils_string.c + ../../udev/lib/libudev-util.c if USE_SELINUX scsi_id_LDADD = \ diff --git a/extras/usb_id/Makefile.am b/extras/usb_id/Makefile.am index 07692df3a2..ba74baad42 100644 --- a/extras/usb_id/Makefile.am +++ b/extras/usb_id/Makefile.am @@ -24,4 +24,3 @@ endif distclean-local: rm -f Makefile.in - diff --git a/extras/volume_id/Makefile.am b/extras/volume_id/Makefile.am index 75f3e984d6..3e11d5c348 100644 --- a/extras/volume_id/Makefile.am +++ b/extras/volume_id/Makefile.am @@ -14,10 +14,7 @@ vol_id_SOURCES = \ vol_id.c \ ../../udev/lib/libudev.h \ ../../udev/lib/libudev.c \ - ../../udev/lib/libudev-util.c \ - ../../udev/udev_sysdeps.c \ - ../../udev/udev_utils.c \ - ../../udev/udev_utils_string.c + ../../udev/lib/libudev-util.c vol_id_LDADD = \ lib/libvolume_id.la diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c index 4b101be929..79ed099803 100644 --- a/extras/volume_id/vol_id.c +++ b/extras/volume_id/vol_id.c @@ -275,7 +275,7 @@ int main(int argc, char *argv[]) } set_str(label_safe, label, sizeof(label_safe)); - replace_chars(label_safe, ALLOWED_CHARS_INPUT); + util_replace_chars(label_safe, ALLOWED_CHARS_INPUT); volume_id_encode_string(label, label_enc, sizeof(label_enc)); volume_id_encode_string(uuid, uuid_enc, sizeof(uuid_enc)); |