fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-02-19 03:00:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename getters for session, system config files

Browse source 
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>
This commit is contained in:
Simon McVittie 2015-09-18 17:52:07 +01:00
parent 9f01817415
commit 8b7f332bca
4 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bus/main.c
View file

@ -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)

16
dbus/dbus-sysdeps-util-unix.c
View file

@ -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);
}

16
dbus/dbus-sysdeps-util-win.c
View file

@ -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");
}

4
dbus/dbus-sysdeps.h
View file

@ -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;