X-Git-Url: https://code.delx.au/pulseaudio/blobdiff_plain/0b388bff522f689fdb4d98529a39f3701db57c08..0a583fe0c330d167f52784585afffdd8065a92cd:/src/daemon/server-lookup.c diff --git a/src/daemon/server-lookup.c b/src/daemon/server-lookup.c index 45796e72..1f088e6d 100644 --- a/src/daemon/server-lookup.c +++ b/src/daemon/server-lookup.c @@ -42,7 +42,7 @@ struct pa_dbusobj_server_lookup { pa_core *core; pa_dbus_connection *conn; - pa_bool_t path_registered; + bool path_registered; }; static const char introspection[] = @@ -82,7 +82,7 @@ static void unregister_cb(DBusConnection *conn, void *user_data) { pa_assert(sl); pa_assert(sl->path_registered); - sl->path_registered = FALSE; + sl->path_registered = false; } static DBusHandlerResult handle_introspect(DBusConnection *conn, DBusMessage *msg, pa_dbusobj_server_lookup *sl) { @@ -126,7 +126,7 @@ static enum get_address_result_t get_address(pa_server_type_t server_type, char *address = NULL; - if (pa_client_conf_load(conf, NULL) < 0) { + if (pa_client_conf_load(conf) < 0) { r = FAILED_TO_LOAD_CLIENT_CONF; goto finish; } @@ -482,10 +482,10 @@ pa_dbusobj_server_lookup *pa_dbusobj_server_lookup_new(pa_core *c) { sl = pa_xnew(pa_dbusobj_server_lookup, 1); sl->core = c; - sl->path_registered = FALSE; + sl->path_registered = false; if (!(sl->conn = pa_dbus_bus_get(c, DBUS_BUS_SESSION, &error)) || dbus_error_is_set(&error)) { - pa_log("Unable to contact D-Bus: %s: %s", error.name, error.message); + pa_log_warn("Unable to contact D-Bus: %s: %s", error.name, error.message); goto fail; } @@ -494,7 +494,7 @@ pa_dbusobj_server_lookup *pa_dbusobj_server_lookup_new(pa_core *c) { goto fail; } - sl->path_registered = TRUE; + sl->path_registered = true; return sl;