diff options
| author | Alban Crequy <alban.crequy@collabora.co.uk> | 2012-05-28 11:11:26 +0000 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2012-05-29 16:02:11 +0200 |
| commit | 790e6c4c06771bff6b024eb27868de2aacdb2ad9 (patch) | |
| tree | cc22f965209aa85275ca7d86482598252ffbaa41 | |
| parent | 506e12fb6a5c6439a44b81894b2cf157c1ece8c3 (diff) | |
| download | dbus-790e6c4c06771bff6b024eb27868de2aacdb2ad9.tar.gz | |
Move shutdown_server()
It will make the following changes easier
| -rw-r--r-- | bus/bus.c | 46 |
1 files changed, 23 insertions, 23 deletions
@@ -207,6 +207,29 @@ free_server_data (void *data) dbus_free (bd); } +static void +shutdown_server (BusContext *context, + DBusServer *server) +{ + if (server == NULL || + !dbus_server_get_is_connected (server)) + return; + + if (!dbus_server_set_watch_functions (server, + NULL, NULL, NULL, + context, + NULL)) + _dbus_assert_not_reached ("setting watch functions to NULL failed"); + + if (!dbus_server_set_timeout_functions (server, + NULL, NULL, NULL, + context, + NULL)) + _dbus_assert_not_reached ("setting timeout functions to NULL failed"); + + dbus_server_disconnect (server); +} + static dbus_bool_t setup_server (BusContext *context, DBusServer *server, @@ -1018,29 +1041,6 @@ bus_context_reload_config (BusContext *context, return ret; } -static void -shutdown_server (BusContext *context, - DBusServer *server) -{ - if (server == NULL || - !dbus_server_get_is_connected (server)) - return; - - if (!dbus_server_set_watch_functions (server, - NULL, NULL, NULL, - context, - NULL)) - _dbus_assert_not_reached ("setting watch functions to NULL failed"); - - if (!dbus_server_set_timeout_functions (server, - NULL, NULL, NULL, - context, - NULL)) - _dbus_assert_not_reached ("setting timeout functions to NULL failed"); - - dbus_server_disconnect (server); -} - void bus_context_shutdown (BusContext *context) { |