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

core: modernize device_set_sysfs() a bit

Browse source
This commit is contained in:
Lennart Poettering 2018-06-04 18:03:02 +02:00
parent b47837ac41
commit ccd419f0e7
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/core/device.c
View file

@ -55,8 +55,8 @@ static void device_unset_sysfs(Device *d) {
} }
static int device_set_sysfs(Device *d, const char *sysfs) { static int device_set_sysfs(Device *d, const char *sysfs) {
_cleanup_free_ char *copy = NULL;
Device *first; Device *first;
char *copy;
int r; int r;
assert(d); assert(d);
@ -80,12 +80,10 @@ static int device_set_sysfs(Device *d, const char *sysfs) {
r = hashmap_replace(UNIT(d)->manager->devices_by_sysfs, copy, first); r = hashmap_replace(UNIT(d)->manager->devices_by_sysfs, copy, first);
if (r < 0) { if (r < 0) {
LIST_REMOVE(same_sysfs, first, d); LIST_REMOVE(same_sysfs, first, d);
free(copy);
return r; return r;
} }
d->sysfs = copy; d->sysfs = TAKE_PTR(copy);
return 0; return 0;
} }