summaryrefslogtreecommitdiff
path: root/src/libelogind/sd-bus
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@gmail.com>2015-04-07 15:20:54 +0200
committerSven Eden <yamakuzure@gmx.net>2017-03-14 07:51:45 +0100
commit443f3cffeef13c6ca71f79822f0918600bc6187d (patch)
treee3db9a9e68ef0e38eee84abe69db9c0fc11839f7 /src/libelogind/sd-bus
parentaa70affbcd1849cc5a36b1387846752cec6eec1c (diff)
bus: use free_and_strdup()
Save some LOCs by replacing strdup()+error-handling+free+assign with free_and_strdup().
Diffstat (limited to 'src/libelogind/sd-bus')
-rw-r--r--src/libelogind/sd-bus/bus-util.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/libelogind/sd-bus/bus-util.c b/src/libelogind/sd-bus/bus-util.c
index 4bc16aa90..78ef289eb 100644
--- a/src/libelogind/sd-bus/bus-util.c
+++ b/src/libelogind/sd-bus/bus-util.c
@@ -958,7 +958,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);
@@ -968,14 +967,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;
}