diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-06-29 09:52:41 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-07-03 10:34:29 +0200 |
| commit | 9702f79db6ffce2a3319d0a710fe9498380d17e0 (patch) | |
| tree | f4f22a703d1d34db6468094f4ef63d8906df5604 | |
| parent | 53bdd81800fab05a6474d370d52105a1740b1905 (diff) | |
| download | NetworkManager-9702f79db6ffce2a3319d0a710fe9498380d17e0.tar.gz | |
cloud-setup: don't check redundant error results from nm_http_client_poll_get_finish()
nm_http_client_poll_get_finish() can only either succeed (returning TRUE
and setting no GError), or failing (returning FALSE and setting GError).
Checking for both is redundant and unnecessary.
| -rw-r--r-- | clients/cloud-setup/nmcs-provider-ec2.c | 42 | ||||
| -rw-r--r-- | clients/cloud-setup/nmcs-provider-gcp.c | 19 |
2 files changed, 20 insertions, 41 deletions
diff --git a/clients/cloud-setup/nmcs-provider-ec2.c b/clients/cloud-setup/nmcs-provider-ec2.c index 1427534b68..1578a33bed 100644 --- a/clients/cloud-setup/nmcs-provider-ec2.c +++ b/clients/cloud-setup/nmcs-provider-ec2.c @@ -90,13 +90,12 @@ _detect_get_meta_data_done_cb (GObject *source, gs_unref_object GTask *task = user_data; gs_free_error GError *get_error = NULL; gs_free_error GError *error = NULL; - gboolean success; - success = nm_http_client_poll_get_finish (NM_HTTP_CLIENT (source), - result, - NULL, - NULL, - &get_error); + nm_http_client_poll_get_finish (NM_HTTP_CLIENT (source), + result, + NULL, + NULL, + &get_error); if (nm_utils_error_is_cancelled (get_error)) { g_task_return_error (task, g_steal_pointer (&get_error)); @@ -112,14 +111,6 @@ _detect_get_meta_data_done_cb (GObject *source, return; } - if (!success) { - nm_utils_error_set (&error, - NM_UTILS_ERROR_UNKNOWN, - "failure to detect EC2 metadata"); - g_task_return_error (task, g_steal_pointer (&error)); - return; - } - g_task_return_boolean (task, TRUE); } @@ -191,31 +182,28 @@ _get_config_fetch_done_cb (NMHttpClient *http_client, gboolean is_local_ipv4) { GetConfigIfaceData *iface_data; - NMCSProviderGetConfigTaskData *get_config_data; const char *hwaddr = NULL; gs_unref_bytes GBytes *response_data = NULL; gs_free_error GError *error = NULL; - gboolean success; - NMCSProviderGetConfigIfaceData *config_iface_data; nm_utils_user_data_unpack (user_data, &iface_data, &hwaddr); - success = nm_http_client_poll_get_finish (http_client, - result, - NULL, - &response_data, - &error); + nm_http_client_poll_get_finish (http_client, + result, + NULL, + &response_data, + &error); + if (nm_utils_error_is_cancelled (error)) return; - get_config_data = iface_data->get_config_data; - - config_iface_data = g_hash_table_lookup (get_config_data->result_dict, hwaddr); - - if (success) { + if (!error) { + NMCSProviderGetConfigIfaceData *config_iface_data; in_addr_t tmp_addr; int tmp_prefix; + config_iface_data = g_hash_table_lookup (iface_data->get_config_data->result_dict, hwaddr); + if (is_local_ipv4) { gs_free const char **s_addrs = NULL; gsize i, len; diff --git a/clients/cloud-setup/nmcs-provider-gcp.c b/clients/cloud-setup/nmcs-provider-gcp.c index a879a4eb3a..7a8f3ef893 100644 --- a/clients/cloud-setup/nmcs-provider-gcp.c +++ b/clients/cloud-setup/nmcs-provider-gcp.c @@ -46,13 +46,12 @@ _detect_get_meta_data_done_cb (GObject *source, gs_unref_object GTask *task = user_data; gs_free_error GError *get_error = NULL; gs_free_error GError *error = NULL; - gboolean success; - success = nm_http_client_poll_get_finish (NM_HTTP_CLIENT (source), - result, - NULL, - NULL, - &get_error); + nm_http_client_poll_get_finish (NM_HTTP_CLIENT (source), + result, + NULL, + NULL, + &get_error); if (nm_utils_error_is_cancelled (get_error)) { g_task_return_error (task, g_steal_pointer (&get_error)); @@ -68,14 +67,6 @@ _detect_get_meta_data_done_cb (GObject *source, return; } - if (!success) { - nm_utils_error_set (&error, - NM_UTILS_ERROR_UNKNOWN, - "failure to detect GCP metadata"); - g_task_return_error (task, g_steal_pointer (&error)); - return; - } - g_task_return_boolean (task, TRUE); } |