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

libnm: use streq() instead of strcmp() for NMSettingVpn

Browse Source
This commit is contained in:
Thomas Haller
2020-03-26 16:05:23 +01:00
parent c97b217772
commit c9bfdc2f75
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libnm-core/nm-setting-vpn.c
View File

@@ -569,7 +569,7 @@ update_secret_string (NMSetting *setting,
return NM_SETTING_UPDATE_SECRET_ERROR; return NM_SETTING_UPDATE_SECRET_ERROR;
} }
if (g_strcmp0 (g_hash_table_lookup (priv->secrets, key), value) == 0) if (nm_streq0 (g_hash_table_lookup (priv->secrets, key), value))
return NM_SETTING_UPDATE_SECRET_SUCCESS_UNCHANGED; return NM_SETTING_UPDATE_SECRET_SUCCESS_UNCHANGED;
g_hash_table_insert (priv->secrets, g_strdup (key), g_strdup (value)); g_hash_table_insert (priv->secrets, g_strdup (key), g_strdup (value));
@@ -611,7 +611,7 @@ update_secret_dict (NMSetting *setting,
/* Now add the items to the settings' secrets list */ /* Now add the items to the settings' secrets list */
g_variant_iter_init (&iter, secrets); g_variant_iter_init (&iter, secrets);
while (g_variant_iter_next (&iter, "{&s&s}", &name, &value)) { while (g_variant_iter_next (&iter, "{&s&s}", &name, &value)) {
if (g_strcmp0 (g_hash_table_lookup (priv->secrets, name), value) == 0) if (nm_streq0 (g_hash_table_lookup (priv->secrets, name), value))
continue; continue;
g_hash_table_insert (priv->secrets, g_strdup (name), g_strdup (value)); g_hash_table_insert (priv->secrets, g_strdup (name), g_strdup (value));
@@ -637,7 +637,7 @@ update_one_secret (NMSetting *setting, const char *key, GVariant *value, GError
*/ */
success = update_secret_string (setting, key, g_variant_get_string (value, NULL), error); success = update_secret_string (setting, key, g_variant_get_string (value, NULL), error);
} else if (g_variant_is_of_type (value, G_VARIANT_TYPE ("a{ss}"))) { } else if (g_variant_is_of_type (value, G_VARIANT_TYPE ("a{ss}"))) {
if (strcmp (key, NM_SETTING_VPN_SECRETS) != 0) { if (!nm_streq (key, NM_SETTING_VPN_SECRETS)) {
g_set_error_literal (error, NM_CONNECTION_ERROR, g_set_error_literal (error, NM_CONNECTION_ERROR,
NM_CONNECTION_ERROR_PROPERTY_NOT_SECRET, NM_CONNECTION_ERROR_PROPERTY_NOT_SECRET,
_("not a secret property")); _("not a secret property"));