colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core/dispatcher: refactor nm_dispatcher_need_device()

Browse Source 
Remove the "nm_" prefix that is usually reserved for non-static
functions. Also, use NM_IN_SET.
This commit is contained in:
Beniamino Galvani
2023-09-29 13:27:26 +02:00
parent fa6ce51a0b
commit 98b73e88e6
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/core/nm-dispatcher.c
View File

@@ -50,8 +50,6 @@
} \ } \
G_STMT_END G_STMT_END
static gboolean nm_dispatcher_need_device(NMDispatcherAction action);
/*****************************************************************************/ /*****************************************************************************/
struct NMDispatcherCallId { struct NMDispatcherCallId {
@@ -84,6 +82,20 @@ static struct {
/*****************************************************************************/ /*****************************************************************************/
/* All actions except 'hostname', 'connectivity-change' and 'dns-change' require
* a device */
static gboolean
action_need_device(NMDispatcherAction action)
{
if (NM_IN_SET(action,
NM_DISPATCHER_ACTION_HOSTNAME,
NM_DISPATCHER_ACTION_CONNECTIVITY_CHANGE,
NM_DISPATCHER_ACTION_DNS_CHANGE)) {
return FALSE;
}
return TRUE;
}
static NMDispatcherCallId * static NMDispatcherCallId *
dispatcher_call_id_new(guint32 request_id, dispatcher_call_id_new(guint32 request_id,
gint64 start_at_msec, gint64 start_at_msec,
@@ -533,7 +545,7 @@ _dispatcher_call(NMDispatcherAction action,
if (G_UNLIKELY(!request_id)) if (G_UNLIKELY(!request_id))
request_id = ++gl.request_id_counter; request_id = ++gl.request_id_counter;
if (!nm_dispatcher_need_device(action)) { if (!action_need_device(action)) {
_LOG2D(request_id, _LOG2D(request_id,
log_ifname, log_ifname,
log_con_uuid, log_con_uuid,
@@ -594,7 +606,7 @@ _dispatcher_call(NMDispatcherAction action,
g_variant_builder_init(&vpn_ip6_props, G_VARIANT_TYPE_VARDICT); g_variant_builder_init(&vpn_ip6_props, G_VARIANT_TYPE_VARDICT);
/* hostname, DNS and connectivity-change actions don't send device data */ /* hostname, DNS and connectivity-change actions don't send device data */
if (nm_dispatcher_need_device(action)) { if (action_need_device(action)) {
fill_device_props(device, fill_device_props(device,
&device_props, &device_props,
&device_proxy_props, &device_proxy_props,
@@ -957,16 +969,3 @@ nm_dispatcher_call_cancel(NMDispatcherCallId *call_id)
_LOG3D(call_id, "cancelling dispatcher callback action"); _LOG3D(call_id, "cancelling dispatcher callback action");
call_id->callback = NULL; call_id->callback = NULL;
} }
/* All actions except 'hostname', 'connectivity-change' and 'dns-change' require
* a device */
static gboolean
nm_dispatcher_need_device(NMDispatcherAction action)
{
if (action == NM_DISPATCHER_ACTION_HOSTNAME
|| action == NM_DISPATCHER_ACTION_CONNECTIVITY_CHANGE
|| action == NM_DISPATCHER_ACTION_DNS_CHANGE) {
return FALSE;
}
return TRUE;
}