diff options
| author | Dan Winship <danw@gnome.org> | 2014-06-26 13:44:36 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-08-01 14:34:06 -0400 |
| commit | 3ac0f528780895c474a437bd75ab7e4baeaa83aa (patch) | |
| tree | 29593182408053cc42b9f76f0245ff8a1b46634d /src/devices/nm-device.c | |
| parent | b4ae6eaec9cec10d68bdcce7151b07451e4de6a3 (diff) | |
| download | NetworkManager-3ac0f528780895c474a437bd75ab7e4baeaa83aa.tar.gz | |
libnm, core, cli, tui: fix the capitalization of various types
GLib/Gtk have mostly settled on the convention that two-letter
acronyms in type names remain all-caps (eg, "IO"), but longer acronyms
become initial-caps-only (eg, "Tcp").
NM was inconsistent, with most long acronyms using initial caps only
(Adsl, Cdma, Dcb, Gsm, Olpc, Vlan), but others using all caps (DHCP,
PPP, PPPOE, VPN). Fix libnm and src/ to use initial-caps only for all
three-or-more-letter-long acronyms (and update nmcli and nmtui for the
libnm changes).
Diffstat (limited to 'src/devices/nm-device.c')
| -rw-r--r-- | src/devices/nm-device.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 133e0dddcc..fbce831b51 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -253,9 +253,9 @@ typedef struct { NMIP4Config * wwan_ip4_config; /* WWAN configuration */ /* DHCPv4 tracking */ - NMDHCPClient * dhcp4_client; + NMDhcpClient * dhcp4_client; gulong dhcp4_state_sigid; - NMDHCP4Config * dhcp4_config; + NMDhcp4Config * dhcp4_config; NMIP4Config * vpn4_config; /* routes added by a VPN which uses this device */ guint arp_round2_id; @@ -290,10 +290,10 @@ typedef struct { GHashTable * ip6_saved_properties; - NMDHCPClient * dhcp6_client; + NMDhcpClient * dhcp6_client; NMRDiscDHCPLevel dhcp6_mode; gulong dhcp6_state_sigid; - NMDHCP6Config * dhcp6_config; + NMDhcp6Config * dhcp6_config; /* IP6 config from DHCP */ NMIP6Config * dhcp6_ip6_config; @@ -2683,7 +2683,7 @@ dhcp4_fail (NMDevice *self, gboolean timeout) } static void -dhcp4_update_config (NMDevice *self, NMDHCP4Config *config, GHashTable *options) +dhcp4_update_config (NMDevice *self, NMDhcp4Config *config, GHashTable *options) { GHashTableIter iter; const char *key, *value; @@ -2699,7 +2699,7 @@ dhcp4_update_config (NMDevice *self, NMDHCP4Config *config, GHashTable *options) } static void -dhcp4_state_changed (NMDHCPClient *client, +dhcp4_state_changed (NMDhcpClient *client, NMDhcpState state, NMIP4Config *ip4_config, GHashTable *options, @@ -3119,7 +3119,7 @@ dhcp6_fail (NMDevice *self, gboolean timeout) } static void -dhcp6_timeout (NMDevice *self, NMDHCPClient *client) +dhcp6_timeout (NMDevice *self, NMDhcpClient *client) { NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); @@ -3134,7 +3134,7 @@ dhcp6_timeout (NMDevice *self, NMDHCPClient *client) } static void -dhcp6_update_config (NMDevice *self, NMDHCP6Config *config, GHashTable *options) +dhcp6_update_config (NMDevice *self, NMDhcp6Config *config, GHashTable *options) { GHashTableIter iter; const char *key, *value; @@ -3150,7 +3150,7 @@ dhcp6_update_config (NMDevice *self, NMDHCP6Config *config, GHashTable *options) } static void -dhcp6_state_changed (NMDHCPClient *client, +dhcp6_state_changed (NMDhcpClient *client, NMDhcpState state, NMIP6Config *ip6_config, GHashTable *options, @@ -5023,7 +5023,7 @@ nm_device_is_activating (NMDevice *self) /* IP Configuration stuff */ -NMDHCP4Config * +NMDhcp4Config * nm_device_get_dhcp4_config (NMDevice *self) { g_return_val_if_fail (NM_IS_DEVICE (self), NULL); @@ -5282,7 +5282,7 @@ nm_device_set_wwan_ip6_config (NMDevice *self, NMIP6Config *config) _LOGW (LOGD_IP6, "failed to set WWAN IPv6 configuration"); } -NMDHCP6Config * +NMDhcp6Config * nm_device_get_dhcp6_config (NMDevice *self) { g_return_val_if_fail (NM_IS_DEVICE (self), NULL); |