fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-04 05:10:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dispatcher: move global variable ever_aquired_name into "gl" struct

Browse source
This commit is contained in:
Thomas Haller 2019-05-23 10:58:35 +02:00
parent a454e418d4
commit 90e4ba15bc
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dispatcher/nm-dispatcher.c
View file

@ -42,6 +42,7 @@ static struct {
gboolean persist;
guint quit_id;
guint request_id_counter;
gboolean ever_acquired_name;
} gl;
typedef struct Request Request;
@ -869,14 +870,12 @@ handle_action (NMDBusDispatcher *dbus_dispatcher,
return TRUE;
}
static gboolean ever_acquired_name = FALSE;
static void
on_name_acquired (GDBusConnection *connection,
const char *name,
gpointer user_data)
{
ever_acquired_name = TRUE;
gl.ever_acquired_name = TRUE;
}
static void
@ -885,14 +884,14 @@ on_name_lost (GDBusConnection *connection,
gpointer user_data)
{
if (!connection) {
if (!ever_acquired_name) {
if (!gl.ever_acquired_name) {
_LOG_X_W ("Could not get the system bus. Make sure the message bus daemon is running!");
exit (1);
} else {
_LOG_X_I ("System bus stopped. Exiting");
exit (0);
}
} else if (!ever_acquired_name) {
} else if (!gl.ever_acquired_name) {
_LOG_X_W ("Could not acquire the " NM_DISPATCHER_DBUS_SERVICE " service.");
exit (1);
} else {