X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fdbus.c;h=b0ae3e1ae7fd5975d796b1123cd460cfb4b9bedd;hp=aa3d93bf06f315a342970a56a8958ab5a4f798cc;hb=bd4b5df2cb253f130ecdac604e865e3f832c316a;hpb=71445ae75b0e9954d141e5f0ee97803b406ea332

diff --git a/src/core/dbus.c b/src/core/dbus.c
index aa3d93bf0..b0ae3e1ae 100644
--- 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) {
-        char *id;
+        char *id = NULL;
 
         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) {
-                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)));
@@ -1170,7 +1171,7 @@ static void shutdown_connection(Manager *m, DBusConnection *c) {
                 JobBusClient *cl, *nextcl;
                 LIST_FOREACH_SAFE(client, cl, nextcl, j->bus_client_list) {
                         if (cl->bus == c) {
-                                LIST_REMOVE(JobBusClient, client, j->bus_client_list, cl);
+                                LIST_REMOVE(client, j->bus_client_list, cl);
                                 free(cl);
                         }
                 }