system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-22 10:46:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

device: inline device helper structs QueuedState and PingInfo

Browse source 
These two structs are only used at exactly one place: as the type
for a field in NMDevicePrivate.

Having additional structs (that are only used at one place) only
add noise. Also, there are already prior-acts of using unnamed
structs in NMDevicePrivate in case of structs that only serve
to group/namespace a set of fields.
This commit is contained in:
Thomas Haller 2017-02-02 12:28:32 +01:00
parent e347d96596
commit 5151a6071f
1 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/devices/nm-device.c
View file

@ -164,12 +164,6 @@ typedef enum {
IP_FAIL
} IpState;
typedef struct {
NMDeviceState state;
NMDeviceStateReason reason;
guint id;
} QueuedState;
typedef struct {
NMDevice *slave;
gulong watch_id;
@ -177,16 +171,6 @@ typedef struct {
bool configure;
} SlaveInfo;
typedef struct {
NMLogDomain log_domain;
guint timeout;
guint watch;
GPid pid;
const char *binary;
const char *address;
guint deadline;
} PingInfo;
typedef struct {
NMDevice *device;
guint idle_add_id;
@ -216,7 +200,11 @@ typedef struct _NMDevicePrivate {
NMDeviceState state;
NMDeviceStateReason state_reason;
QueuedState queued_state;
struct {
NMDeviceState state;
NMDeviceStateReason reason;
guint id;
} queued_state;
guint queued_ip4_config_id;
guint queued_ip6_config_id;
GSList *pending_actions;
@ -354,7 +342,15 @@ typedef struct _NMDevicePrivate {
guint num_tries_left;
} dhcp4;
PingInfo gw_ping;
struct {
NMLogDomain log_domain;
guint timeout;
guint watch;
GPid pid;
const char *binary;
const char *address;
guint deadline;
} gw_ping;
/* dnsmasq stuff for shared connections */
NMDnsMasqManager *dnsmasq_manager;