diff options
| author | Thomas Haller <thaller@redhat.com> | 2022-02-28 18:48:47 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2022-03-02 22:52:07 +0100 |
| commit | e3d5b7c090ef87ad4e49a79fe692c359a6052e76 (patch) | |
| tree | a6cb9cbca72eba77dbb0c5230a94fbd13eec5042 | |
| parent | c906e2bff52e7ac4ff6823d954c98d11655aedc9 (diff) | |
cli: minor cleanup initializing APInfo in "devices.c"
| -rw-r--r-- | src/nmcli/devices.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/nmcli/devices.c b/src/nmcli/devices.c index e23ef681bf..2fab1243a9 100644 --- a/src/nmcli/devices.c +++ b/src/nmcli/devices.c @@ -1261,7 +1261,7 @@ static void fill_output_access_point(gpointer data, gpointer user_data) { NMAccessPoint *ap = NM_ACCESS_POINT(data); - APInfo *info = (APInfo *) user_data; + APInfo *info = user_data; NmcOutputField *arr; gboolean active = FALSE; NM80211ApFlags flags; @@ -3032,7 +3032,6 @@ wifi_print_aps(NMDeviceWifi *wifi, { NMAccessPoint *ap = NULL; const GPtrArray *aps; - APInfo *info; guint i; NmcOutputField *arr; const char *base_hdr = _("Wi-Fi scan list"); @@ -3061,23 +3060,23 @@ wifi_print_aps(NMDeviceWifi *wifi, ap = candidate_ap; } if (ap) { + APInfo info = { + .nmc = nmc, + .index = 1, + .output_flags = 0, + .active_bssid = NULL, + .device = nm_device_get_iface(NM_DEVICE(wifi)), + .output_data = out.output_data, + }; + /* Add headers (field names) */ arr = nmc_dup_fields_array(tmpl, NMC_OF_FLAG_MAIN_HEADER_ADD | NMC_OF_FLAG_FIELD_NAMES); g_ptr_array_add(out.output_data, arr); - info = g_malloc0(sizeof(APInfo)); - info->nmc = nmc; - info->index = 1; - info->output_flags = 0; - info->active_bssid = NULL; - info->device = nm_device_get_iface(NM_DEVICE(wifi)); - info->output_data = out.output_data; - - fill_output_access_point(ap, info); + fill_output_access_point(ap, &info); print_data_prepare_width(out.output_data); print_data(&nmc->nmc_config, &nmc->pager_data, out_indices, header_name, 0, &out); - g_free(info); *bssid_found = TRUE; empty_line = TRUE; |