broadband-bearer-qmi: ensure errors are cleared before re-using them

If the bearer doesn't have one of IPv4 or IPv6 configuration, then the
qmi_message_wds_get_current_settings_output_get_ip*_address() functions
will return FALSE with a filled error, which was not cleared.

This fixes a glib warning message about overwriting an already-filled
GError.
This commit is contained in:
Dan Williams
2013-12-01 14:20:19 -06:00
parent c30a8f67ef
commit 1b34fe6c51
+6
View File
@@ -344,6 +344,9 @@ get_current_settings_ready (QmiClientWds *client,
success = qmi_message_wds_get_current_settings_output_get_secondary_ipv4_dns_address (output, &addr, &error);
print_address4 (success, " DNS #2", addr, error);
g_clear_error (&error);
} else {
/* no IPv4 configuration */
g_clear_error (&error);
}
/* If the message has an IPv6 address, print IPv6 settings */
@@ -368,6 +371,9 @@ get_current_settings_ready (QmiClientWds *client,
success = qmi_message_wds_get_current_settings_output_get_ipv6_secondary_dns_address (output, &array, &error);
print_address6 (success, " DNS #2", array, 0, error);
g_clear_error (&error);
} else {
/* no IPv6 configuration */
g_clear_error (&error);
}
/* Domain names */