diff options
Diffstat (limited to 'bus/bus.c')
-rw-r--r-- | bus/bus.c | 30 |
1 files changed, 1 insertions, 29 deletions
@@ -670,32 +670,6 @@ process_config_every_time (BusContext *context, return retval; } -static dbus_bool_t -list_concat_new (DBusList **a, - DBusList **b, - DBusList **result) -{ - DBusList *link; - - *result = NULL; - - for (link = _dbus_list_get_first_link (a); link; link = _dbus_list_get_next_link (a, link)) - { - if (!_dbus_list_append (result, link->data)) - goto oom; - } - for (link = _dbus_list_get_first_link (b); link; link = _dbus_list_get_next_link (b, link)) - { - if (!_dbus_list_append (result, link->data)) - goto oom; - } - - return TRUE; -oom: - _dbus_list_clear (result); - return FALSE; -} - static void raise_file_descriptor_limit (BusContext *context) { @@ -756,9 +730,7 @@ process_config_postinit (BusContext *context, /* We need to monitor both the configuration directories and directories * containing .service files. */ - if (!list_concat_new (bus_config_parser_get_conf_dirs (parser), - bus_config_parser_get_service_dirs (parser), - &watched_dirs)) + if (!bus_config_parser_get_watched_dirs (parser, &watched_dirs)) { BUS_SET_OOM (error); return FALSE; |