diff --git a/bus/main.c b/bus/main.c index ee5e1ebf..612b4a6c 100644 --- a/bus/main.c +++ b/bus/main.c @@ -440,14 +440,14 @@ main (int argc, char **argv) { check_two_config_files (&config_file, "system"); - if (!_dbus_append_system_config_file (&config_file)) + if (!_dbus_get_system_config_file (&config_file)) exit (1); } else if (strcmp (arg, "--session") == 0) { check_two_config_files (&config_file, "session"); - if (!_dbus_append_session_config_file (&config_file)) + if (!_dbus_get_session_config_file (&config_file)) exit (1); } else if (strstr (arg, "--config-file=") == arg) diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c index 9b724cc9..06a790a8 100644 --- a/dbus/dbus-sysdeps-util-unix.c +++ b/dbus/dbus-sysdeps-util-unix.c @@ -1424,27 +1424,31 @@ _dbus_get_standard_system_servicedirs (DBusList **dirs) } /** - * Append the absolute path of the system.conf file + * Get the absolute path of the system.conf file * (there is no system bus on Windows so this can just * return FALSE and print a warning or something) * - * @param str the string to append to + * @param str the string to append to, which must be empty on entry * @returns #FALSE if no memory */ dbus_bool_t -_dbus_append_system_config_file (DBusString *str) +_dbus_get_system_config_file (DBusString *str) { + _dbus_assert (_dbus_string_get_length (str) == 0); + return _dbus_string_append (str, DBUS_SYSTEM_CONFIG_FILE); } /** - * Append the absolute path of the session.conf file. + * Get the absolute path of the session.conf file. * - * @param str the string to append to + * @param str the string to append to, which must be empty on entry * @returns #FALSE if no memory */ dbus_bool_t -_dbus_append_session_config_file (DBusString *str) +_dbus_get_session_config_file (DBusString *str) { + _dbus_assert (_dbus_string_get_length (str) == 0); + return _dbus_string_append (str, DBUS_SESSION_CONFIG_FILE); } diff --git a/dbus/dbus-sysdeps-util-win.c b/dbus/dbus-sysdeps-util-win.c index 096ffee3..96100d49 100644 --- a/dbus/dbus-sysdeps-util-win.c +++ b/dbus/dbus-sysdeps-util-win.c @@ -1677,27 +1677,31 @@ _dbus_get_config_file_name (DBusString *str, } /** - * Append the absolute path of the system.conf file + * Get the absolute path of the system.conf file * (there is no system bus on Windows so this can just * return FALSE and print a warning or something) * - * @param str the string to append to + * @param str the string to append to, which must be empty on entry * @returns #FALSE if no memory */ dbus_bool_t -_dbus_append_system_config_file (DBusString *str) +_dbus_get_system_config_file (DBusString *str) { + _dbus_assert (_dbus_string_get_length (str) == 0); + return _dbus_get_config_file_name(str, "system.conf"); } /** - * Append the absolute path of the session.conf file. + * Get the absolute path of the session.conf file. * - * @param str the string to append to + * @param str the string to append to, which must be empty on entry * @returns #FALSE if no memory */ dbus_bool_t -_dbus_append_session_config_file (DBusString *str) +_dbus_get_session_config_file (DBusString *str) { + _dbus_assert (_dbus_string_get_length (str) == 0); + return _dbus_get_config_file_name(str, "session.conf"); } diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h index 79a6cc7c..fb338df9 100644 --- a/dbus/dbus-sysdeps.h +++ b/dbus/dbus-sysdeps.h @@ -432,8 +432,8 @@ dbus_bool_t _dbus_path_is_absolute (const DBusString *filename); dbus_bool_t _dbus_get_standard_session_servicedirs (DBusList **dirs); dbus_bool_t _dbus_get_standard_system_servicedirs (DBusList **dirs); -dbus_bool_t _dbus_append_system_config_file (DBusString *str); -dbus_bool_t _dbus_append_session_config_file (DBusString *str); +dbus_bool_t _dbus_get_system_config_file (DBusString *str); +dbus_bool_t _dbus_get_session_config_file (DBusString *str); /** Opaque type for reading a directory listing */ typedef struct DBusDirIter DBusDirIter;