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

cli: use "--" instead of "no set" for NULL strings

Browse Source
This commit is contained in:
Jiří Klimeš
2012-06-04 12:25:43 +02:00
parent 4692c00be2
commit 716a09d7ac
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cli/src/settings.c
View File

@@ -938,11 +938,11 @@ setting_wireless_details (NMSettingWireless *s_wireless, NmCli *nmc)
nmc->allowed_fields[2].value = nm_setting_wireless_get_mode (s_wireless); nmc->allowed_fields[2].value = nm_setting_wireless_get_mode (s_wireless);
nmc->allowed_fields[3].value = nm_setting_wireless_get_band (s_wireless); nmc->allowed_fields[3].value = nm_setting_wireless_get_band (s_wireless);
nmc->allowed_fields[4].value = channel_str; nmc->allowed_fields[4].value = channel_str;
nmc->allowed_fields[5].value = bssid_str ? bssid_str : _("not set"); nmc->allowed_fields[5].value = bssid_str;
nmc->allowed_fields[6].value = rate_str; nmc->allowed_fields[6].value = rate_str;
nmc->allowed_fields[7].value = tx_power_str; nmc->allowed_fields[7].value = tx_power_str;
nmc->allowed_fields[8].value = device_mac_str ? device_mac_str : _("not set"); nmc->allowed_fields[8].value = device_mac_str;
nmc->allowed_fields[9].value = cloned_mac_str ? cloned_mac_str : _("not set"); nmc->allowed_fields[9].value = cloned_mac_str;
nmc->allowed_fields[10].value = mac_blacklist->str; nmc->allowed_fields[10].value = mac_blacklist->str;
nmc->allowed_fields[11].value = strcmp (mtu_str, "0") ? mtu_str : _("auto"); nmc->allowed_fields[11].value = strcmp (mtu_str, "0") ? mtu_str : _("auto");
nmc->allowed_fields[12].value = seen_bssids->str; nmc->allowed_fields[12].value = seen_bssids->str;

2
cli/src/utils.c
View File

@@ -276,7 +276,7 @@ print_fields (const NmcPrintFields fields, const NmcOutputField field_values[])
int table_width = 0; int table_width = 0;
char *line = NULL; char *line = NULL;
char *indent_str; char *indent_str;
const char *not_set_str = _("not set"); const char *not_set_str = "--";
int i; int i;
gboolean multiline = fields.flags & NMC_PF_FLAG_MULTILINE; gboolean multiline = fields.flags & NMC_PF_FLAG_MULTILINE;
gboolean terse = fields.flags & NMC_PF_FLAG_TERSE; gboolean terse = fields.flags & NMC_PF_FLAG_TERSE;