From 1fa2f38f0f011010bf57522b42fcc168856a7003 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 20 Jan 2015 22:22:15 -0500 Subject: Assorted format fixes Types used for pids and uids in various interfaces are unpredictable. Too bad. --- src/libudev/libudev-device.c | 2 +- src/libudev/libudev-monitor.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/libudev') diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c index 825a0e10f..a7446bff7 100644 --- a/src/libudev/libudev-device.c +++ b/src/libudev/libudev-device.c @@ -1686,7 +1686,7 @@ const char *udev_device_get_id_filename(struct udev_device *udev_device) udev_device->id_filename = NULL; } else if (udev_device_get_ifindex(udev_device) > 0) { /* use netdev ifindex -- n3 */ - if (asprintf(&udev_device->id_filename, "n%u", udev_device_get_ifindex(udev_device)) < 0) + if (asprintf(&udev_device->id_filename, "n%i", udev_device_get_ifindex(udev_device)) < 0) udev_device->id_filename = NULL; } else { /* diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c index da2b63473..4cfb2f617 100644 --- a/src/libudev/libudev-monitor.c +++ b/src/libudev/libudev-monitor.c @@ -620,8 +620,8 @@ retry: } } else if (snl.nl.nl_groups == UDEV_MONITOR_KERNEL) { if (snl.nl.nl_pid > 0) { - log_debug("multicast kernel netlink message from pid %d ignored", - snl.nl.nl_pid); + log_debug("multicast kernel netlink message from PID %"PRIu32" ignored", + snl.nl.nl_pid); return NULL; } } @@ -634,7 +634,7 @@ retry: cred = (struct ucred *)CMSG_DATA(cmsg); if (cred->uid != 0) { - log_debug("sender uid=%d, message ignored", cred->uid); + log_debug("sender uid="UID_FMT", message ignored", cred->uid); return NULL; } -- cgit v1.2.3