chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ca2871d
)
bus: initialize variable, now that we might skip debug logging
author
Kay Sievers
<kay@vrfy.org>
Sun, 20 Oct 2013 22:56:47 +0000
(
00:56
+0200)
committer
Kay Sievers
<kay@vrfy.org>
Sun, 20 Oct 2013 22:56:47 +0000
(
00:56
+0200)
src/core/dbus.c
patch
|
blob
|
history
diff --git
a/src/core/dbus.c
b/src/core/dbus.c
index 771ba01f675aae0d482541c7e2d0006c0b9ad13f..b0ae3e1ae7fd5975d796b1123cd460cfb4b9bedd 100644
(file)
--- a/
src/core/dbus.c
+++ b/
src/core/dbus.c
@@
-768,7
+768,7
@@
static void bus_new_connection(
}
static int init_registered_system_bus(Manager *m) {
}
static int init_registered_system_bus(Manager *m) {
- char *id;
+ char *id
= NULL
;
if (!dbus_connection_add_filter(m->system_bus, system_bus_message_filter, m, NULL))
return log_oom();
if (!dbus_connection_add_filter(m->system_bus, system_bus_message_filter, m, NULL))
return log_oom();
@@
-836,7
+836,8
@@
static int init_registered_api_bus(Manager *m) {
return r;
if (m->running_as == SYSTEMD_USER) {
return r;
if (m->running_as == SYSTEMD_USER) {
- char *id;
+ char *id = NULL;
+
log_debug("Successfully connected to API D-Bus bus %s as %s",
strnull((id = dbus_connection_get_server_id(m->api_bus))),
strnull(dbus_bus_get_unique_name(m->api_bus)));
log_debug("Successfully connected to API D-Bus bus %s as %s",
strnull((id = dbus_connection_get_server_id(m->api_bus))),
strnull(dbus_bus_get_unique_name(m->api_bus)));