From 4e24ebcc7b04a11cdd1149086a6d9eb7da8d18a8 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sat, 4 May 2019 11:00:31 +0200 Subject: [PATCH] core: minor cleanup --- src/nm-auth-manager.c | 12 +++++++----- src/nm-auth-utils.c | 3 +-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/nm-auth-manager.c b/src/nm-auth-manager.c index 09a217ea11..bae437b6c1 100644 --- a/src/nm-auth-manager.c +++ b/src/nm-auth-manager.c @@ -365,11 +365,13 @@ nm_auth_manager_check_authorization (NMAuthManager *self, ? POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION : POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE; - call_id = g_slice_new0 (NMAuthManagerCallId); - call_id->self = g_object_ref (self); - call_id->callback = callback; - call_id->user_data = user_data; - call_id->call_numid = ++priv->call_numid_counter; + call_id = g_slice_new (NMAuthManagerCallId); + *call_id = (NMAuthManagerCallId) { + .self = g_object_ref (self), + .callback = callback, + .user_data = user_data, + .call_numid = ++priv->call_numid_counter, + }; c_list_link_tail (&priv->calls_lst_head, &call_id->calls_lst); if (!priv->polkit_enabled) { diff --git a/src/nm-auth-utils.c b/src/nm-auth-utils.c index 81ea66a2ab..454a6621c1 100644 --- a/src/nm-auth-utils.c +++ b/src/nm-auth-utils.c @@ -345,7 +345,6 @@ nm_auth_chain_add_call_unsafe (NMAuthChain *self, gboolean allow_interaction) { AuthCall *call; - NMAuthManager *auth_manager = nm_auth_manager_get (); g_return_if_fail (self); g_return_if_fail (self->subject); @@ -375,7 +374,7 @@ nm_auth_chain_add_call_unsafe (NMAuthChain *self, * call. */ c_list_link_front (&self->auth_call_lst_head, &call->auth_call_lst); - call->call_id = nm_auth_manager_check_authorization (auth_manager, + call->call_id = nm_auth_manager_check_authorization (nm_auth_manager_get (), self->subject, permission, allow_interaction,