applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

network: Remove an unnecessary goto

Browse source
This commit is contained in:
Robert Ancell 2019-10-01 14:52:13 +13:00
parent 57d7a79034
commit bf8b8f52b7
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
panels/network/panel-common.c
View file

@ -337,8 +337,6 @@ panel_set_device_widget_details (GtkLabel *heading,
gchar * gchar *
panel_get_ip4_address_as_string (NMIPConfig *ip4_config, const char *what) panel_get_ip4_address_as_string (NMIPConfig *ip4_config, const char *what)
{ {
const gchar *str = NULL;
/* we only care about one address */ /* we only care about one address */
if (!strcmp (what, "address")) { if (!strcmp (what, "address")) {
GPtrArray *array; GPtrArray *array;
@ -346,15 +344,14 @@ panel_get_ip4_address_as_string (NMIPConfig *ip4_config, const char *what)
array = nm_ip_config_get_addresses (ip4_config); array = nm_ip_config_get_addresses (ip4_config);
if (array->len < 1) if (array->len < 1)
goto out; return NULL;
address = array->pdata[0]; address = array->pdata[0];
str = nm_ip_address_get_address (address); return g_strdup (nm_ip_address_get_address (address));
} else if (!strcmp (what, "gateway")) { } else if (!strcmp (what, "gateway")) {
str = nm_ip_config_get_gateway (ip4_config); return g_strdup (nm_ip_config_get_gateway (ip4_config));
} }
out: return NULL;
return g_strdup (str);
} }
gchar * gchar *