1
0
mirror of https://github.com/systemd/systemd.git synced 2024-11-06 16:59:03 +03:00

bus: use free_and_strdup()

Save some LOCs by replacing strdup()+error-handling+free+assign with
free_and_strdup().
This commit is contained in:
David Herrmann 2015-04-07 15:20:54 +02:00
parent 0a790ab540
commit 0704ea57b7

View File

@ -946,7 +946,6 @@ static int map_basic(sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_
switch (type) {
case SD_BUS_TYPE_STRING: {
const char *s;
char *str;
char **p = userdata;
r = sd_bus_message_read_basic(m, type, &s);
@ -956,14 +955,7 @@ static int map_basic(sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_
if (isempty(s))
break;
str = strdup(s);
if (!str) {
r = -ENOMEM;
break;
}
free(*p);
*p = str;
r = free_and_strdup(p, s);
break;
}