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

all: fix typo 'entires' -> 'entries'

Browse Source 
(cherry picked from commit a4cbfe6f0a)
This commit is contained in:
Beniamino Galvani
2017-05-05 14:11:05 +02:00
parent 8f4caab601
commit 1d08391ed1
10 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libnm-core/nm-setting-connection.c
View File

@@ -289,10 +289,10 @@ nm_setting_connection_get_connection_type (NMSettingConnection *setting)
* nm_setting_connection_get_num_permissions: * nm_setting_connection_get_num_permissions:
* @setting: the #NMSettingConnection * @setting: the #NMSettingConnection
* *
* Returns the number of entires in the #NMSettingConnection:permissions * Returns the number of entries in the #NMSettingConnection:permissions
* property of this setting. * property of this setting.
* *
* Returns: the number of permissions entires * Returns: the number of permissions entries
*/ */
guint32 guint32
nm_setting_connection_get_num_permissions (NMSettingConnection *setting) nm_setting_connection_get_num_permissions (NMSettingConnection *setting)

2
libnm-core/nm-setting-user.c
View File

@@ -327,7 +327,7 @@ nm_setting_user_set_data (NMSettingUser *setting,
if (g_hash_table_size (priv->data) > 256) { if (g_hash_table_size (priv->data) > 256) {
/* limit the number of valid keys */ /* limit the number of valid keys */
g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
_("maximum number of user data entires reached")); _("maximum number of user data entries reached"));
return FALSE; return FALSE;
} }

4
libnm-core/nm-setting-vlan.c
View File

@@ -290,7 +290,7 @@ nm_setting_vlan_add_priority_str (NMSettingVlan *setting,
* @setting: the #NMSettingVlan * @setting: the #NMSettingVlan
* @map: the type of priority map * @map: the type of priority map
* *
* Returns the number of entires in the * Returns the number of entries in the
* #NMSettingVlan:ingress_priority_map or #NMSettingVlan:egress_priority_map * #NMSettingVlan:ingress_priority_map or #NMSettingVlan:egress_priority_map
* properties of this setting. * properties of this setting.
* *
@@ -577,7 +577,7 @@ nm_setting_vlan_remove_priority_str_by_value (NMSettingVlan *setting,
* @setting: the #NMSettingVlan * @setting: the #NMSettingVlan
* @map: the type of priority map * @map: the type of priority map
* *
* Clear all the entires from #NMSettingVlan:ingress_priority_map or * Clear all the entries from #NMSettingVlan:ingress_priority_map or
* #NMSettingVlan:egress_priority_map properties. * #NMSettingVlan:egress_priority_map properties.
*/ */
void void

4
libnm-util/nm-setting-connection.c
View File

@@ -278,10 +278,10 @@ nm_setting_connection_get_connection_type (NMSettingConnection *setting)
* nm_setting_connection_get_num_permissions: * nm_setting_connection_get_num_permissions:
* @setting: the #NMSettingConnection * @setting: the #NMSettingConnection
* *
* Returns the number of entires in the #NMSettingConnection:permissions * Returns the number of entries in the #NMSettingConnection:permissions
* property of this setting. * property of this setting.
* *
* Returns: the number of permissions entires * Returns: the number of permissions entries
*/ */
guint32 guint32
nm_setting_connection_get_num_permissions (NMSettingConnection *setting) nm_setting_connection_get_num_permissions (NMSettingConnection *setting)

4
libnm-util/nm-setting-vlan.c
View File

@@ -286,7 +286,7 @@ nm_setting_vlan_add_priority_str (NMSettingVlan *setting,
* @setting: the #NMSettingVlan * @setting: the #NMSettingVlan
* @map: the type of priority map * @map: the type of priority map
* *
* Returns the number of entires in the * Returns the number of entries in the
* #NMSettingVlan:ingress_priority_map or #NMSettingVlan:egress_priority_map * #NMSettingVlan:ingress_priority_map or #NMSettingVlan:egress_priority_map
* properties of this setting. * properties of this setting.
* *
@@ -499,7 +499,7 @@ nm_setting_vlan_remove_priority_str_by_value (NMSettingVlan *setting,
* @setting: the #NMSettingVlan * @setting: the #NMSettingVlan
* @map: the type of priority map * @map: the type of priority map
* *
* Clear all the entires from #NMSettingVlan:ingress_priority_map or * Clear all the entries from #NMSettingVlan:ingress_priority_map or
* #NMSettingVlan:egress_priority_map properties. * #NMSettingVlan:egress_priority_map properties.
*/ */
void void

2
src/NetworkManagerUtils.c
View File

@@ -599,7 +599,7 @@ check_connection_cloned_mac_address (NMConnection *orig,
if (s_wired_cand) if (s_wired_cand)
cand_mac = nm_setting_wired_get_cloned_mac_address (s_wired_cand); cand_mac = nm_setting_wired_get_cloned_mac_address (s_wired_cand);
/* special cloned mac address entires are accepted. */ /* special cloned mac address entries are accepted. */
if (NM_CLONED_MAC_IS_SPECIAL (orig_mac)) if (NM_CLONED_MAC_IS_SPECIAL (orig_mac))
orig_mac = NULL; orig_mac = NULL;
if (NM_CLONED_MAC_IS_SPECIAL (cand_mac)) if (NM_CLONED_MAC_IS_SPECIAL (cand_mac))

2
src/devices/nm-lldp-listener.c
View File

@@ -697,7 +697,7 @@ process_lldp_neighbor (NMLldpListener *self, sd_lldp_neighbor *neighbor_sd, gboo
return; return;
} }
/* ensure that we have at most MAX_NEIGHBORS entires */ /* ensure that we have at most MAX_NEIGHBORS entries */
if ( !neigh_old /* only matters in the "add" case. */ if ( !neigh_old /* only matters in the "add" case. */
&& (g_hash_table_size (priv->lldp_neighbors) + 1 > MAX_NEIGHBORS)) { && (g_hash_table_size (priv->lldp_neighbors) + 1 > MAX_NEIGHBORS)) {
_LOGT ("process: ignore neighbor due to overall limit of %d", MAX_NEIGHBORS); _LOGT ("process: ignore neighbor due to overall limit of %d", MAX_NEIGHBORS);

8
src/nm-config.c
View File

@@ -571,14 +571,14 @@ _sort_groups_cmp (const char **pa, const char **pb, gpointer dummy)
b_is_connection = g_str_has_prefix (b, NM_CONFIG_KEYFILE_GROUPPREFIX_CONNECTION); b_is_connection = g_str_has_prefix (b, NM_CONFIG_KEYFILE_GROUPPREFIX_CONNECTION);
if (a_is_connection != b_is_connection) { if (a_is_connection != b_is_connection) {
/* one is a [connection*] entry, the other not. We sort [connection*] entires /* one is a [connection*] entry, the other not. We sort [connection*] entries
* after. */ * after. */
if (a_is_connection) if (a_is_connection)
return 1; return 1;
return -1; return -1;
} }
if (a_is_connection) { if (a_is_connection) {
/* both are [connection.\+] entires. Reverse their order. /* both are [connection.\+] entries. Reverse their order.
* One of the sections might be literally [connection]. That section * One of the sections might be literally [connection]. That section
* is special and it's order will be fixed later. It doesn't actually * is special and it's order will be fixed later. It doesn't actually
* matter here how it compares with [connection.\+] sections. */ * matter here how it compares with [connection.\+] sections. */
@@ -589,14 +589,14 @@ _sort_groups_cmp (const char **pa, const char **pb, gpointer dummy)
b_is_device = g_str_has_prefix (b, NM_CONFIG_KEYFILE_GROUPPREFIX_DEVICE); b_is_device = g_str_has_prefix (b, NM_CONFIG_KEYFILE_GROUPPREFIX_DEVICE);
if (a_is_device != b_is_device) { if (a_is_device != b_is_device) {
/* one is a [device*] entry, the other not. We sort [device*] entires /* one is a [device*] entry, the other not. We sort [device*] entries
* after. */ * after. */
if (a_is_device) if (a_is_device)
return 1; return 1;
return -1; return -1;
} }
if (a_is_device) { if (a_is_device) {
/* both are [device.\+] entires. Reverse their order. /* both are [device.\+] entries. Reverse their order.
* One of the sections might be literally [device]. That section * One of the sections might be literally [device]. That section
* is special and it's order will be fixed later. It doesn't actually * is special and it's order will be fixed later. It doesn't actually
* matter here how it compares with [device.\+] sections. */ * matter here how it compares with [device.\+] sections. */

4
src/nm-core-utils.c
View File

@@ -1638,7 +1638,7 @@ nm_match_spec_config (const GSList *specs, guint cur_nm_version, const char *env
* @value: the string of device specs * @value: the string of device specs
* *
* Splits the specs from the string and returns them as individual * Splits the specs from the string and returns them as individual
* entires in a #GSList. * entries in a #GSList.
* *
* It does not validate any specs, it basically just does a special * It does not validate any specs, it basically just does a special
* strsplit with ',' or ';' as separators and supporting '\\' as * strsplit with ',' or ';' as separators and supporting '\\' as
@@ -3910,7 +3910,7 @@ debug_key_matches (const gchar *key,
* nm_utils_parse_debug_string: * nm_utils_parse_debug_string:
* @string: the string to parse * @string: the string to parse
* @keys: the debug keys * @keys: the debug keys
* @nkeys: number of entires in @keys * @nkeys: number of entries in @keys
* *
* Similar to g_parse_debug_string(), but does not special * Similar to g_parse_debug_string(), but does not special
* case "help" or "all". * case "help" or "all".

2
src/platform/nm-linux-platform.c
View File

@@ -5290,7 +5290,7 @@ _vlan_change_vlan_qos_mapping_create (gboolean is_ingress_map,
if (current_n_map) { if (current_n_map) {
if (is_ingress_map) { if (is_ingress_map) {
/* For the ingress-map, there are only 8 entries (0 to 7). /* For the ingress-map, there are only 8 entries (0 to 7).
* When the user requests to reset all entires, we don't actually * When the user requests to reset all entries, we don't actually
* need the cached entries, we can just explicitly clear all possible * need the cached entries, we can just explicitly clear all possible
* ones. * ones.
* *