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

cli: minor cleanup of _get_fcn_connection_permissions()

Browse source
This commit is contained in:
Thomas Haller 2019-03-19 13:11:45 +01:00
parent cb310a061b
commit ecd0e34fe9
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
clients/common/nm-meta-setting-desc.c
View file

@ -2297,25 +2297,27 @@ _get_fcn_connection_permissions (ARGS_GET_FCN)
GString *perm = NULL;
const char *perm_item;
const char *perm_type;
int i;
guint i, n;
RETURN_UNSUPPORTED_GET_TYPE ();
perm = g_string_new (NULL);
for (i = 0; i < nm_setting_connection_get_num_permissions (s_con); i++) {
if (nm_setting_connection_get_permission (s_con, i, &perm_type, &perm_item, NULL))
g_string_append_printf (perm, "%s:%s,", perm_type, perm_item);
n = nm_setting_connection_get_num_permissions (s_con);
for (i = 0; i < n; i++) {
if (!nm_setting_connection_get_permission (s_con, i, &perm_type, &perm_item, NULL))
continue;
if (!perm)
perm = g_string_new (NULL);
else
g_string_append_c (perm, ',');
g_string_append_printf (perm, "%s:%s", perm_type, perm_item);
}
NM_SET_OUT (out_is_default, perm->len == 0);
NM_SET_OUT (out_is_default, !perm);
if (perm->len > 0) {
g_string_truncate (perm, perm->len-1); /* remove trailing , */
if (perm)
RETURN_STR_TO_FREE (g_string_free (perm, FALSE));
}
/* No value from get_permission */
g_string_free (perm, TRUE);
return NULL;
}