diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-09-18 17:52:07 +0100 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-09-30 15:49:29 +0100 |
commit | 8b7f332bca062899c3d82e5ad18a31cf26fcbb7c (patch) | |
tree | ba63e70206fc198f66b3f79a5be77b82ed1373ed /dbus/dbus-sysdeps-util-win.c | |
parent | 9f01817415efb937d8cf19f44eca005ba8f983be (diff) | |
download | dbus-8b7f332bca062899c3d82e5ad18a31cf26fcbb7c.tar.gz |
Rename getters for session, system config files
It turns out to be easier to implement the Windows version
of these in a relocatable way if it can assume that the
argument starts empty, which is in fact true in practice.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=83539
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Diffstat (limited to 'dbus/dbus-sysdeps-util-win.c')
-rw-r--r-- | dbus/dbus-sysdeps-util-win.c | 16 |
1 files changed, 10 insertions, 6 deletions
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"); } |