diff options
| author | Dan Williams <dcbw@redhat.com> | 2013-12-01 14:15:13 -0600 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2013-12-01 14:20:19 -0600 |
| commit | 1b34fe6c514e319bfac66e1edb89798c7c411979 (patch) | |
| tree | 92cb66e07e6c9c4a2692a63c78bb41932a57209b /src | |
| parent | c30a8f67eff3afe5565e7e2134f56841802556fb (diff) | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mm-bearer-qmi.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mm-bearer-qmi.c b/src/mm-bearer-qmi.c index fef58819..a8341db9 100644 --- a/src/mm-bearer-qmi.c +++ b/src/mm-bearer-qmi.c @@ -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 */ |