Commit ca3805b1 authored by Simon McVittie's avatar Simon McVittie

activation-helper: Rename bus_config_parser_get_service_dirs

I'm about to change the version in the full-fat parser to return
BusServiceDir structs. Name this one with "paths" instead, to avoid
confusion.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=99825Reviewed-by: Philip Withnall's avatarPhilip Withnall <withnall@endlessm.com>
Signed-off-by: default avatarSimon McVittie <simon.mcvittie@collabora.co.uk>
parent 613dd7dd
......@@ -80,7 +80,7 @@ desktop_file_for_name (BusConfigParser *parser,
goto out;
}
service_dirs = bus_config_parser_get_service_dirs (parser);
service_dirs = bus_config_parser_get_service_paths (parser);
for (link = _dbus_list_get_first_link (service_dirs);
link != NULL;
link = _dbus_list_get_next_link (service_dirs, link))
......
......@@ -367,8 +367,11 @@ bus_config_parser_get_type (BusConfigParser *parser)
return _dbus_string_get_const_data (&parser->bus_type);
}
/*
* @returns A list of strings, owned by the BusConfigParser
*/
DBusList**
bus_config_parser_get_service_dirs (BusConfigParser *parser)
bus_config_parser_get_service_paths (BusConfigParser *parser)
{
return &parser->service_dirs;
}
......@@ -441,7 +444,7 @@ check_return_values (const DBusString *full_path)
printf (" <type>system</type> OKAY!\n");
/* check dirs return value is okay */
dirs = bus_config_parser_get_service_dirs (parser);
dirs = bus_config_parser_get_service_paths (parser);
if (dirs == NULL)
{
_dbus_warn ("Service dirs are NULL!");
......
......@@ -59,7 +59,7 @@ dbus_bool_t bus_config_parser_finished (BusConfigParser *parser,
/* Functions for extracting the parse results */
const char* bus_config_parser_get_user (BusConfigParser *parser);
const char* bus_config_parser_get_type (BusConfigParser *parser);
DBusList** bus_config_parser_get_service_dirs (BusConfigParser *parser);
DBusList** bus_config_parser_get_service_paths (BusConfigParser *parser);
/* Loader functions (backended off one of the XML parsers). Returns a
* finished ConfigParser.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment