fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 07:08:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

all: replace 'inital' with 'initial'

Browse source 
sed -i -e 's/inital/initial/g' $(git grep -l inital)

(cherry picked from commit d74e1bef36)
This commit is contained in:
Beniamino Galvani 2017-11-28 15:40:18 +01:00
parent 91a460c0b4
commit f3b08bf114
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libnm-core/nm-setting-ip-config.c
View file

@ -1791,7 +1791,7 @@ nm_setting_ip_config_get_num_dns_options (NMSettingIPConfig *setting)
* or the options are left undefined. The latter means to use * or the options are left undefined. The latter means to use
* a default configuration, while the former explicitly means "no-options". * a default configuration, while the former explicitly means "no-options".
* *
* Returns: whether DNS options are initalized or left unset (the default). * Returns: whether DNS options are initialized or left unset (the default).
**/ **/
gboolean gboolean
nm_setting_ip_config_has_dns_options (NMSettingIPConfig *setting) nm_setting_ip_config_has_dns_options (NMSettingIPConfig *setting)

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

@ -351,8 +351,8 @@ typedef struct _NMDevicePrivate {
NMDeviceSysIfaceState sys_iface_state:2; NMDeviceSysIfaceState sys_iface_state:2;
bool v4_route_table_initalized:1; bool v4_route_table_initialized:1;
bool v6_route_table_initalized:1; bool v6_route_table_initialized:1;
NMDeviceAutoconnectBlockedFlags autoconnect_blocked_flags:4; NMDeviceAutoconnectBlockedFlags autoconnect_blocked_flags:4;
@ -1486,7 +1486,7 @@ _stats_set_refresh_rate (NMDevice *self, guint refresh_rate_ms)
if (!refresh_rate_ms) if (!refresh_rate_ms)
return; return;
/* trigger an inital refresh of the data whenever the refresh-rate changes. /* trigger an initial refresh of the data whenever the refresh-rate changes.
* As we process the result in an idle handler with device_link_changed(), * As we process the result in an idle handler with device_link_changed(),
* we don't get the result right away. */ * we don't get the result right away. */
ifindex = nm_device_get_ip_ifindex (self); ifindex = nm_device_get_ip_ifindex (self);
@ -1788,10 +1788,10 @@ nm_device_get_route_table (NMDevice *self,
/* the route table setting affects how we sync routes. We shall /* the route table setting affects how we sync routes. We shall
* not change it while the device is active, hence, cache it. */ * not change it while the device is active, hence, cache it. */
if (addr_family == AF_INET) { if (addr_family == AF_INET) {
if (priv->v4_route_table_initalized) if (priv->v4_route_table_initialized)
return priv->v4_route_table ?: (fallback_main ? RT_TABLE_MAIN : 0); return priv->v4_route_table ?: (fallback_main ? RT_TABLE_MAIN : 0);
} else { } else {
if (priv->v6_route_table_initalized) if (priv->v6_route_table_initialized)
return priv->v6_route_table ?: (fallback_main ? RT_TABLE_MAIN : 0); return priv->v6_route_table ?: (fallback_main ? RT_TABLE_MAIN : 0);
} }
@ -1821,10 +1821,10 @@ nm_device_get_route_table (NMDevice *self,
} }
if (addr_family == AF_INET) { if (addr_family == AF_INET) {
priv->v4_route_table_initalized = TRUE; priv->v4_route_table_initialized = TRUE;
priv->v4_route_table = route_table; priv->v4_route_table = route_table;
} else { } else {
priv->v6_route_table_initalized = TRUE; priv->v6_route_table_initialized = TRUE;
priv->v6_route_table = route_table; priv->v6_route_table = route_table;
} }
@ -12419,8 +12419,8 @@ _cleanup_generic_post (NMDevice *self, CleanupType cleanup_type)
priv->v4_commit_first_time = TRUE; priv->v4_commit_first_time = TRUE;
priv->v6_commit_first_time = TRUE; priv->v6_commit_first_time = TRUE;
priv->v4_route_table_initalized = FALSE; priv->v4_route_table_initialized = FALSE;
priv->v6_route_table_initalized = FALSE; priv->v6_route_table_initialized = FALSE;
priv->default_route_metric_penalty_ip4_has = FALSE; priv->default_route_metric_penalty_ip4_has = FALSE;
priv->default_route_metric_penalty_ip6_has = FALSE; priv->default_route_metric_penalty_ip6_has = FALSE;
@ -13385,7 +13385,7 @@ nm_device_update_hw_address (NMDevice *self)
&& !nm_device_is_activating (self))) { && !nm_device_is_activating (self))) {
/* when we get a hw_addr the first time or while the device /* when we get a hw_addr the first time or while the device
* is not activated (with no explict hw address set), always * is not activated (with no explict hw address set), always
* update our inital hw-address as well. */ * update our initial hw-address as well. */
nm_device_update_initial_hw_address (self); nm_device_update_initial_hw_address (self);
} }
return TRUE; return TRUE;