fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-27 04:40:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: cleanup NMSettingMatch.verify()

Browse source
This commit is contained in:
Thomas Haller 2020-05-06 12:51:28 +02:00
parent eaf3862075
commit ef16dcaee4
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libnm-core/nm-setting-match.c
View file

@ -569,11 +569,10 @@ static gboolean
verify (NMSetting *setting, NMConnection *connection, GError **error)
{
NMSettingMatch *self = NM_SETTING_MATCH (setting);
int k;
guint i;
for (k = 0; k < self->interface_name->len; k++) {
char *kparam = (char*) g_ptr_array_index (self->interface_name, k);
if (nm_streq0 (kparam, "")) {
for (i = 0; i < self->interface_name->len; i++) {
if (!nm_str_not_empty (self->interface_name->pdata[i])) {
g_set_error (error,
NM_CONNECTION_ERROR,
NM_CONNECTION_ERROR_INVALID_PROPERTY,
@ -584,9 +583,8 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
}
}
for (k = 0; k < self->kernel_command_line->len; k++) {
char *kparam = (char*) g_ptr_array_index (self->kernel_command_line, k);
if (nm_streq0 (kparam, "")) {
for (i = 0; i < self->kernel_command_line->len; i++) {
if (!nm_str_not_empty (self->kernel_command_line->pdata[i])) {
g_set_error (error,
NM_CONNECTION_ERROR,
NM_CONNECTION_ERROR_INVALID_PROPERTY,
@ -597,9 +595,8 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
}
}
for (k = 0; k < self->driver->len; k++) {
char *kparam = (char*) g_ptr_array_index (self->driver, k);
if (nm_streq0 (kparam, "")) {
for (i = 0; i < self->driver->len; i++) {
if (!nm_str_not_empty (self->driver->pdata[i])) {
g_set_error (error,
NM_CONNECTION_ERROR,
NM_CONNECTION_ERROR_INVALID_PROPERTY,