summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorLukas Nykryn <lnykryn@redhat.com>2014-11-20 16:06:18 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-11-23 19:15:20 -0500
commitf44b9efcec4594eb8f843325ee3079b44fb8f24a (patch)
tree404f03b832cf9e91e8473b3e9119b8e6ee7e11c6 /src/core
parent58f10d401f1d3cd76f560e1914147040e8defa76 (diff)
dbus: return non-zero return value in the case that prefix won't match
strv_extend returns 0 in the case of success which means that else if (bus_track_deserialize_item(&m->deserialized_subscribed, l) == 0) log_warning("Unknown serialization item '%s'", l); will be printed when value is added correctly.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/dbus.c2
-rw-r--r--src/core/manager.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/dbus.c b/src/core/dbus.c
index 9cb198a13a..ec1c0d4336 100644
--- a/src/core/dbus.c
+++ b/src/core/dbus.c
@@ -1180,7 +1180,7 @@ int bus_track_deserialize_item(char ***l, const char *line) {
e = startswith(line, "subscribed=");
if (!e)
- return 0;
+ return -EINVAL;
return strv_extend(l, e);
}
diff --git a/src/core/manager.c b/src/core/manager.c
index 2bc1058436..7abc8a9a5e 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -2408,7 +2408,7 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) {
m->kdbus_fd = fdset_remove(fds, fd);
}
- } else if (bus_track_deserialize_item(&m->deserialized_subscribed, l) == 0)
+ } else if (bus_track_deserialize_item(&m->deserialized_subscribed, l) < 0)
log_warning("Unknown serialization item '%s'", l);
}