diff --git a/man/rules/meson.build b/man/rules/meson.build index 6cb2e7ffb1..8a69d046bf 100644 --- a/man/rules/meson.build +++ b/man/rules/meson.build @@ -166,7 +166,10 @@ manpages = [ 'sd_bus_open_system', 'sd_bus_open_system_machine', 'sd_bus_open_system_remote', - 'sd_bus_open_user'], + 'sd_bus_open_system_with_description', + 'sd_bus_open_user', + 'sd_bus_open_user_with_description', + 'sd_bus_open_with_description'], ''], ['sd_bus_error', '3', diff --git a/man/sd_bus_default.xml b/man/sd_bus_default.xml index 0d3532f3c7..73ad568b91 100644 --- a/man/sd_bus_default.xml +++ b/man/sd_bus_default.xml @@ -24,8 +24,11 @@ sd_bus_default_system sd_bus_open + sd_bus_open_with_description sd_bus_open_user + sd_bus_open_user_with_description sd_bus_open_system + sd_bus_open_system_with_description sd_bus_open_system_remote sd_bus_open_system_machine @@ -56,16 +59,34 @@ sd_bus **bus + + int sd_bus_open_with_description + sd_bus **bus + const char *description + + int sd_bus_open_user sd_bus **bus + + int sd_bus_open_user_with_description + sd_bus **bus + const char *description + + int sd_bus_open_system sd_bus **bus + + int sd_bus_open_system_with_description + sd_bus **bus + const char *description + + int sd_bus_open_system_remote sd_bus **bus @@ -126,6 +147,20 @@ sd_bus_default_system() to connect to the user or system buses. + sd_bus_open_with_description(), + sd_bus_open_user_with_description(), and + sd_bus_open_system_with_description() are similar to + sd_bus_open(), sd_bus_open_user(), and + sd_bus_open_system(), but allow a description string to be set, see + sd_bus_set_description3. + description may be NULL, in which case this function + is equivalent to sd_bus_open(). This description string is used in log + messages about the bus object, and including a "name" for the bus makes them easier to + understand. Some messages are emitted during bus initialization, hence using this function is + prefereable to setting the description later with + sd_bus_open_with_description(). The argument is copied internally and will + not be referenced after the function returns. + If the $DBUS_SESSION_BUS_ADDRESS environment variable is set (cf. environ7),