luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-12 20:36:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix redefinition of local variable in gio/gnetworkservice.c

Browse Source
This commit is contained in:
Loic Le Page 2022-01-19 18:47:38 +01:00 committed by Loïc Le Page
parent dd96eeee74
commit 124733d10c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gio/gnetworkservice.c
View File

@ -445,7 +445,7 @@ g_network_service_address_enumerator_next (GSocketAddressEnumerator *enumerator
{ {
if (srv_enum->addr_enum == NULL && srv_enum->t) if (srv_enum->addr_enum == NULL && srv_enum->t)
{ {
GError *error = NULL; GError *my_error = NULL;
gchar *uri; gchar *uri;
gchar *hostname; gchar *hostname;
GSocketConnectable *addr; GSocketConnectable *addr;
@ -477,15 +477,15 @@ g_network_service_address_enumerator_next (GSocketAddressEnumerator *enumerator
addr = g_network_address_parse_uri (uri, addr = g_network_address_parse_uri (uri,
g_srv_target_get_port (target), g_srv_target_get_port (target),
&error); &my_error);
g_free (uri); g_free (uri);
if (addr == NULL) if (addr == NULL)
{ {
if (srv_enum->error == NULL) if (srv_enum->error == NULL)
srv_enum->error = error; srv_enum->error = my_error;
else else
g_error_free (error); g_error_free (my_error);
continue; continue;
} }
@ -498,18 +498,18 @@ g_network_service_address_enumerator_next (GSocketAddressEnumerator *enumerator
if (srv_enum->addr_enum) if (srv_enum->addr_enum)
{ {
GError *error = NULL; GError *my_error = NULL;
ret = g_socket_address_enumerator_next (srv_enum->addr_enum, ret = g_socket_address_enumerator_next (srv_enum->addr_enum,
cancellable, cancellable,
&error); &my_error);
if (error) if (my_error)
{ {
if (srv_enum->error == NULL) if (srv_enum->error == NULL)
srv_enum->error = error; srv_enum->error = my_error;
else else
g_error_free (error); g_error_free (my_error);
} }
if (!ret) if (!ret)