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

libnm: avoid g_warning() in nm_vpn_service_plugin_read_vpn_details()

Browse source 
g_warning() and printing to stdout/stderr are not suitable actions
for a library. If there is something important, find a way to report the
condition to the caller. If it's not important, stay quiet.
This commit is contained in:
Thomas Haller 2021-05-25 14:18:31 +02:00
parent f0dc95e517
commit ddf1942bfb
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
2 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/libnm-client-impl/nm-vpn-service-plugin.c
View file

@ -807,29 +807,23 @@ nm_vpn_service_plugin_read_vpn_details(int fd, GHashTable **out_data, GHashTable
/* finish marker */ /* finish marker */
break; break;
} else if (NM_STR_HAS_PREFIX(line->str, DATA_KEY_TAG)) { } else if (NM_STR_HAS_PREFIX(line->str, DATA_KEY_TAG)) {
if (nm_clear_g_string(&key)) nm_clear_g_string(&key);
g_warning("a value expected");
key = g_string_new(line->str + strlen(DATA_KEY_TAG)); key = g_string_new(line->str + strlen(DATA_KEY_TAG));
str = key; str = key;
hash = data; hash = data;
} else if (NM_STR_HAS_PREFIX(line->str, DATA_VAL_TAG)) { } else if (NM_STR_HAS_PREFIX(line->str, DATA_VAL_TAG)) {
if (val || !key || hash != data) { if (val || !key || hash != data)
g_warning("%s not preceded by %s", DATA_VAL_TAG, DATA_KEY_TAG);
break; break;
}
val = g_string_new(line->str + strlen(DATA_VAL_TAG)); val = g_string_new(line->str + strlen(DATA_VAL_TAG));
str = val; str = val;
} else if (NM_STR_HAS_PREFIX(line->str, SECRET_KEY_TAG)) { } else if (NM_STR_HAS_PREFIX(line->str, SECRET_KEY_TAG)) {
if (nm_clear_g_string(&key)) nm_clear_g_string(&key);
g_warning("a value expected");
key = g_string_new(line->str + strlen(SECRET_KEY_TAG)); key = g_string_new(line->str + strlen(SECRET_KEY_TAG));
str = key; str = key;
hash = secrets; hash = secrets;
} else if (NM_STR_HAS_PREFIX(line->str, SECRET_VAL_TAG)) { } else if (NM_STR_HAS_PREFIX(line->str, SECRET_VAL_TAG)) {
if (val || !key || hash != secrets) { if (val || !key || hash != secrets)
g_warning("%s not preceded by %s", SECRET_VAL_TAG, SECRET_KEY_TAG);
break; break;
}
val = g_string_new(line->str + strlen(SECRET_VAL_TAG)); val = g_string_new(line->str + strlen(SECRET_VAL_TAG));
str = val; str = val;
} }

3
src/libnm-client-impl/tests/test-libnm.c
View file

@ -2462,8 +2462,7 @@ test_nm_vpn_service_plugin_read_vpn_details(void)
"DONE\n" "DONE\n"
"", "",
READ_VPN_DETAIL_DATA({"some-key", "string\ncontinued after a line break"}, ), READ_VPN_DETAIL_DATA({"some-key", "string\ncontinued after a line break"}, ),
READ_VPN_DETAIL_DATA({"key names\ncan have\ncontinuations too", "value"}, ), READ_VPN_DETAIL_DATA({"key names\ncan have\ncontinuations too", "value"}, ), );
NMTST_EXPECT_LIBNM_WARNING("DATA_VAL= not preceded by DATA_KEY="));
_do_read_vpn_details( _do_read_vpn_details(
"" ""