From 1b65f1ebc3324e2a86a6b446b56a0ec428f8be93 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 30 Apr 2019 20:35:08 +0200 Subject: [PATCH] udev: replace xsprintf() + strpcpy() by strpcpyf() --- src/udev/udev-event.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c index 8d96e8e3e2..97499787f5 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c @@ -234,7 +234,6 @@ static ssize_t udev_event_subst_format( sd_device *parent, *dev = event->dev; const char *val = NULL; char *s = dest; - dev_t devnum; int r; switch (type) { @@ -278,13 +277,12 @@ static ssize_t udev_event_subst_format( break; case FORMAT_SUBST_MAJOR: case FORMAT_SUBST_MINOR: { - char buf[DECIMAL_STR_MAX(unsigned)]; + dev_t devnum; r = sd_device_get_devnum(dev, &devnum); if (r < 0 && r != -ENOENT) return r; - xsprintf(buf, "%u", r < 0 ? 0 : type == FORMAT_SUBST_MAJOR ? major(devnum) : minor(devnum)); - l = strpcpy(&s, l, buf); + l = strpcpyf(&s, l, "%u", r < 0 ? 0 : type == FORMAT_SUBST_MAJOR ? major(devnum) : minor(devnum)); break; } case FORMAT_SUBST_RESULT: { -- 2.25.1