diff options
author | Jan Janssen <medhefgo@web.de> | 2022-08-29 13:07:11 +0200 |
---|---|---|
committer | Jan Janssen <medhefgo@web.de> | 2022-08-30 12:03:28 +0200 |
commit | c0f86d66f3f6b561528e7f856f9926bec766c036 (patch) | |
tree | b5b17ffb3a41a7974ff0ad35db009b4f8aa94116 /src/udev | |
parent | 125d108665506e8abfd575f2cbf7adf9d0ae0a00 (diff) | |
download | systemd-c0f86d66f3f6b561528e7f856f9926bec766c036.tar.gz |
tree-wide: Use correct format specifiers
gcc will complain about all these with -Wformat-signedness.
Diffstat (limited to 'src/udev')
-rw-r--r-- | src/udev/dmi_memory_id/dmi_memory_id.c | 2 | ||||
-rw-r--r-- | src/udev/scsi_id/scsi_serial.c | 4 | ||||
-rw-r--r-- | src/udev/udev-builtin-input_id.c | 2 | ||||
-rw-r--r-- | src/udev/udev-builtin-keyboard.c | 4 | ||||
-rw-r--r-- | src/udev/udev-builtin-net_id.c | 2 | ||||
-rw-r--r-- | src/udev/udev-builtin-path_id.c | 2 | ||||
-rw-r--r-- | src/udev/udev-builtin-usb_id.c | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/src/udev/dmi_memory_id/dmi_memory_id.c b/src/udev/dmi_memory_id/dmi_memory_id.c index 338cbc72c0..1345289219 100644 --- a/src/udev/dmi_memory_id/dmi_memory_id.c +++ b/src/udev/dmi_memory_id/dmi_memory_id.c @@ -117,7 +117,7 @@ static void dmi_print_memory_size( code <<= 10; if (slot_num >= 0) - printf("%s_%u_%s=%"PRIu64"\n", attr_prefix, slot_num, attr_suffix, code); + printf("%s_%i_%s=%"PRIu64"\n", attr_prefix, slot_num, attr_suffix, code); else printf("%s_%s=%"PRIu64"\n", attr_prefix, attr_suffix, code); } diff --git a/src/udev/scsi_id/scsi_serial.c b/src/udev/scsi_id/scsi_serial.c index 992d1cf25b..299ccb96fb 100644 --- a/src/udev/scsi_id/scsi_serial.c +++ b/src/udev/scsi_id/scsi_serial.c @@ -284,7 +284,7 @@ static int scsi_inquiry(struct scsi_id_device *dev_scsi, int fd, if (buflen > SCSI_INQ_BUFF_LEN) return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), - "buflen %d too long", buflen); + "buflen %u too long", buflen); resend: if (dev_scsi->use_sg == 4) { @@ -764,7 +764,7 @@ int scsi_std_inquiry(struct scsi_id_device *dev_scsi, const char *devname) { err = 2; goto out; } - sprintf(dev_scsi->kernel,"%d:%d", major(statbuf.st_rdev), + sprintf(dev_scsi->kernel,"%u:%u", major(statbuf.st_rdev), minor(statbuf.st_rdev)); memzero(buf, SCSI_INQ_BUFF_LEN); diff --git a/src/udev/udev-builtin-input_id.c b/src/udev/udev-builtin-input_id.c index f04e29b8f8..6da8ad85bb 100644 --- a/src/udev/udev-builtin-input_id.c +++ b/src/udev/udev-builtin-input_id.c @@ -288,7 +288,7 @@ static bool test_pointers(sd_device *dev, num_well_known_keys++; if (num_well_known_keys >= 4 || num_joystick_buttons + num_joystick_axes < 2) { - log_device_debug(dev, "Input device has %zd joystick buttons and %zd axes but also %zd keyboard key sets, " + log_device_debug(dev, "Input device has %zu joystick buttons and %zu axes but also %zu keyboard key sets, " "assuming this is a keyboard, not a joystick.", num_joystick_buttons, num_joystick_axes, num_well_known_keys); is_joystick = false; diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c index b09757bfc2..6dd9eebd93 100644 --- a/src/udev/udev-builtin-keyboard.c +++ b/src/udev/udev-builtin-keyboard.c @@ -78,11 +78,11 @@ static int map_keycode(sd_device *dev, int fd, int scancode, const char *keycode map.scan = scancode; map.key = keycode_num; - log_device_debug(dev, "keyboard: mapping scan code %d (0x%x) to key code %d (0x%x)", + log_device_debug(dev, "keyboard: mapping scan code %u (0x%x) to key code %u (0x%x)", map.scan, map.scan, map.key, map.key); if (ioctl(fd, EVIOCSKEYCODE, &map) < 0) - return log_device_error_errno(dev, errno, "Failed to call EVIOCSKEYCODE with scan code 0x%x, and key code %d: %m", map.scan, map.key); + return log_device_error_errno(dev, errno, "Failed to call EVIOCSKEYCODE with scan code 0x%x, and key code %u: %m", map.scan, map.key); return 0; } diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c index 33fce6e140..4749cb4cf2 100644 --- a/src/udev/udev-builtin-net_id.c +++ b/src/udev/udev-builtin-net_id.c @@ -938,7 +938,7 @@ static int names_mac(sd_device *dev, const LinkInfo *info) { return log_device_debug_errno(dev, r, "Failed to parse addr_assign_type: %m"); if (i != NET_ADDR_PERM) return log_device_debug_errno(dev, SYNTHETIC_ERRNO(EINVAL), - "addr_assign_type=%d, MAC address is not permanent.", i); + "addr_assign_type=%u, MAC address is not permanent.", i); return 0; } diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c index d33eede984..ce7bc5caf0 100644 --- a/src/udev/udev-builtin-path_id.c +++ b/src/udev/udev-builtin-path_id.c @@ -374,7 +374,7 @@ static sd_device *handle_scsi_default(sd_device *parent, char **path) { return hostdev; host -= basenum; - path_prepend(path, "scsi-%u:%u:%u:%u", host, bus, target, lun); + path_prepend(path, "scsi-%i:%i:%i:%i", host, bus, target, lun); return hostdev; } diff --git a/src/udev/udev-builtin-usb_id.c b/src/udev/udev-builtin-usb_id.c index d37469c62b..eb32661255 100644 --- a/src/udev/udev-builtin-usb_id.c +++ b/src/udev/udev-builtin-usb_id.c @@ -292,7 +292,7 @@ static int builtin_usb_id(sd_device *dev, sd_netlink **rtnl, int argc, char *arg } else set_usb_iftype(type_str, if_class_num, sizeof(type_str)-1); - log_device_debug(dev_interface, "if_class:%d protocol:%d", if_class_num, protocol); + log_device_debug(dev_interface, "if_class:%u protocol:%i", if_class_num, protocol); /* usb device directory */ r = sd_device_get_parent_with_subsystem_devtype(dev_interface, "usb", "usb_device", &dev_usb); |