chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: fix %h, %s, %p handling in templates in user session
[elogind.git]
/
src
/
core
/
dbus-manager.c
diff --git
a/src/core/dbus-manager.c
b/src/core/dbus-manager.c
index 8a6449493a709544741e3261fcad964bbf7fd065..2010241e6aca8a5c2101d3dca42930dd8cffc4f2 100644
(file)
--- a/
src/core/dbus-manager.c
+++ b/
src/core/dbus-manager.c
@@
-352,17
+352,21
@@
static int bus_manager_set_log_target(DBusMessageIter *i, const char *property,
}
static int bus_manager_append_log_level(DBusMessageIter *i, const char *property, void *data) {
}
static int bus_manager_append_log_level(DBusMessageIter *i, const char *property, void *data) {
- const char *t;
+ char *t;
+ int r;
assert(i);
assert(property);
assert(i);
assert(property);
- t = log_level_to_string(log_get_max_level());
+ r = log_level_to_string_alloc(log_get_max_level(), &t);
+ if (r < 0)
+ return r;
if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &t))
if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &t))
- r
eturn
-ENOMEM;
+ r
=
-ENOMEM;
- return 0;
+ free(t);
+ return r;
}
static int bus_manager_set_log_level(DBusMessageIter *i, const char *property, void *data) {
}
static int bus_manager_set_log_level(DBusMessageIter *i, const char *property, void *data) {
@@
-641,7
+645,7
@@
static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
goto oom;
path = unit_dbus_path(u);
goto oom;
path = unit_dbus_path(u);
- if (!
reply
)
+ if (!
path
)
goto oom;
if (!dbus_message_append_args(
goto oom;
if (!dbus_message_append_args(