picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Yu Watanabe 2019-04-30 20:35:08 +02:00
parent ce4f94b8e9
commit 1b65f1ebc3
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/udev/udev-event.c
View file

@ -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: {