From 8bdf070ff046f482f6eb5e2b15ebc216f5d1e3da Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 12 Feb 2025 13:46:50 +0100 Subject: New upstream version 1.51.90 --- src/nmcli/devices.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/nmcli/devices.c') diff --git a/src/nmcli/devices.c b/src/nmcli/devices.c index f6163757..b308e440 100644 --- a/src/nmcli/devices.c +++ b/src/nmcli/devices.c @@ -1675,7 +1675,7 @@ show_device_info(NMDevice *device, NmCli *nmc) nmc_print_table( &nmc->nmc_config, - (gpointer[]){device, NULL}, + (gpointer[]) {device, NULL}, NULL, NULL, NMC_META_GENERIC_GROUP("GENERAL", metagen_device_detail_general, N_("NAME")), @@ -1690,7 +1690,7 @@ show_device_info(NMDevice *device, NmCli *nmc) gs_free char *f = section_fld ? g_strdup_printf("CAPABILITIES.%s", section_fld) : NULL; nmc_print_table(&nmc->nmc_config, - (gpointer[]){device, NULL}, + (gpointer[]) {device, NULL}, NULL, NULL, NMC_META_GENERIC_GROUP("CAPABILITIES", @@ -1708,7 +1708,7 @@ show_device_info(NMDevice *device, NmCli *nmc) section_fld ? g_strdup_printf("INTERFACE-FLAGS.%s", section_fld) : NULL; nmc_print_table(&nmc->nmc_config, - (gpointer[]){device, NULL}, + (gpointer[]) {device, NULL}, NULL, NULL, NMC_META_GENERIC_GROUP("INTERFACE-FLAGS", @@ -1727,7 +1727,7 @@ show_device_info(NMDevice *device, NmCli *nmc) section_fld ? g_strdup_printf("WIFI-PROPERTIES.%s", section_fld) : NULL; nmc_print_table(&nmc->nmc_config, - (gpointer[]){device, NULL}, + (gpointer[]) {device, NULL}, NULL, NULL, NMC_META_GENERIC_GROUP("WIFI-PROPERTIES", @@ -1791,7 +1791,7 @@ show_device_info(NMDevice *device, NmCli *nmc) section_fld ? g_strdup_printf("WIRED-PROPERTIES.%s", section_fld) : NULL; nmc_print_table(&nmc->nmc_config, - (gpointer[]){device, NULL}, + (gpointer[]) {device, NULL}, NULL, NULL, NMC_META_GENERIC_GROUP("WIRED-PROPERTIES", @@ -1920,7 +1920,7 @@ show_device_info(NMDevice *device, NmCli *nmc) gs_free char *f = section_fld ? g_strdup_printf("CONNECTIONS.%s", section_fld) : NULL; nmc_print_table(&nmc->nmc_config, - (gpointer[]){device, NULL}, + (gpointer[]) {device, NULL}, NULL, NULL, NMC_META_GENERIC_GROUP("CONNECTIONS", @@ -2102,7 +2102,7 @@ add_and_activate_info_new(NmCli *nmc, AddAndActivateInfo *info; info = g_slice_new(AddAndActivateInfo); - *info = (AddAndActivateInfo){ + *info = (AddAndActivateInfo) { .nmc = nmc, .device = g_object_ref(device), .hotspot = hotspot, @@ -2639,7 +2639,7 @@ do_device_modify(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const nmc->should_wait++; info = g_slice_new(ModifyInfo); - *info = (ModifyInfo){ + *info = (ModifyInfo) { .nmc = nmc, .argc = argc, .argv = nm_strv_dup(argv, argc, TRUE), @@ -3535,7 +3535,7 @@ do_device_wifi_list(const NMCCommand *cmd, NmCli *nmc, int argc, const char *con } scan_info = g_slice_new(ScanInfo); - *scan_info = (ScanInfo){ + *scan_info = (ScanInfo) { .out_indices = g_array_ref(out_indices), .tmpl = tmpl, .bssid_user = g_strdup(bssid_user), @@ -3557,7 +3557,7 @@ do_device_wifi_list(const NMCCommand *cmd, NmCli *nmc, int argc, const char *con timeout_msec = 15000; wifi_list_data = g_slice_new(WifiListData); - *wifi_list_data = (WifiListData){ + *wifi_list_data = (WifiListData) { .wifi = wifi, .scan_info = scan_info, .timeout_id = g_timeout_add(timeout_msec, wifi_list_scan_timeout, wifi_list_data), @@ -4113,7 +4113,7 @@ generate_wpa_key(char *key, size_t len) int c; do { - c = nm_random_u64_range_full(48, 122, TRUE); + c = nm_random_u64_range(48, 122); /* skip characters that look similar */ } while (NM_IN_SET(c, '1', 'l', 'I', '0', 'O', 'Q', '8', 'B', '5', 'S') || !g_ascii_isalnum(c)); @@ -4136,7 +4136,7 @@ generate_wep_key(char *key, size_t len) for (i = 0; i < 10; i++) { int digit; - digit = nm_random_u64_range_full(0, 16, TRUE); + digit = nm_random_u64_range(0, 16); key[i] = hexdigits[digit]; } key[10] = '\0'; -- cgit 1.3.0-6-gf8a5