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

wwan: refactor nm_modem_ip_type_to_string() and fix return type

Browse Source 
The statement
    g_return_val_if_reached (NM_MODEM_IP_TYPE_UNKNOWN);
was wrong, because the return type is 'const char *'.

But just refactor nm_modem_ip_type_to_string() to get rid of
the static table and make it a switch statement.

Fixes: 85d9132464
This commit is contained in:
Thomas Haller
2015-03-03 11:06:59 +01:00
parent e93309e81d
commit 5599a82d0d
1 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/devices/wwan/nm-modem.c
View File

@@ -222,29 +222,19 @@ nm_modem_get_supported_ip_types (NMModem *self)
return NM_MODEM_GET_PRIVATE (self)->ip_types; return NM_MODEM_GET_PRIVATE (self)->ip_types;
} }
typedef struct {
NMModemIPType ip_type;
const gchar *name;
} IpTypeTable;
static const IpTypeTable ip_types[] = {
{ NM_MODEM_IP_TYPE_IPV4, "ipv4" },
{ NM_MODEM_IP_TYPE_IPV6, "ipv6" },
{ NM_MODEM_IP_TYPE_IPV4V6, "ipv4v6" },
{ NM_MODEM_IP_TYPE_UNKNOWN, "unknown" },
};
const gchar * const gchar *
nm_modem_ip_type_to_string (NMModemIPType ip_type) nm_modem_ip_type_to_string (NMModemIPType ip_type)
{ {
guint i; switch (ip_type) {
case NM_MODEM_IP_TYPE_IPV4:
for (i = 0; i < G_N_ELEMENTS (ip_types); i++) { return "ipv4";
if (ip_type == ip_types[i].ip_type) case NM_MODEM_IP_TYPE_IPV6:
return ip_types[i].name; return "ipv6";
case NM_MODEM_IP_TYPE_IPV4V6:
return "ipv4v6";
default:
g_return_val_if_reached ("unknown");
} }
g_return_val_if_reached (NM_MODEM_IP_TYPE_UNKNOWN);
} }
static GArray * static GArray *