cli/trivial: rename metadata related names

They will be moved out of nmcli as they are generally useful.
Even if they happen to be used only inside nmcli, there should
be a better separation between logic (nmcli) and setting decriptions.
This commit is contained in:
Thomas Haller
2017-03-28 11:02:03 +02:00
parent fcc19ea760
commit 2a71b5322f
6 changed files with 224 additions and 224 deletions

View File

@@ -871,7 +871,7 @@ parse_output_fields (const char *fields_str,
for (i = 0; fields_array[i].name; i++) {
if (strcasecmp (left, fields_array[i].name) == 0) {
const NmcOutputField *valid_names = fields_array[i].group_list;
const NmcSettingInfo *setting_info = fields_array[i].setting_info;
const NMMetaSettingInfoEditor *setting_info = fields_array[i].setting_info;
idx = i;
if (!right && !valid_names && !setting_info) {
@@ -966,7 +966,7 @@ nmc_get_allowed_fields (const NmcOutputField fields_array[], int group_idx)
fields_array[group_idx].name, second_level[i].name);
}
} else if (group_idx != -1 && fields_array[group_idx].setting_info) {
const NmcSettingInfo *second_level = fields_array[group_idx].setting_info;
const NMMetaSettingInfoEditor *second_level = fields_array[group_idx].setting_info;
for (i = 1; i < second_level->properties_num; i++) {
g_string_append_printf (allowed_fields, "%s.%s,",