diff options
| author | Simon McVittie <smcv@collabora.com> | 2018-07-23 17:33:24 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2018-08-02 15:26:27 +0100 |
| commit | 46cdc12830c413a80ca13b1fae0a7dc1f8ced263 (patch) | |
| tree | 8afa4c3641894b9c6aeaaf49ed60684b0c4f2fc2 /bus/activation.c | |
| parent | 7efc06293ab8a6bf4aba50dac0da55e4a583360a (diff) | |
| download | dbus-46cdc12830c413a80ca13b1fae0a7dc1f8ced263.tar.gz | |
Add and use _dbus_list_clear_full
In gcc 8, -Wall -Wextra includes -Wcast-function-type, which warns
about passing an extra (unwanted) parameter to callbacks. Instead
of using _dbus_list_foreach(), add a function to do what we actually
wanted here.
Signed-off-by: Simon McVittie <smcv@collabora.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=107349
Reviewed-by: Thiago Macieira <thiago@kde.org>
Diffstat (limited to 'bus/activation.c')
| -rw-r--r-- | bus/activation.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/bus/activation.c b/bus/activation.c index 62058851..8f17711e 100644 --- a/bus/activation.c +++ b/bus/activation.c @@ -914,9 +914,8 @@ bus_activation_reload (BusActivation *activation, goto failed; } - _dbus_list_foreach (&activation->directories, - (DBusForeachFunction) bus_service_directory_unref, NULL); - _dbus_list_clear (&activation->directories); + _dbus_list_clear_full (&activation->directories, + (DBusFreeFunction) bus_service_directory_unref); link = _dbus_list_get_first_link (directories); while (link != NULL) @@ -1063,9 +1062,8 @@ bus_activation_unref (BusActivation *activation) if (activation->pending_activations) _dbus_hash_table_unref (activation->pending_activations); - _dbus_list_foreach (&activation->directories, - (DBusForeachFunction) bus_service_directory_unref, NULL); - _dbus_list_clear (&activation->directories); + _dbus_list_clear_full (&activation->directories, + (DBusFreeFunction) bus_service_directory_unref); if (activation->environment) _dbus_hash_table_unref (activation->environment); |