diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2019-01-24 17:28:50 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2019-02-05 10:20:27 +0100 |
| commit | ab0d34879215bd4c5fbf72130aa733be07f83671 (patch) | |
| tree | 32e8cc5466b224057f622c649f9de330437930dd | |
| parent | fa2fe3688d4287cc3c9222ae2069fd7feae324ab (diff) | |
| download | NetworkManager-ab0d34879215bd4c5fbf72130aa733be07f83671.tar.gz | |
client/devices: get rid of useless g_strdup()s
And, while at that, add a hint to the developer adding new items. It's
helps avoid a mistake that I believe is common (because I just made it
twice...).
| -rw-r--r-- | clients/cli/devices.c | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/clients/cli/devices.c b/clients/cli/devices.c index d17cf79980..4898fbcb81 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -44,43 +44,37 @@ static char * ap_wpa_rsn_flags_to_string (NM80211ApSecurityFlags flags) { - char *flags_str[16]; /* Enough space for flags and terminating NULL */ - char *ret_str; + char *flags_str[12]; int i = 0; if (flags & NM_802_11_AP_SEC_PAIR_WEP40) - flags_str[i++] = g_strdup ("pair_wpe40"); + flags_str[i++] = "pair_wpe40"; if (flags & NM_802_11_AP_SEC_PAIR_WEP104) - flags_str[i++] = g_strdup ("pair_wpe104"); + flags_str[i++] = "pair_wpe104"; if (flags & NM_802_11_AP_SEC_PAIR_TKIP) - flags_str[i++] = g_strdup ("pair_tkip"); + flags_str[i++] = "pair_tkip"; if (flags & NM_802_11_AP_SEC_PAIR_CCMP) - flags_str[i++] = g_strdup ("pair_ccmp"); + flags_str[i++] = "pair_ccmp"; if (flags & NM_802_11_AP_SEC_GROUP_WEP40) - flags_str[i++] = g_strdup ("group_wpe40"); + flags_str[i++] = "group_wpe40"; if (flags & NM_802_11_AP_SEC_GROUP_WEP104) - flags_str[i++] = g_strdup ("group_wpe104"); + flags_str[i++] = "group_wpe104"; if (flags & NM_802_11_AP_SEC_GROUP_TKIP) - flags_str[i++] = g_strdup ("group_tkip"); + flags_str[i++] = "group_tkip"; if (flags & NM_802_11_AP_SEC_GROUP_CCMP) - flags_str[i++] = g_strdup ("group_ccmp"); + flags_str[i++] = "group_ccmp"; if (flags & NM_802_11_AP_SEC_KEY_MGMT_PSK) - flags_str[i++] = g_strdup ("psk"); + flags_str[i++] = "psk"; if (flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X) - flags_str[i++] = g_strdup ("802.1X"); + flags_str[i++] = "802.1X"; + /* Make sure you grow flags_str when adding items here. */ if (i == 0) - flags_str[i++] = g_strdup (_("(none)")); + flags_str[i++] = _("(none)"); flags_str[i] = NULL; - ret_str = g_strjoinv (" ", flags_str); - - i = 0; - while (flags_str[i]) - g_free (flags_str[i++]); - - return ret_str; + return g_strjoinv (" ", flags_str); } static NMMetaColor |