cloud-setup/trivial: rename variables "config_data" to "get_config_data"

The code is not entirely straight forward. Consistent naming
is hence important.

In "nmcs-provider-ec2.c", variables of this kind are called
"get_config_data". That also matches to the type of the data
(NMCSProviderGetConfigTaskData).

Rename the variables to make naming consistent. Also, I find the
longer name to be clearer.

2 files changed, 28 insertions, 27 deletions

diff --git a/clients/cloud-setup/nmcs-provider-azure.c b/clients/cloud-setup/nmcs-provider-azure.c
index a33fc3e0d1..42086b35e1 100644
--- a/clients/cloud-setup/nmcs-provider-azure.c
+++ b/clients/cloud-setup/nmcs-provider-azure.c
@@ -94,7 +94,7 @@ detect(NMCSProvider *provider, GTask *task)
 /*****************************************************************************/
 
 typedef struct {
-    NMCSProviderGetConfigTaskData *config_data;
+    NMCSProviderGetConfigTaskData *get_config_data;
     guint                          n_ifaces_pending;
     GError *                       error;
 } AzureData;
@@ -117,7 +117,7 @@ _azure_iface_data_free(AzureIfaceData *iface_data)
 static void
 _get_config_maybe_task_return(AzureData *azure_data, GError *error_take)
 {
-    NMCSProviderGetConfigTaskData *config_data = azure_data->config_data;
+    NMCSProviderGetConfigTaskData *get_config_data = azure_data->get_config_data;
 
     if (error_take) {
         if (!azure_data->error)
@@ -138,16 +138,16 @@ _get_config_maybe_task_return(AzureData *azure_data, GError *error_take)
             _LOGD("get-config: cancelled");
         else
             _LOGD("get-config: failed: %s", azure_data->error->message);
-        g_task_return_error(config_data->task, g_steal_pointer(&azure_data->error));
+        g_task_return_error(get_config_data->task, g_steal_pointer(&azure_data->error));
     } else {
         _LOGD("get-config: success");
-        g_task_return_pointer(config_data->task,
-                              g_hash_table_ref(config_data->result_dict),
+        g_task_return_pointer(get_config_data->task,
+                              g_hash_table_ref(get_config_data->result_dict),
                               (GDestroyNotify) g_hash_table_unref);
     }
 
     nm_g_slice_free(azure_data);
-    g_object_unref(config_data->task);
+    g_object_unref(get_config_data->task);
 }
 
 static void
@@ -176,7 +176,7 @@ _get_config_fetch_done_cb(NMHttpClient *http_client,
 
         fip_str = g_bytes_get_data(response, NULL);
         iface_data->iface_get_config =
-            g_hash_table_lookup(azure_data->config_data->result_dict, iface_data->hwaddr);
+            g_hash_table_lookup(azure_data->get_config_data->result_dict, iface_data->hwaddr);
         iface_get_config            = iface_data->iface_get_config;
         iface_get_config->iface_idx = iface_data->iface_idx;
 
@@ -293,7 +293,7 @@ _get_config_ips_prefix_list_cb(GObject *source, GAsyncResult *result, gpointer u
                 10000,
                 1000,
                 NM_MAKE_STRV(NM_AZURE_METADATA_HEADER),
-                g_task_get_cancellable(azure_data->config_data->task),
+                g_task_get_cancellable(azure_data->get_config_data->task),
                 NULL,
                 NULL,
                 _get_config_fetch_done_cb_private_ipv4s,
@@ -319,7 +319,7 @@ _get_config_ips_prefix_list_cb(GObject *source, GAsyncResult *result, gpointer u
             10000,
             1000,
             NM_MAKE_STRV(NM_AZURE_METADATA_HEADER),
-            g_task_get_cancellable(azure_data->config_data->task),
+            g_task_get_cancellable(azure_data->get_config_data->task),
             NULL,
             NULL,
             _get_config_fetch_done_cb_subnet_cidr_prefix,
@@ -357,17 +357,17 @@ _get_config_iface_cb(GObject *source, GAsyncResult *result, gpointer user_data)
     }
 
     iface_data->iface_get_config =
-        g_hash_table_lookup(azure_data->config_data->result_dict, iface_data->hwaddr);
+        g_hash_table_lookup(azure_data->get_config_data->result_dict, iface_data->hwaddr);
 
     if (!iface_data->iface_get_config) {
-        if (!iface_data->azure_data->config_data->any) {
+        if (!iface_data->azure_data->get_config_data->any) {
             _LOGD("interface[%" G_GSSIZE_FORMAT "]: ignore hwaddr %s",
                   iface_data->iface_idx,
                   iface_data->hwaddr);
             goto done;
         }
         iface_data->iface_get_config = nmcs_provider_get_config_iface_data_new(FALSE);
-        g_hash_table_insert(azure_data->config_data->result_dict,
+        g_hash_table_insert(azure_data->get_config_data->result_dict,
                             g_strdup(iface_data->hwaddr),
                             iface_data->iface_get_config);
     }
@@ -385,7 +385,7 @@ _get_config_iface_cb(GObject *source, GAsyncResult *result, gpointer user_data)
                             10000,
                             1000,
                             NM_MAKE_STRV(NM_AZURE_METADATA_HEADER),
-                            g_task_get_cancellable(azure_data->config_data->task),
+                            g_task_get_cancellable(azure_data->get_config_data->task),
                             NULL,
                             NULL,
                             _get_config_ips_prefix_list_cb,
@@ -478,7 +478,7 @@ _get_net_ifaces_list_cb(GObject *source, GAsyncResult *result, gpointer user_dat
                                 10000,
                                 1000,
                                 NM_MAKE_STRV(NM_AZURE_METADATA_HEADER),
-                                g_task_get_cancellable(azure_data->config_data->task),
+                                g_task_get_cancellable(azure_data->get_config_data->task),
                                 NULL,
                                 NULL,
                                 _get_config_iface_cb,
@@ -494,7 +494,7 @@ get_config(NMCSProvider *provider, NMCSProviderGetConfigTaskData *get_config_dat
 
     azure_data  = g_slice_new(AzureData);
     *azure_data = (AzureData){
-        .config_data      = get_config_data,
+        .get_config_data  = get_config_data,
         .n_ifaces_pending = 0,
     };
 
diff --git a/clients/cloud-setup/nmcs-provider-gcp.c b/clients/cloud-setup/nmcs-provider-gcp.c
index 09b09d0f67..a0b137aa94 100644
--- a/clients/cloud-setup/nmcs-provider-gcp.c
+++ b/clients/cloud-setup/nmcs-provider-gcp.c
@@ -89,7 +89,7 @@ detect(NMCSProvider *provider, GTask *task)
 /*****************************************************************************/
 
 typedef struct {
-    NMCSProviderGetConfigTaskData *config_data;
+    NMCSProviderGetConfigTaskData *get_config_data;
     guint                          n_ifaces_pending;
     GError *                       error;
 } GCPData;
@@ -104,7 +104,7 @@ typedef struct {
 static void
 _get_config_maybe_task_return(GCPData *gcp_data, GError *error_take)
 {
-    NMCSProviderGetConfigTaskData *config_data = gcp_data->config_data;
+    NMCSProviderGetConfigTaskData *get_config_data = gcp_data->get_config_data;
 
     if (error_take) {
         if (!gcp_data->error)
@@ -125,16 +125,16 @@ _get_config_maybe_task_return(GCPData *gcp_data, GError *error_take)
             _LOGD("get-config: cancelled");
         else
             _LOGD("get-config: failed: %s", gcp_data->error->message);
-        g_task_return_error(config_data->task, g_steal_pointer(&gcp_data->error));
+        g_task_return_error(get_config_data->task, g_steal_pointer(&gcp_data->error));
     } else {
         _LOGD("get-config: success");
-        g_task_return_pointer(config_data->task,
-                              g_hash_table_ref(config_data->result_dict),
+        g_task_return_pointer(get_config_data->task,
+                              g_hash_table_ref(get_config_data->result_dict),
                               (GDestroyNotify) g_hash_table_unref);
     }
 
     nm_g_slice_free(gcp_data);
-    g_object_unref(config_data->task);
+    g_object_unref(get_config_data->task);
 }
 
 static void
@@ -256,7 +256,7 @@ _get_config_ips_list_cb(GObject *source, GAsyncResult *result, gpointer user_dat
                                 HTTP_POLL_TIMEOUT_MS,
                                 HTTP_RATE_LIMIT_MS,
                                 NM_MAKE_STRV(NM_GCP_METADATA_HEADER),
-                                g_task_get_cancellable(gcp_data->config_data->task),
+                                g_task_get_cancellable(gcp_data->get_config_data->task),
                                 NULL,
                                 NULL,
                                 _get_config_fip_cb,
@@ -289,7 +289,8 @@ _get_config_iface_cb(GObject *source, GAsyncResult *result, gpointer user_data)
         goto iface_error;
 
     hwaddr = nmcs_utils_hwaddr_normalize(g_bytes_get_data(response, NULL), -1);
-    iface_data->iface_get_config = g_hash_table_lookup(gcp_data->config_data->result_dict, hwaddr);
+    iface_data->iface_get_config =
+        g_hash_table_lookup(gcp_data->get_config_data->result_dict, hwaddr);
     if (!iface_data->iface_get_config) {
         _LOGI("GCP interface[%" G_GSSIZE_FORMAT "]: did not find a matching device",
               iface_data->iface_idx);
@@ -311,7 +312,7 @@ _get_config_iface_cb(GObject *source, GAsyncResult *result, gpointer user_data)
                             HTTP_POLL_TIMEOUT_MS,
                             HTTP_RATE_LIMIT_MS,
                             NM_MAKE_STRV(NM_GCP_METADATA_HEADER),
-                            g_task_get_cancellable(gcp_data->config_data->task),
+                            g_task_get_cancellable(gcp_data->get_config_data->task),
                             NULL,
                             NULL,
                             _get_config_ips_list_cb,
@@ -396,7 +397,7 @@ _get_net_ifaces_list_cb(GObject *source, GAsyncResult *result, gpointer user_dat
                                 HTTP_POLL_TIMEOUT_MS,
                                 HTTP_RATE_LIMIT_MS,
                                 NM_MAKE_STRV(NM_GCP_METADATA_HEADER),
-                                g_task_get_cancellable(gcp_data->config_data->task),
+                                g_task_get_cancellable(gcp_data->get_config_data->task),
                                 NULL,
                                 NULL,
                                 _get_config_iface_cb,
@@ -417,7 +418,7 @@ get_config(NMCSProvider *provider, NMCSProviderGetConfigTaskData *get_config_dat
 
     gcp_data  = g_slice_new(GCPData);
     *gcp_data = (GCPData){
-        .config_data      = get_config_data,
+        .get_config_data  = get_config_data,
         .n_ifaces_pending = 0,
         .error            = NULL,
     };
@@ -429,7 +430,7 @@ get_config(NMCSProvider *provider, NMCSProviderGetConfigTaskData *get_config_dat
                             HTTP_POLL_TIMEOUT_MS,
                             HTTP_RATE_LIMIT_MS,
                             NM_MAKE_STRV(NM_GCP_METADATA_HEADER),
-                            g_task_get_cancellable(gcp_data->config_data->task),
+                            g_task_get_cancellable(gcp_data->get_config_data->task),
                             NULL,
                             NULL,
                             _get_net_ifaces_list_cb,