From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 30 Apr 2019 18:35:08 +0000 (+0200)
Subject: udev: replace xsprintf() + strpcpy() by strpcpyf()
X-Git-Tag: v243-rc1~328^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1b65f1ebc3324e2a86a6b446b56a0ec428f8be93;p=thirdparty%2Fsystemd.git

udev: replace xsprintf() + strpcpy() by strpcpyf()
---

diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
index 8d96e8e3e21..97499787f5f 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: {