diff --git a/examples/C/glib/vpn-import-libnm.c b/examples/C/glib/vpn-import-libnm.c index 61a33a761..fe22a7d1b 100644 --- a/examples/C/glib/vpn-import-libnm.c +++ b/examples/C/glib/vpn-import-libnm.c @@ -107,7 +107,7 @@ connection_add(NMConnection *conn) nm_connection_get_id(conn), nm_connection_get_uuid(conn)); - rdata = (RequestData){ + rdata = (RequestData) { .loop = g_main_loop_new(NULL, FALSE), .rconn = NULL, .error = NULL, diff --git a/src/core/NetworkManagerUtils.c b/src/core/NetworkManagerUtils.c index 2f4471461..d4180b0bc 100644 --- a/src/core/NetworkManagerUtils.c +++ b/src/core/NetworkManagerUtils.c @@ -967,7 +967,7 @@ nm_match_spec_device_data_init_from_device(struct _NMMatchSpecDeviceData *out_da nm_assert(out_data); if (!device) { - *out_data = (NMMatchSpecDeviceData){}; + *out_data = (NMMatchSpecDeviceData) {}; return out_data; } @@ -983,7 +983,7 @@ nm_match_spec_device_data_init_from_device(struct _NMMatchSpecDeviceData *out_da * * The returned data is only valid, until NMDevice gets modified again. */ - *out_data = (NMMatchSpecDeviceData){ + *out_data = (NMMatchSpecDeviceData) { .interface_name = nm_device_get_iface(device), .device_type = nm_device_get_type_description(device), .driver = nm_device_get_driver(device), @@ -1010,7 +1010,7 @@ nm_match_spec_device_data_init_from_platform(NMMatchSpecDeviceData *out_data, * It's still useful because of specs like "*" and "except:interface-name:eth0", * which match even in that case. */ - *out_data = (NMMatchSpecDeviceData){ + *out_data = (NMMatchSpecDeviceData) { .interface_name = pllink ? pllink->name : NULL, .device_type = match_device_type, .driver = pllink ? pllink->driver : NULL, @@ -1057,7 +1057,7 @@ nm_ip_routing_rule_to_platform(const NMIPRoutingRule *rule, NMPlatformRoutingRul uid_range_has = nm_ip_routing_rule_get_uid_range(rule, &uid_range_start, &uid_range_end); - *out_pl = (NMPlatformRoutingRule){ + *out_pl = (NMPlatformRoutingRule) { .addr_family = nm_ip_routing_rule_get_addr_family(rule), .flags = (nm_ip_routing_rule_get_invert(rule) ? FIB_RULE_INVERT : 0), .priority = nm_ip_routing_rule_get_priority(rule), @@ -1200,7 +1200,7 @@ nm_shutdown_wait_obj_register_full(gpointer watched_obj, * make sure to use the default context. */ handle = g_slice_new(NMShutdownWaitObjHandle); - *handle = (NMShutdownWaitObjHandle){ + *handle = (NMShutdownWaitObjHandle) { /* depending on @free_msg_reason, we take ownership of @msg_reason. * In either case, we just reference the string without cloning * it. */ diff --git a/src/core/devices/adsl/nm-device-adsl.c b/src/core/devices/adsl/nm-device-adsl.c index ba6050775..5c3432b28 100644 --- a/src/core/devices/adsl/nm-device-adsl.c +++ b/src/core/devices/adsl/nm-device-adsl.c @@ -494,7 +494,7 @@ act_stage2_config(NMDevice *device, NMDeviceStateReason *out_failure_reason) _LOGD(LOGD_ADSL, "starting PPPoA"); } - priv->ppp_mgr = nm_ppp_mgr_start(&((const NMPppMgrConfig){ + priv->ppp_mgr = nm_ppp_mgr_start(&((const NMPppMgrConfig) { .netns = nm_device_get_netns(device), .parent_iface = ppp_iface, .callback = _ppp_mgr_callback, diff --git a/src/core/devices/bluetooth/nm-bluez-manager.c b/src/core/devices/bluetooth/nm-bluez-manager.c index ac26ede8c..3088cd6f9 100644 --- a/src/core/devices/bluetooth/nm-bluez-manager.c +++ b/src/core/devices/bluetooth/nm-bluez-manager.c @@ -334,7 +334,7 @@ _bz_dbus_obj_new(NMBluezManager *self, const char *object_path) l = strlen(object_path) + 1; bzobj = g_malloc(sizeof(BzDBusObj) + l); - *bzobj = (BzDBusObj){ + *bzobj = (BzDBusObj) { .object_path = bzobj->_object_path_intern, .self = self, .x_network_server.lst = C_LIST_INIT(bzobj->x_network_server.lst), @@ -751,7 +751,7 @@ _conn_data_head_new(NMBluetoothCapabilities bt_type, const char *bdaddr) l = strlen(bdaddr) + 1; cdata_hd = g_malloc(sizeof(ConnDataHead) + l); - *cdata_hd = (ConnDataHead){ + *cdata_hd = (ConnDataHead) { .bdaddr = cdata_hd->bdaddr_data, .lst_head = C_LIST_INIT(cdata_hd->lst_head), .bt_type = bt_type, @@ -1143,7 +1143,7 @@ _network_server_vt_register_bridge(const NMBtVTableNetworkServer *vtable, bzobj->d_adapter.address); r_req_data = g_slice_new(NetworkServerRegisterReqData); - *r_req_data = (NetworkServerRegisterReqData){ + *r_req_data = (NetworkServerRegisterReqData) { .int_cancellable = g_cancellable_new(), .ext_cancellable = g_object_ref(cancellable), .callback = callback, @@ -2749,7 +2749,7 @@ nm_bluez_manager_connect(NMBluezManager *self, } c_req_data = g_slice_new(DeviceConnectReqData); - *c_req_data = (DeviceConnectReqData){ + *c_req_data = (DeviceConnectReqData) { .int_cancellable = g_steal_pointer(&int_cancellable), .ext_cancellable = g_object_ref(cancellable), .callback = callback, @@ -2814,7 +2814,7 @@ nm_bluez_manager_init(NMBluezManager *self) { NMBluezManagerPrivate *priv = NM_BLUEZ_MANAGER_GET_PRIVATE(self); - priv->vtable_network_server = (NMBtVTableNetworkServer){ + priv->vtable_network_server = (NMBtVTableNetworkServer) { .is_available = _network_server_vt_is_available, .register_bridge = _network_server_vt_register_bridge, .unregister_bridge = _network_server_vt_unregister_bridge, diff --git a/src/core/devices/bluetooth/nm-bluez5-dun.c b/src/core/devices/bluetooth/nm-bluez5-dun.c index 426bab0cd..08d37c27a 100644 --- a/src/core/devices/bluetooth/nm-bluez5-dun.c +++ b/src/core/devices/bluetooth/nm-bluez5-dun.c @@ -683,7 +683,7 @@ nm_bluez5_dun_connect(const char *adapter, dst_l = strlen(remote) + 1; cdat = g_slice_new(ConnectData); - *cdat = (ConnectData){ + *cdat = (ConnectData) { .callback = callback, .callback_user_data = callback_user_data, .cancellable = g_object_ref(cancellable), @@ -691,7 +691,7 @@ nm_bluez5_dun_connect(const char *adapter, }; context = g_malloc(sizeof(NMBluez5DunContext) + src_l + dst_l); - *context = (NMBluez5DunContext){ + *context = (NMBluez5DunContext) { .cdat = cdat, .notify_tty_hangup_cb = notify_tty_hangup_cb, .notify_tty_hangup_user_data = notify_tty_hangup_user_data, diff --git a/src/core/devices/nm-device-bond.c b/src/core/devices/nm-device-bond.c index b60dd3f17..2d9b5598a 100644 --- a/src/core/devices/nm-device-bond.c +++ b/src/core/devices/nm-device-bond.c @@ -436,7 +436,7 @@ _platform_lnk_bond_init_from_setting(NMSettingBond *s_bond, NMPlatformLnkBond *p #define _v_u32(s_bond, opt) _nm_setting_bond_opt_value_as_u32((s_bond), (opt)) #define _v_intbool(s_bond, opt) _nm_setting_bond_opt_value_as_intbool((s_bond), (opt)) - *props = (NMPlatformLnkBond){ + *props = (NMPlatformLnkBond) { .mode = _v_fcn(_nm_setting_bond_mode_from_string, s_bond, NM_SETTING_BOND_OPTION_MODE), .primary = _setting_bond_primary_opt_as_ifindex(s_bond), .miimon = _v_u32(s_bond, NM_SETTING_BOND_OPTION_MIIMON), @@ -681,7 +681,7 @@ commit_port_options(NMDevice *bond_device, NMDevice *port, NMSettingBondPort *s_ nm_platform_link_change(nm_device_get_platform(port), nm_device_get_ifindex(port), NULL, - &((NMPlatformLinkBondPort){ + &((NMPlatformLinkBondPort) { .queue_id = s_port ? nm_setting_bond_port_get_queue_id(s_port) : NM_BOND_PORT_QUEUE_ID_DEF, .prio = prio_has ? prio : 0, diff --git a/src/core/devices/nm-device-bridge.c b/src/core/devices/nm-device-bridge.c index a237c0b73..6f06dbf49 100644 --- a/src/core/devices/nm-device-bridge.c +++ b/src/core/devices/nm-device-bridge.c @@ -439,7 +439,7 @@ setting_vlans_to_platform(GPtrArray *array, guint *out_len) nm_bridge_vlan_get_vid_range(vlan, &vid_start, &vid_end); - arr[i] = (NMPlatformBridgeVlan){ + arr[i] = (NMPlatformBridgeVlan) { .vid_start = vid_start, .vid_end = vid_end, .pvid = nm_bridge_vlan_is_pvid(vlan), @@ -468,7 +468,7 @@ commit_port_options(NMDevice *device, NMSettingBridgePort *setting) nm_device_get_ifindex(device), NULL, NULL, - &((NMPlatformLinkBridgePort){ + &((NMPlatformLinkBridgePort) { .path_cost = path_cost, .priority = priority, .hairpin = nm_setting_bridge_port_get_hairpin_mode(setting), @@ -660,10 +660,10 @@ bridge_set_vlan_options(NMDevice *device, NMSettingBridge *s_bridge, gboolean is nm_platform_link_set_bridge_info( plat, ifindex, - &((NMPlatformLinkSetBridgeInfoData){.vlan_filtering_has = TRUE, - .vlan_filtering_val = FALSE, - .vlan_default_pvid_has = TRUE, - .vlan_default_pvid_val = 1})); + &((NMPlatformLinkSetBridgeInfoData) {.vlan_filtering_has = TRUE, + .vlan_filtering_val = FALSE, + .vlan_default_pvid_has = TRUE, + .vlan_default_pvid_val = 1})); nm_platform_link_set_bridge_vlans(plat, ifindex, FALSE, NULL, 0); return TRUE; } @@ -690,10 +690,10 @@ bridge_set_vlan_options(NMDevice *device, NMSettingBridge *s_bridge, gboolean is nm_platform_link_set_bridge_info( plat, ifindex, - &((NMPlatformLinkSetBridgeInfoData){.vlan_filtering_has = TRUE, - .vlan_filtering_val = FALSE, - .vlan_default_pvid_has = TRUE, - .vlan_default_pvid_val = 0})); + &((NMPlatformLinkSetBridgeInfoData) {.vlan_filtering_has = TRUE, + .vlan_filtering_val = FALSE, + .vlan_default_pvid_has = TRUE, + .vlan_default_pvid_val = 0})); /* Clear all existing VLANs */ if (!nm_platform_link_set_bridge_vlans(plat, ifindex, FALSE, NULL, 0)) @@ -706,8 +706,8 @@ bridge_set_vlan_options(NMDevice *device, NMSettingBridge *s_bridge, gboolean is nm_platform_link_set_bridge_info( plat, ifindex, - &((NMPlatformLinkSetBridgeInfoData){.vlan_default_pvid_has = TRUE, - .vlan_default_pvid_val = pvid})); + &((NMPlatformLinkSetBridgeInfoData) {.vlan_default_pvid_has = TRUE, + .vlan_default_pvid_val = pvid})); } } @@ -721,7 +721,7 @@ bridge_set_vlan_options(NMDevice *device, NMSettingBridge *s_bridge, gboolean is nm_platform_link_set_bridge_info(plat, ifindex, - &((NMPlatformLinkSetBridgeInfoData){ + &((NMPlatformLinkSetBridgeInfoData) { .vlan_filtering_has = TRUE, .vlan_filtering_val = TRUE, })); @@ -757,7 +757,7 @@ merge_bridge_vlan_default_pvid(NMPlatformBridgeVlan *vlans, guint *num_vlans, gu * Set the PVID flag only if the port didn't have one. */ vlans = g_realloc_n(vlans, *num_vlans + 1, sizeof(NMPlatformBridgeVlan)); (*num_vlans)++; - vlans[*num_vlans - 1] = (NMPlatformBridgeVlan){ + vlans[*num_vlans - 1] = (NMPlatformBridgeVlan) { .vid_start = default_pvid, .vid_end = default_pvid, .untagged = TRUE, @@ -847,7 +847,7 @@ nm_device_reapply_bridge_port_vlans(NMDevice *device) static void _platform_lnk_bridge_init_from_setting(NMSettingBridge *s_bridge, NMPlatformLnkBridge *props) { - *props = (NMPlatformLnkBridge){ + *props = (NMPlatformLnkBridge) { .forward_delay = _DEFAULT_IF_ZERO(nm_setting_bridge_get_forward_delay(s_bridge) * 100u, NM_BRIDGE_FORWARD_DELAY_DEF_SYS), .hello_time = _DEFAULT_IF_ZERO(nm_setting_bridge_get_hello_time(s_bridge) * 100u, diff --git a/src/core/devices/nm-device-ethernet.c b/src/core/devices/nm-device-ethernet.c index 169925245..fc47e1385 100644 --- a/src/core/devices/nm-device-ethernet.c +++ b/src/core/devices/nm-device-ethernet.c @@ -1451,7 +1451,7 @@ act_stage2_config(NMDevice *device, NMDeviceStateReason *out_failure_reason) g_return_val_if_fail(s_pppoe, NM_ACT_STAGE_RETURN_FAILURE); priv->ppp_data.ppp_mgr = - nm_ppp_mgr_start(&((const NMPppMgrConfig){ + nm_ppp_mgr_start(&((const NMPppMgrConfig) { .netns = nm_device_get_netns(device), .parent_iface = nm_device_get_iface(device), .callback = _ppp_mgr_callback, diff --git a/src/core/devices/nm-device-ppp.c b/src/core/devices/nm-device-ppp.c index 275666071..507b9eb6c 100644 --- a/src/core/devices/nm-device-ppp.c +++ b/src/core/devices/nm-device-ppp.c @@ -188,7 +188,7 @@ act_stage2_config(NMDevice *device, NMDeviceStateReason *out_failure_reason) s_pppoe = nm_device_get_applied_setting(device, NM_TYPE_SETTING_PPPOE); g_return_val_if_fail(s_pppoe, NM_ACT_STAGE_RETURN_FAILURE); - priv->ppp_mgr = nm_ppp_mgr_start(&((const NMPppMgrConfig){ + priv->ppp_mgr = nm_ppp_mgr_start(&((const NMPppMgrConfig) { .netns = nm_device_get_netns(device), .parent_iface = nm_setting_pppoe_get_parent(s_pppoe), .callback = _ppp_mgr_callback, diff --git a/src/core/devices/nm-device-utils.c b/src/core/devices/nm-device-utils.c index ccb6292bb..9fd7ac9db 100644 --- a/src/core/devices/nm-device-utils.c +++ b/src/core/devices/nm-device-utils.c @@ -355,7 +355,7 @@ nm_device_resolve_address(int addr_family, NMDnsSystemdResolved *resolved; info = g_new(ResolveAddrInfo, 1); - *info = (ResolveAddrInfo){ + *info = (ResolveAddrInfo) { .task = nm_g_task_new(NULL, cancellable, nm_device_resolve_address, callback, cb_data), .addr_family = addr_family, .address = nm_ip_addr_init(addr_family, address), diff --git a/src/core/devices/nm-device-vlan.c b/src/core/devices/nm-device-vlan.c index d46309995..a2c5a27b9 100644 --- a/src/core/devices/nm-device-vlan.c +++ b/src/core/devices/nm-device-vlan.c @@ -241,7 +241,7 @@ create_and_realize(NMDevice *device, r = nm_platform_link_vlan_add(nm_device_get_platform(device), iface, parent_ifindex, - &((NMPlatformLnkVlan){ + &((NMPlatformLnkVlan) { .id = vlan_id, .flags = nm_setting_vlan_get_flags(s_vlan), .protocol = protocol, diff --git a/src/core/devices/nm-device-vrf.c b/src/core/devices/nm-device-vrf.c index c3d313470..48365ac68 100644 --- a/src/core/devices/nm-device-vrf.c +++ b/src/core/devices/nm-device-vrf.c @@ -48,7 +48,7 @@ do_update_properties(NMDeviceVrf *self, const NMPlatformLnkVrf *props) NMPlatformLnkVrf props_null; if (!props) { - props_null = (NMPlatformLnkVrf){}; + props_null = (NMPlatformLnkVrf) {}; props = &props_null; } diff --git a/src/core/devices/nm-device-wireguard.c b/src/core/devices/nm-device-wireguard.c index 00a8c7187..4a08192e0 100644 --- a/src/core/devices/nm-device-wireguard.c +++ b/src/core/devices/nm-device-wireguard.c @@ -430,7 +430,7 @@ get_extra_rules(NMDevice *device) g_ptr_array_add(extra_rules, nmp_object_new(NMP_OBJECT_TYPE_ROUTING_RULE, - &((const NMPlatformRoutingRule){ + &((const NMPlatformRoutingRule) { .priority = priority, .addr_family = addr_family, .action = FR_ACT_TO_TBL, @@ -440,7 +440,7 @@ get_extra_rules(NMDevice *device) g_ptr_array_add(extra_rules, nmp_object_new(NMP_OBJECT_TYPE_ROUTING_RULE, - &((const NMPlatformRoutingRule){ + &((const NMPlatformRoutingRule) { .priority = priority + 1u, .addr_family = addr_family, .action = FR_ACT_TO_TBL, @@ -588,7 +588,7 @@ _peers_add(NMDeviceWireGuard *self, NMWireGuardPeer *peer) nm_assert(!_peers_find(priv, peer)); peer_data = g_slice_new(PeerData); - *peer_data = (PeerData){ + *peer_data = (PeerData) { .self = self, .peer = nm_wireguard_peer_ref(peer), .ep_resolv = @@ -792,7 +792,7 @@ _peers_resolve_cb(GObject *source_object, GAsyncResult *res, gpointer user_data) switch (g_inet_address_get_family(a)) { case G_SOCKET_FAMILY_IPV4: nm_assert(g_inet_address_get_native_size(a) == sizeof(struct in_addr)); - s->in = (struct sockaddr_in){ + s->in = (struct sockaddr_in) { .sin_family = AF_INET, .sin_port = htons(nm_sock_addr_endpoint_get_port( _nm_wireguard_peer_get_endpoint(peer_data->peer))), @@ -801,7 +801,7 @@ _peers_resolve_cb(GObject *source_object, GAsyncResult *res, gpointer user_data) break; case G_SOCKET_FAMILY_IPV6: nm_assert(g_inet_address_get_native_size(a) == sizeof(struct in6_addr)); - s->in6 = (struct sockaddr_in6){ + s->in6 = (struct sockaddr_in6) { .sin6_family = AF_INET6, .sin6_port = htons(nm_sock_addr_endpoint_get_port( _nm_wireguard_peer_get_endpoint(peer_data->peer))), @@ -985,7 +985,7 @@ _peers_update(NMDeviceWireGuard *self, if (nm_clear_g_cancellable(&peer_data->ep_resolv.cancellable)) _peers_resolving_cnt_decrement(self); - peer_data->ep_resolv = (PeerEndpointResolveData){ + peer_data->ep_resolv = (PeerEndpointResolveData) { .sockaddr = sockaddr, .resolv_fail_count = 0, .cancellable = NULL, @@ -1166,7 +1166,7 @@ _peers_get_platform_list(NMDeviceWireGuardPrivate *priv, prefix = addr_family == AF_INET ? 32 : 128; g_array_append_val(allowed_ips, - ((NMPWireGuardAllowedIP){ + ((NMPWireGuardAllowedIP) { .family = addr_family, .mask = prefix, .addr = addrbin, @@ -1486,7 +1486,7 @@ link_config(NMDeviceWireGuard *self, _peers_update_all(self, s_wg, &peers_removed); - wg_lnk = (NMPlatformLnkWireGuard){}; + wg_lnk = (NMPlatformLnkWireGuard) {}; wg_change_flags = NM_PLATFORM_WIREGUARD_CHANGE_FLAG_NONE; @@ -1733,7 +1733,7 @@ _get_dev2_ip_config(NMDeviceWireGuard *self, int addr_family) } if (addr_family == AF_INET) { - rt.r4 = (NMPlatformIP4Route){ + rt.r4 = (NMPlatformIP4Route) { .network = addrbin.addr4, .plen = prefix, .ifindex = ip_ifindex, @@ -1742,7 +1742,7 @@ _get_dev2_ip_config(NMDeviceWireGuard *self, int addr_family) .metric = route_metric, }; } else { - rt.r6 = (NMPlatformIP6Route){ + rt.r6 = (NMPlatformIP6Route) { .network = addrbin.addr6, .plen = prefix, .ifindex = ip_ifindex, diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c index a0af93a26..5e200c303 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c @@ -3142,7 +3142,7 @@ link_properties_fill_from_setting(NMDevice *self, NMPlatformLinkProps *props) NMSettingLink *s_link; gint64 v; - *props = (NMPlatformLinkProps){}; + *props = (NMPlatformLinkProps) {}; s_link = nm_device_get_applied_setting(self, NM_TYPE_SETTING_LINK); if (!s_link) @@ -7943,9 +7943,9 @@ sriov_op_queue(NMDevice *self, * grace period we pull the plug and cancel it. */ op = g_slice_new(SriovOp); - *op = (SriovOp){ + *op = (SriovOp) { .sriov_params = - (NMPlatformSriovParams){ + (NMPlatformSriovParams) { .num_vfs = num_vfs, .autoprobe = autoprobe, .eswitch_mode = (_NMSriovEswitchMode) eswitch_mode, @@ -11278,7 +11278,7 @@ _dev_ipdhcpx_start(NMDevice *self, int addr_family) hostname = nm_setting_ip_config_get_dhcp_hostname(s_ip); } - config = (NMDhcpClientConfig){ + config = (NMDhcpClientConfig) { .addr_family = AF_INET, .l3cfg = nm_device_get_l3cfg(self), .iface = nm_device_get_ip_iface(self), @@ -11319,7 +11319,7 @@ _dev_ipdhcpx_start(NMDevice *self, int addr_family) iaid = _prop_get_ipvx_dhcp_iaid(self, AF_INET6, connection, FALSE, &iaid_explicit); duid = _prop_get_ipv6_dhcp_duid(self, connection, hwaddr, &enforce_duid); - config = (NMDhcpClientConfig){ + config = (NMDhcpClientConfig) { .addr_family = AF_INET6, .l3cfg = nm_device_get_l3cfg(self), .iface = nm_device_get_ip_iface(self), @@ -14111,7 +14111,7 @@ impl_device_reapply(NMDBusObject *obj, } reapply_data = g_slice_new(ReapplyData); - *reapply_data = (ReapplyData){ + *reapply_data = (ReapplyData) { .connection = connection, .version_id = version_id, .reapply_flags = reapply_flags, @@ -18364,7 +18364,7 @@ nm_device_get_hostname_from_dns_lookup(NMDevice *self, int addr_family, gboolean resolver = priv->hostname_resolver_x[IS_IPv4]; if (!resolver) { resolver = g_slice_new(HostnameResolver); - *resolver = (HostnameResolver){ + *resolver = (HostnameResolver) { .device = self, .addr_family = addr_family, .state = RESOLVER_WAIT_ADDRESS, diff --git a/src/core/devices/nm-lldp-listener.c b/src/core/devices/nm-lldp-listener.c index 59c8f54c0..e08b379ad 100644 --- a/src/core/devices/nm-lldp-listener.c +++ b/src/core/devices/nm-lldp-listener.c @@ -397,7 +397,7 @@ lldp_neighbor_new(NMLldpNeighbor *neighbor_nm) } neigh = g_slice_new(LldpNeighbor); - *neigh = (LldpNeighbor){ + *neigh = (LldpNeighbor) { .neighbor_nm = nm_lldp_neighbor_ref(neighbor_nm), .chassis_id_type = chassis_id_type, .chassis_id = g_steal_pointer(&s_chassis_id), @@ -522,7 +522,7 @@ lldp_neighbor_to_variant(LldpNeighbor *neigh) if (len <= 6) continue; - /* skip over leading TLV, OUI and subtype */ + /* skip over leading TLV, OUI and subtype */ #if NM_MORE_ASSERTS > 5 { guint8 check_hdr[] = {0xfe | (((len - 2) >> 8) & 0x01), @@ -721,7 +721,7 @@ nmtst_lldp_parse_from_raw(const guint8 *raw_data, gsize raw_len) g_assert(raw_data); g_assert(raw_len > 0); - lldp_rx = nm_lldp_rx_new(&((NMLldpRXConfig){ + lldp_rx = nm_lldp_rx_new(&((NMLldpRXConfig) { .ifindex = 1, .neighbors_max = MAX_NEIGHBORS, .callback = nmtst_lldp_event_handler, @@ -889,7 +889,7 @@ nm_lldp_listener_new(int ifindex, g_return_val_if_fail(notify_callback, FALSE); self = g_slice_new(NMLldpListener); - *self = (NMLldpListener){ + *self = (NMLldpListener) { .ifindex = ifindex, .notify_callback = notify_callback, .notify_user_data = notify_user_data, @@ -897,7 +897,7 @@ nm_lldp_listener_new(int ifindex, nm_assert(nm_g_main_context_is_thread_default(g_main_context_default())); - lldp_rx = nm_lldp_rx_new(&((NMLldpRXConfig){ + lldp_rx = nm_lldp_rx_new(&((NMLldpRXConfig) { .ifindex = ifindex, .neighbors_max = MAX_NEIGHBORS, .callback = lldp_event_handler, diff --git a/src/core/devices/ovs/nm-device-ovs-interface.c b/src/core/devices/ovs/nm-device-ovs-interface.c index 8aeb87180..06a1da15e 100644 --- a/src/core/devices/ovs/nm-device-ovs-interface.c +++ b/src/core/devices/ovs/nm-device-ovs-interface.c @@ -603,7 +603,7 @@ deactivate_async(NMDevice *device, * with a timeout. */ data = g_slice_new(DeactivateData); - *data = (DeactivateData){ + *data = (DeactivateData) { .self = g_object_ref(self), .cancellable = g_object_ref(cancellable), .callback = callback, diff --git a/src/core/devices/ovs/nm-device-ovs-port.c b/src/core/devices/ovs/nm-device-ovs-port.c index 2e8ab7177..7eacedb84 100644 --- a/src/core/devices/ovs/nm-device-ovs-port.c +++ b/src/core/devices/ovs/nm-device-ovs-port.c @@ -175,7 +175,7 @@ attach_port(NMDevice *device, } data = g_slice_new(AttachPortData); - *data = (AttachPortData){ + *data = (AttachPortData) { .device = g_object_ref(device), .port = g_object_ref(port), .cancellable = g_object_ref(cancellable), @@ -233,7 +233,7 @@ detach_port(NMDevice *device, AttachPortData *data; data = g_slice_new(AttachPortData); - *data = (AttachPortData){ + *data = (AttachPortData) { .device = g_object_ref(device), .port = g_object_ref(port), .cancellable = nm_g_object_ref(cancellable), diff --git a/src/core/devices/ovs/nm-ovsdb.c b/src/core/devices/ovs/nm-ovsdb.c index 8e32cff57..528d44d8f 100644 --- a/src/core/devices/ovs/nm-ovsdb.c +++ b/src/core/devices/ovs/nm-ovsdb.c @@ -205,7 +205,7 @@ static void cleanup_check_ready(NMOvsdb *self); /*****************************************************************************/ #define OVSDB_METHOD_PAYLOAD_MONITOR() \ - (&((const OvsdbMethodPayload){ \ + (&((const OvsdbMethodPayload) { \ .monitor = {}, \ })) @@ -214,7 +214,7 @@ static void cleanup_check_ready(NMOvsdb *self); xinterface, \ xbridge_device, \ xinterface_device) \ - (&((const OvsdbMethodPayload){ \ + (&((const OvsdbMethodPayload) { \ .add_interface = \ { \ .bridge = (xbridge), \ @@ -226,7 +226,7 @@ static void cleanup_check_ready(NMOvsdb *self); })) #define OVSDB_METHOD_PAYLOAD_DEL_INTERFACE(xifname) \ - (&((const OvsdbMethodPayload){ \ + (&((const OvsdbMethodPayload) { \ .del_interface = \ { \ .ifname = (char *) NM_CONSTCAST(char, (xifname)), \ @@ -234,7 +234,7 @@ static void cleanup_check_ready(NMOvsdb *self); })) #define OVSDB_METHOD_PAYLOAD_SET_INTERFACE_MTU(xifname, xmtu) \ - (&((const OvsdbMethodPayload){ \ + (&((const OvsdbMethodPayload) { \ .set_interface_mtu = \ { \ .ifname = (char *) NM_CONSTCAST(char, (xifname)), \ @@ -249,7 +249,7 @@ static void cleanup_check_ready(NMOvsdb *self); xexternal_ids_new, \ xother_config_old, \ xother_config_new) \ - (&((const OvsdbMethodPayload){ \ + (&((const OvsdbMethodPayload) { \ .set_reapply = \ { \ .device_type = xdevice_type, \ @@ -420,7 +420,7 @@ ovsdb_call_method(NMOvsdb *self, ovsdb_try_connect(self); call = g_slice_new(OvsdbMethodCall); - *call = (OvsdbMethodCall){ + *call = (OvsdbMethodCall) { .self = self, .call_id = CALL_ID_UNSPEC, .command = command, @@ -1682,7 +1682,7 @@ _strdict_extract(json_t *strdict, GArray **out_array) } v = nm_g_array_append_new(*out_array, NMUtilsNamedValue); - *v = (NMUtilsNamedValue){ + *v = (NMUtilsNamedValue) { .name = g_strdup(key), .value_str = g_strdup(val), }; @@ -1909,7 +1909,7 @@ ovsdb_got_update(NMOvsdb *self, json_t *msg) gs_free char *strtmp2 = NULL; ovs_interface = g_slice_new(OpenvswitchInterface); - *ovs_interface = (OpenvswitchInterface){ + *ovs_interface = (OpenvswitchInterface) { .interface_uuid = g_strdup(key), .name = g_strdup(name), .type = g_strdup(type), @@ -2040,7 +2040,7 @@ ovsdb_got_update(NMOvsdb *self, json_t *msg) gs_free char *strtmp2 = NULL; ovs_port = g_slice_new(OpenvswitchPort); - *ovs_port = (OpenvswitchPort){ + *ovs_port = (OpenvswitchPort) { .port_uuid = g_strdup(key), .name = g_strdup(name), .connection_uuid = g_strdup(connection_uuid), @@ -2161,7 +2161,7 @@ ovsdb_got_update(NMOvsdb *self, json_t *msg) gs_free char *strtmp2 = NULL; ovs_bridge = g_slice_new(OpenvswitchBridge); - *ovs_bridge = (OpenvswitchBridge){ + *ovs_bridge = (OpenvswitchBridge) { .bridge_uuid = g_strdup(key), .name = g_strdup(name), .connection_uuid = g_strdup(connection_uuid), @@ -2905,7 +2905,7 @@ ovsdb_call_new(NMOvsdbCallback callback, gpointer user_data) OvsdbCall *call; call = g_slice_new(OvsdbCall); - *call = (OvsdbCall){ + *call = (OvsdbCall) { .callback = callback, .user_data = user_data, }; diff --git a/src/core/devices/wifi/nm-device-iwd.c b/src/core/devices/wifi/nm-device-iwd.c index d6e3ed080..20294105b 100644 --- a/src/core/devices/wifi/nm-device-iwd.c +++ b/src/core/devices/wifi/nm-device-iwd.c @@ -275,7 +275,7 @@ ap_from_network(NMDeviceIwd *self, ssid = g_bytes_new(name, NM_MIN(32u, strlen(name))); - bss_info = (NMSupplicantBssInfo){ + bss_info = (NMSupplicantBssInfo) { .bss_path = bss_path, .last_seen_msec = last_seen_msec, .bssid_valid = TRUE, @@ -3602,7 +3602,7 @@ nm_device_iwd_parse_netconfig(NMDeviceIwd *self, int addr_family, GVariantIter * preferred_lifetime = valid_lifetime; if (addr_family == AF_INET) { - a.a4 = (NMPlatformIP4Address){ + a.a4 = (NMPlatformIP4Address) { .address = addr_bin.addr4, .peer_address = addr_bin.addr4, .plen = plen, @@ -3614,7 +3614,7 @@ nm_device_iwd_parse_netconfig(NMDeviceIwd *self, int addr_family, GVariantIter * .broadcast_address = bcast_bin.addr4, }; } else { - a.a6 = (NMPlatformIP6Address){ + a.a6 = (NMPlatformIP6Address) { .address = addr_bin.addr6, .plen = 128, .timestamp = (valid_lifetime != NM_PLATFORM_LIFETIME_PERMANENT) ? timestamp : 0, @@ -3703,7 +3703,7 @@ nm_device_iwd_parse_netconfig(NMDeviceIwd *self, int addr_family, GVariantIter * } if (addr_family == AF_INET) { - r.r4 = (NMPlatformIP4Route){ + r.r4 = (NMPlatformIP4Route) { .network = dst_addr_str ? dst_addr_bin.addr4 : 0, .plen = dst_addr_str ? dst_plen : 0, .gateway = router_str ? router_bin.addr4 : 0, @@ -3712,7 +3712,7 @@ nm_device_iwd_parse_netconfig(NMDeviceIwd *self, int addr_family, GVariantIter * nm_platform_route_scope_inv(router_str ? RT_SCOPE_UNIVERSE : RT_SCOPE_LINK), }; } else { - r.r6 = (NMPlatformIP6Route){ + r.r6 = (NMPlatformIP6Route) { .network = dst_addr_str ? dst_addr_bin.addr6 : nm_ip_addr_zero.addr6, .plen = dst_addr_str ? dst_plen : 0, .gateway = router_str ? router_bin.addr6 : nm_ip_addr_zero.addr6, diff --git a/src/core/devices/wifi/nm-device-wifi.c b/src/core/devices/wifi/nm-device-wifi.c index f24b97331..749ca7402 100644 --- a/src/core/devices/wifi/nm-device-wifi.c +++ b/src/core/devices/wifi/nm-device-wifi.c @@ -340,7 +340,7 @@ _scan_request_ssids_track(NMDeviceWifiPrivate *priv, const GPtrArray *ssids) d = g_hash_table_lookup(priv->scan_request_ssids_hash, &ssid); if (!d) { d = g_slice_new(ScanRequestSsidData); - *d = (ScanRequestSsidData){ + *d = (ScanRequestSsidData) { .lst = C_LIST_INIT(d->lst), .timestamp_msec = now_msec, .ssid = g_bytes_ref(ssid), diff --git a/src/core/devices/wwan/nm-modem-broadband.c b/src/core/devices/wwan/nm-modem-broadband.c index c03446b95..0231829ed 100644 --- a/src/core/devices/wwan/nm-modem-broadband.c +++ b/src/core/devices/wwan/nm-modem-broadband.c @@ -1116,7 +1116,7 @@ stage3_ip_config_start(NMModem *modem, int addr_family, NMModemIPMethod ip_metho ifindex, NM_IP_CONFIG_SOURCE_WWAN); - address = (NMPlatformIP4Address){ + address = (NMPlatformIP4Address) { .address = address_network, .peer_address = address_network, .plen = mm_bearer_ip_config_get_prefix(self->_priv.ipv4_config), @@ -1127,7 +1127,7 @@ stage3_ip_config_start(NMModem *modem, int addr_family, NMModemIPMethod ip_metho _LOGI(" address %s", nm_platform_ip4_address_to_string(&address, sbuf, sizeof(sbuf))); - route = (NMPlatformIP4Route){ + route = (NMPlatformIP4Route) { .rt_source = NM_IP_CONFIG_SOURCE_WWAN, .gateway = gw, .table_any = TRUE, @@ -1193,7 +1193,7 @@ stage3_ip_config_start(NMModem *modem, int addr_family, NMModemIPMethod ip_metho do_auto = TRUE; if (address_string) { - address = (NMPlatformIP6Address){}; + address = (NMPlatformIP6Address) {}; if (!inet_pton(AF_INET6, address_string, &address.address)) { g_set_error(&error, diff --git a/src/core/devices/wwan/nm-modem-ofono.c b/src/core/devices/wwan/nm-modem-ofono.c index 3e0bbd486..70d024c6e 100644 --- a/src/core/devices/wwan/nm-modem-ofono.c +++ b/src/core/devices/wwan/nm-modem-ofono.c @@ -1256,7 +1256,7 @@ handle_settings(NMModemOfono *self, GVariant *v_dict) goto out; } - address = (NMPlatformIP4Address){ + address = (NMPlatformIP4Address) { .ifindex = ifindex, .address = address_network, .addr_source = NM_IP_CONFIG_SOURCE_WWAN, diff --git a/src/core/devices/wwan/nm-modem.c b/src/core/devices/wwan/nm-modem.c index ea0fa7aac..f825d9925 100644 --- a/src/core/devices/wwan/nm-modem.c +++ b/src/core/devices/wwan/nm-modem.c @@ -1065,7 +1065,7 @@ nm_modem_act_stage2_config(NMModem *self, NMDevice *device, NMDeviceStateReason else baud_override = 0; - priv->ppp_mgr = nm_ppp_mgr_start(&((const NMPppMgrConfig){ + priv->ppp_mgr = nm_ppp_mgr_start(&((const NMPppMgrConfig) { .netns = nm_device_get_netns(device), .parent_iface = priv->data_port, .callback = _ppp_mgr_callback, diff --git a/src/core/dhcp/nm-dhcp-client.c b/src/core/dhcp/nm-dhcp-client.c index 4ebc17543..66466e61b 100644 --- a/src/core/dhcp/nm-dhcp-client.c +++ b/src/core/dhcp/nm-dhcp-client.c @@ -321,7 +321,7 @@ _emit_notify_data(NMDhcpClient *self, const NMDhcpClientNotifyData *notify_data) #define _emit_notify(self, _notify_type, ...) \ _emit_notify_data( \ (self), \ - &((const NMDhcpClientNotifyData){.notify_type = (_notify_type), __VA_ARGS__})) + &((const NMDhcpClientNotifyData) {.notify_type = (_notify_type), __VA_ARGS__})) /*****************************************************************************/ @@ -669,7 +669,7 @@ _acd_check_lease(NMDhcpClient *self, NMOptionBool *out_acd_state) now_msec = nm_utils_get_monotonic_timestamp_msec(); g_array_append_val(priv->v4.acd.reglist, - ((AcdRegListData){ + ((AcdRegListData) { .l3cd = nm_l3_config_data_ref(priv->l3cd_next), .addr = addr, .expiry_msec = now_msec + ACD_REGLIST_GRACE_PERIOD_MSEC, @@ -1928,7 +1928,7 @@ set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *ps /* I know, this is technically not necessary. It just feels nicer to * explicitly initialize the respective union member. */ if (NM_IS_IPv4(priv->config.addr_family)) { - priv->v4 = (typeof(priv->v4)){ + priv->v4 = (typeof(priv->v4)) { .acd = { .addr = INADDR_ANY, @@ -1938,7 +1938,7 @@ set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *ps }, }; } else { - priv->v6 = (typeof(priv->v6)){ + priv->v6 = (typeof(priv->v6)) { .lladdr_timeout_source = NULL, }; } diff --git a/src/core/dhcp/nm-dhcp-nettools.c b/src/core/dhcp/nm-dhcp-nettools.c index b81ce77a7..9ac3b6f29 100644 --- a/src/core/dhcp/nm-dhcp-nettools.c +++ b/src/core/dhcp/nm-dhcp-nettools.c @@ -305,7 +305,7 @@ lease_parse_address(NMDhcpNettools *self /* for logging context only */, } nm_l3_config_data_add_address_4(l3cd, - &((const NMPlatformIP4Address){ + &((const NMPlatformIP4Address) { .address = a_address.s_addr, .peer_address = a_address.s_addr, .plen = a_plen, @@ -445,7 +445,7 @@ lease_parse_routes(NDhcp4ClientLease *lease, m = 0; nm_l3_config_data_add_route_4(l3cd, - &((const NMPlatformIP4Route){ + &((const NMPlatformIP4Route) { .rt_source = NM_IP_CONFIG_SOURCE_DHCP, .network = dest, .plen = plen, @@ -489,7 +489,7 @@ lease_parse_routes(NDhcp4ClientLease *lease, } nm_l3_config_data_add_route_4(l3cd, - &((const NMPlatformIP4Route){ + &((const NMPlatformIP4Route) { .rt_source = NM_IP_CONFIG_SOURCE_DHCP, .network = dest, .plen = plen, @@ -533,7 +533,7 @@ lease_parse_routes(NDhcp4ClientLease *lease, m = default_route_metric_offset++; nm_l3_config_data_add_route_4(l3cd, - &((const NMPlatformIP4Route){ + &((const NMPlatformIP4Route) { .rt_source = NM_IP_CONFIG_SOURCE_DHCP, .gateway = gateway, .pref_src = lease_address, diff --git a/src/core/dhcp/nm-dhcp-utils.c b/src/core/dhcp/nm-dhcp-utils.c index ca1c04829..d13439f14 100644 --- a/src/core/dhcp/nm-dhcp-utils.c +++ b/src/core/dhcp/nm-dhcp-utils.c @@ -92,7 +92,7 @@ ip4_process_dhcpcd_rfc3442_routes(const char *iface, nm_l3_config_data_add_route_4( l3cd, - &((const NMPlatformIP4Route){ + &((const NMPlatformIP4Route) { .rt_source = NM_IP_CONFIG_SOURCE_DHCP, .network = nm_ip4_addr_clear_host_address(rt_addr, rt_cidr), .plen = rt_cidr, @@ -147,7 +147,7 @@ process_dhclient_rfc3442_route(const char *const **p_octets, NMPlatformIP4Route if (inet_pton(AF_INET, next_hop, &tmp_addr) <= 0) return FALSE; - *route = (NMPlatformIP4Route){ + *route = (NMPlatformIP4Route) { .network = v_network, .plen = v_plen, .gateway = tmp_addr, @@ -316,7 +316,7 @@ process_classful_routes(const char *iface, // FIXME: ensure the IP address and route are sane - route = (NMPlatformIP4Route){ + route = (NMPlatformIP4Route) { .network = rt_addr, }; @@ -409,7 +409,7 @@ nm_dhcp_utils_ip4_config_from_options(NMDedupMultiIndex *multi_idx, now = nm_utils_get_monotonic_timestamp_sec(); - address = (NMPlatformIP4Address){ + address = (NMPlatformIP4Address) { .timestamp = now, }; @@ -655,7 +655,7 @@ nm_dhcp_utils_ip6_config_from_options(NMDedupMultiIndex *multi_idx, now = nm_utils_get_monotonic_timestamp_sec(); - address = (NMPlatformIP6Address){ + address = (NMPlatformIP6Address) { .plen = 128, .timestamp = now, }; diff --git a/src/core/dhcp/tests/test-dhcp-dhclient.c b/src/core/dhcp/tests/test-dhcp-dhclient.c index 0edcc296b..6a7b7185a 100644 --- a/src/core/dhcp/tests/test-dhcp-dhclient.c +++ b/src/core/dhcp/tests/test-dhcp-dhclient.c @@ -1023,7 +1023,7 @@ _check_duid_impl(const guint8 *duid_bin, g_assert_cmpint(contents_len, ==, strlen(contents)); } -#define _DUID(...) ((const guint8[]){__VA_ARGS__}) +#define _DUID(...) ((const guint8[]) {__VA_ARGS__}) #define _check_duid(duid, enforce_duid, old_content, new_content) \ _check_duid_impl((duid), sizeof(duid), (enforce_duid), (old_content), (new_content)) diff --git a/src/core/dhcp/tests/test-dhcp-utils.c b/src/core/dhcp/tests/test-dhcp-utils.c index 1c6d6302b..b81523e19 100644 --- a/src/core/dhcp/tests/test-dhcp-utils.c +++ b/src/core/dhcp/tests/test-dhcp-utils.c @@ -194,16 +194,16 @@ test_parse_search_list(void) guint8 *data; char **domains; - data = (guint8[]){0x05, 'l', 'o', 'c', 'a', 'l', 0x00}; + data = (guint8[]) {0x05, 'l', 'o', 'c', 'a', 'l', 0x00}; domains = nm_dhcp_lease_data_parse_search_list(data, 7, NULL, 0, 0); g_assert(domains); g_assert_cmpint(g_strv_length(domains), ==, 1); g_assert_cmpstr(domains[0], ==, "local"); g_strfreev(domains); - data = (guint8[]){0x04, 't', 'e', 's', 't', 0x07, 'e', 'x', 'a', 'm', 'p', 'l', - 'e', 0x03, 'c', 'o', 'm', 0x00, 0xc0, 0x05, 0x03, 'a', 'b', 'c', - 0xc0, 0x0d, 0x06, 'f', 'o', 'o', 'b', 'a', 'r', 0x00}; + data = (guint8[]) {0x04, 't', 'e', 's', 't', 0x07, 'e', 'x', 'a', 'm', 'p', 'l', + 'e', 0x03, 'c', 'o', 'm', 0x00, 0xc0, 0x05, 0x03, 'a', 'b', 'c', + 0xc0, 0x0d, 0x06, 'f', 'o', 'o', 'b', 'a', 'r', 0x00}; domains = nm_dhcp_lease_data_parse_search_list(data, 34, NULL, 0, 0); g_assert(domains); g_assert_cmpint(g_strv_length(domains), ==, 4); @@ -213,7 +213,7 @@ test_parse_search_list(void) g_assert_cmpstr(domains[3], ==, "foobar"); g_strfreev(domains); - data = (guint8[]){ + data = (guint8[]) { 0x40, 'b', 'a', @@ -222,7 +222,7 @@ test_parse_search_list(void) domains = nm_dhcp_lease_data_parse_search_list(data, 4, NULL, 0, 0); g_assert(!domains); - data = (guint8[]){ + data = (guint8[]) { 0x04, 'o', 'k', diff --git a/src/core/dns/nm-dns-dnsmasq.c b/src/core/dns/nm-dns-dnsmasq.c index 53e40f59c..43cff2e45 100644 --- a/src/core/dns/nm-dns-dnsmasq.c +++ b/src/core/dns/nm-dns-dnsmasq.c @@ -263,7 +263,7 @@ handle_kill: PIDFILE); gl_pid.kill_external_data = g_slice_new(GlPidKillExternalData); - *gl_pid.kill_external_data = (GlPidKillExternalData){ + *gl_pid.kill_external_data = (GlPidKillExternalData) { .shutdown_wait_handle = nm_shutdown_wait_obj_register_handle_full( g_strdup_printf("kill-external-dnsmasq-process-%" G_PID_FORMAT, pid), TRUE), @@ -623,7 +623,7 @@ _gl_pid_spawn(const char *dm_binary, nm_assert(notify); nm_assert(G_IS_CANCELLABLE(cancellable)); gl_pid.spawn_data = g_slice_new(GlPidSpawnAsyncData); - *gl_pid.spawn_data = (GlPidSpawnAsyncData){ + *gl_pid.spawn_data = (GlPidSpawnAsyncData) { .dm_binary = dm_binary, .notify = notify, .notify_user_data = notify_user_data, diff --git a/src/core/dns/nm-dns-manager.c b/src/core/dns/nm-dns-manager.c index 8f87fec1b..531e1873a 100644 --- a/src/core/dns/nm-dns-manager.c +++ b/src/core/dns/nm-dns-manager.c @@ -401,7 +401,7 @@ _dns_config_ip_data_new(NMDnsConfigData *data, nm_assert(ip_config_type != NM_DNS_IP_CONFIG_TYPE_REMOVED); ip_data = g_slice_new(NMDnsConfigIPData); - *ip_data = (NMDnsConfigIPData){ + *ip_data = (NMDnsConfigIPData) { .data = data, .source_tag = source_tag, .l3cd = nm_l3_config_data_ref_and_seal(l3cd), @@ -2108,7 +2108,7 @@ nm_dns_manager_set_ip_config(NMDnsManager *self, if (!data) { data = g_slice_new(NMDnsConfigData); - *data = (NMDnsConfigData){ + *data = (NMDnsConfigData) { .ifindex = ifindex, .self = self, .data_lst_head = C_LIST_INIT(data->data_lst_head), diff --git a/src/core/dns/nm-dns-systemd-resolved.c b/src/core/dns/nm-dns-systemd-resolved.c index 24c7c7745..49c1094de 100644 --- a/src/core/dns/nm-dns-systemd-resolved.c +++ b/src/core/dns/nm-dns-systemd-resolved.c @@ -248,7 +248,7 @@ _request_item_append(NMDnsSystemdResolved *self, RequestItem *request_item; request_item = g_slice_new(RequestItem); - *request_item = (RequestItem){ + *request_item = (RequestItem) { .ref_count = 1, .operation = operation, .argument = g_variant_ref_sink(argument), @@ -803,7 +803,7 @@ update(NMDnsPlugin *plugin, ic = g_hash_table_lookup(interfaces, GINT_TO_POINTER(ifindex)); if (!ic) { ic = g_slice_new(InterfaceConfig); - *ic = (InterfaceConfig){ + *ic = (InterfaceConfig) { .ifindex = ifindex, .ip_data_list = g_ptr_array_sized_new(4), }; @@ -855,7 +855,7 @@ update(NMDnsPlugin *plugin, InterfaceConfig ic; _LOGT("clear previously configured ifindex %d", ifindex); - ic = (InterfaceConfig){ + ic = (InterfaceConfig) { .ifindex = ifindex, .ip_data_list = NULL, }; @@ -1053,7 +1053,7 @@ _resolve_handle_call_cb(GObject *source, GAsyncResult *result, gpointer user_dat NMDnsSystemdResolvedAddressResult *n; n = nm_g_array_append_new(v_names, NMDnsSystemdResolvedAddressResult); - *n = (NMDnsSystemdResolvedAddressResult){ + *n = (NMDnsSystemdResolvedAddressResult) { .name = g_steal_pointer(&v_name), .ifindex = v_ifindex, }; @@ -1167,7 +1167,7 @@ nm_dns_systemd_resolved_resolve_address(NMDnsSystemdResolved nm_assert(callback); handle = g_slice_new(NMDnsSystemdResolvedResolveHandle); - *handle = (NMDnsSystemdResolvedResolveHandle){ + *handle = (NMDnsSystemdResolvedResolveHandle) { .self = self, .timeout_msec = timeout_msec, .callback_user_data = user_data, diff --git a/src/core/ndisc/nm-fake-ndisc.c b/src/core/ndisc/nm-fake-ndisc.c index f0b6dcf6a..b28588480 100644 --- a/src/core/ndisc/nm-fake-ndisc.c +++ b/src/core/ndisc/nm-fake-ndisc.c @@ -161,7 +161,7 @@ nm_fake_ndisc_add_prefix(NMFakeNDisc *self, g_assert(ra); prefix = nm_g_array_append_new(ra->prefixes, FakePrefix); - *prefix = (FakePrefix){ + *prefix = (FakePrefix) { .plen = plen, .expiry_msec = expiry_msec, .expiry_preferred_msec = expiry_preferred_msec, diff --git a/src/core/ndisc/nm-ndisc.c b/src/core/ndisc/nm-ndisc.c index 86b7da6e0..8a4eb8e43 100644 --- a/src/core/ndisc/nm-ndisc.c +++ b/src/core/ndisc/nm-ndisc.c @@ -130,7 +130,7 @@ nm_ndisc_data_to_l3cd(NMDedupMultiIndex *multi_idx, const NMNDiscAddress *ndisc_addr = &rdata->addresses[i]; NMPlatformIP6Address a; - a = (NMPlatformIP6Address){ + a = (NMPlatformIP6Address) { .ifindex = ifindex, .address = ndisc_addr->address, .plen = 64, @@ -151,7 +151,7 @@ nm_ndisc_data_to_l3cd(NMDedupMultiIndex *multi_idx, const NMNDiscRoute *ndisc_route = &rdata->routes[i]; NMPlatformIP6Route r; - r = (NMPlatformIP6Route){ + r = (NMPlatformIP6Route) { .ifindex = ifindex, .network = ndisc_route->network, .plen = ndisc_route->plen, @@ -836,7 +836,7 @@ nm_ndisc_add_dns_domain(NMNDisc *ndisc, const NMNDiscDNSDomain *new_item, gint64 return FALSE; item = nm_g_array_append_new(rdata->dns_domains, NMNDiscDNSDomain); - *item = (NMNDiscDNSDomain){ + *item = (NMNDiscDNSDomain) { .domain = g_strdup(new_item->domain), .expiry_msec = new_item->expiry_msec, }; @@ -1090,7 +1090,7 @@ nm_ndisc_set_config(NMNDisc *ndisc, const NML3ConfigData *l3cd) if (!lifetime) continue; - a = (NMNDiscAddress){ + a = (NMNDiscAddress) { .address = addr->address, .expiry_msec = _nm_ndisc_lifetime_to_expiry(NM_NDISC_EXPIRY_BASE_TIMESTAMP, lifetime), .expiry_preferred_msec = @@ -1112,7 +1112,7 @@ nm_ndisc_set_config(NMNDisc *ndisc, const NML3ConfigData *l3cd) if (!nm_utils_dnsname_parse_assert(AF_INET6, strvarr[i], NULL, &a, NULL)) continue; - n = (NMNDiscDNSServer){ + n = (NMNDiscDNSServer) { .address = a, .expiry_msec = _nm_ndisc_lifetime_to_expiry(NM_NDISC_EXPIRY_BASE_TIMESTAMP, NM_NDISC_ROUTER_LIFETIME), @@ -1128,7 +1128,7 @@ nm_ndisc_set_config(NMNDisc *ndisc, const NML3ConfigData *l3cd) for (i = 0; i < len; i++) { NMNDiscDNSDomain n; - n = (NMNDiscDNSDomain){ + n = (NMNDiscDNSDomain) { .domain = (char *) strvarr[i], .expiry_msec = _nm_ndisc_lifetime_to_expiry(NM_NDISC_EXPIRY_BASE_TIMESTAMP, NM_NDISC_ROUTER_LIFETIME), diff --git a/src/core/ndisc/nm-ndisc.h b/src/core/ndisc/nm-ndisc.h index b8f8b06ee..8f1a12a26 100644 --- a/src/core/ndisc/nm-ndisc.h +++ b/src/core/ndisc/nm-ndisc.h @@ -40,7 +40,7 @@ typedef enum { const char *nm_ndisc_dhcp_level_to_string(NMNDiscDHCPLevel level); -#define NM_NDISC_INFINITY_U32 ((uint32_t) - 1) +#define NM_NDISC_INFINITY_U32 ((uint32_t) -1) /* It's important that this is G_MAXINT64, so that we can meaningfully do * MIN(e1, e2) to find the minimum expiry time (and properly handle if any diff --git a/src/core/ndisc/tests/test-ndisc-linux.c b/src/core/ndisc/tests/test-ndisc-linux.c index 66c7e1577..e41841843 100644 --- a/src/core/ndisc/tests/test-ndisc-linux.c +++ b/src/core/ndisc/tests/test-ndisc-linux.c @@ -62,7 +62,7 @@ main(int argc, char **argv) l3cfg = nm_netns_l3cfg_acquire(NM_NETNS_GET, ifindex); - config = (NMNDiscConfig){ + config = (NMNDiscConfig) { .l3cfg = l3cfg, .ifname = nm_l3cfg_get_ifname(l3cfg, TRUE), .stable_type = NM_UTILS_STABLE_TYPE_UUID, diff --git a/src/core/nm-audit-manager.c b/src/core/nm-audit-manager.c index 7cf529460..70d5d88b7 100644 --- a/src/core/nm-audit-manager.c +++ b/src/core/nm-audit-manager.c @@ -90,7 +90,7 @@ _audit_field_init_string(AuditField *field, gboolean need_encoding, AuditBackend backends) { - *field = (AuditField){ + *field = (AuditField) { .name = name, .need_encoding = need_encoding, .backends = backends, @@ -102,7 +102,7 @@ _audit_field_init_string(AuditField *field, static void _audit_field_init_uint64(AuditField *field, const char *name, guint64 val, AuditBackend backends) { - *field = (AuditField){ + *field = (AuditField) { .name = name, .backends = backends, .value_type = NM_VALUE_TYPE_UINT64, diff --git a/src/core/nm-auth-manager.c b/src/core/nm-auth-manager.c index 242f00554..65357a9f3 100644 --- a/src/core/nm-auth-manager.c +++ b/src/core/nm-auth-manager.c @@ -327,7 +327,7 @@ nm_auth_manager_check_authorization(NMAuthManager *self : POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE; call_id = g_slice_new(NMAuthManagerCallId); - *call_id = (NMAuthManagerCallId){ + *call_id = (NMAuthManagerCallId) { .self = g_object_ref(self), .callback = callback, .user_data = user_data, diff --git a/src/core/nm-auth-utils.c b/src/core/nm-auth-utils.c index aa2547b3e..389004aa0 100644 --- a/src/core/nm-auth-utils.c +++ b/src/core/nm-auth-utils.c @@ -293,7 +293,7 @@ nm_auth_chain_set_data_unsafe(NMAuthChain *self, } chain_data = &self->data_arr[self->data_len++]; - *chain_data = (ChainData){ + *chain_data = (ChainData) { .tag = tag, .data = data, .destroy = data_destroy, @@ -445,7 +445,7 @@ nm_auth_chain_add_call_unsafe(NMAuthChain *self, const char *permission, gboolea } call = g_slice_new(AuthCall); - *call = (AuthCall){ + *call = (AuthCall) { .chain = self, .call_id = NULL, .result = NM_AUTH_CALL_RESULT_UNKNOWN, @@ -520,7 +520,7 @@ nm_auth_chain_new_subject(NMAuthSubject *subject, nm_assert(done_func); self = g_slice_new(NMAuthChain); - *self = (NMAuthChain){ + *self = (NMAuthChain) { .done_func = done_func, .user_data = user_data, .context = nm_g_object_ref(context), diff --git a/src/core/nm-bond-manager.c b/src/core/nm-bond-manager.c index 71cd4ee73..c33e043d1 100644 --- a/src/core/nm-bond-manager.c +++ b/src/core/nm-bond-manager.c @@ -880,7 +880,7 @@ nm_bond_manager_new(struct _NMPlatform *platform, nm_assert(ifindex > 0); self = g_slice_new(NMBondManager); - *self = (NMBondManager){ + *self = (NMBondManager) { .platform = g_object_ref(platform), .ifindex = ifindex, .reg_state = REGISTRATION_STATE_NONE, diff --git a/src/core/nm-config-data.c b/src/core/nm-config-data.c index 0a73695a1..914e66b04 100644 --- a/src/core/nm-config-data.c +++ b/src/core/nm-config-data.c @@ -399,7 +399,7 @@ nm_config_data_get_ignore_carrier_for_port(const NMConfigData *self, if (!nm_utils_ifname_valid_kernel(controller, NULL)) goto out_default; - match_data = (NMMatchSpecDeviceData){ + match_data = (NMMatchSpecDeviceData) { .interface_name = controller, .device_type = port_type, }; @@ -1879,7 +1879,7 @@ _match_section_info_init(MatchSectionInfo *connection_info, if (!value) continue; - vals[j++] = (NMUtilsNamedValue){ + vals[j++] = (NMUtilsNamedValue) { .name = g_steal_pointer(&key), .value_str = value, }; diff --git a/src/core/nm-connectivity.c b/src/core/nm-connectivity.c index 65eec36d6..22e6c0d5e 100644 --- a/src/core/nm-connectivity.c +++ b/src/core/nm-connectivity.c @@ -497,7 +497,7 @@ multi_socket_cb(CURL *e_handle, curl_socket_t fd, int what, void *userdata, void if (!fdp) { fdp = g_slice_new(ConCurlSockData); - *fdp = (ConCurlSockData){ + *fdp = (ConCurlSockData) { .cb_data = cb_data, }; curl_multi_assign(cb_data->concheck.curl_mhandle, fd, fdp); @@ -1291,7 +1291,7 @@ update_config(NMConnectivity *self, NMConfigData *config_data) } _con_config_unref(priv->con_config); priv->con_config = g_slice_new(ConConfig); - *priv->con_config = (ConConfig){ + *priv->con_config = (ConConfig) { .ref_count = 1, .uri = g_strdup(new_uri), .response = g_strdup(new_response), diff --git a/src/core/nm-core-utils.c b/src/core/nm-core-utils.c index 6aa38be28..2cae2d772 100644 --- a/src/core/nm-core-utils.c +++ b/src/core/nm-core-utils.c @@ -1434,7 +1434,7 @@ nm_match_spec_device(const GSList *specs, const NMMatchSpecDeviceData *data) if (!specs) return NM_MATCH_SPEC_NO_MATCH; - match_data = (MatchSpecDeviceData){ + match_data = (MatchSpecDeviceData) { .data = data, .device_type = nm_str_not_empty(data->device_type), .driver = nm_str_not_empty(data->driver), @@ -3011,7 +3011,7 @@ nmtst_utils_host_id_push(const guint8 *host_id, h = nm_g_array_append_new(nmtst_host_id_stack, HostIdData); - *h = (HostIdData){ + *h = (HostIdData) { .host_id = nm_memdup(host_id, host_id_len), .host_id_len = host_id_len, .timestamp_nsec = p_timestamp_nsec ? *p_timestamp_nsec : 0, @@ -3585,11 +3585,11 @@ _is_reserved_ipv6_iid(const guint8 *iid) /* 0200:5EFF:FE00:0000 - 0200:5EFF:FE00:5212 (Reserved IPv6 Interface Identifiers corresponding to the IANA Ethernet Block [RFC4291]) * 0200:5EFF:FE00:5213 (Proxy Mobile IPv6 [RFC6543]) * 0200:5EFF:FE00:5214 - 0200:5EFF:FEFF:FFFF (Reserved IPv6 Interface Identifiers corresponding to the IANA Ethernet Block [RFC4291]) */ - if (memcmp(iid, (const guint8[]){0x02, 0x00, 0x5E, 0xFF, 0xFE}, 5) == 0) + if (memcmp(iid, (const guint8[]) {0x02, 0x00, 0x5E, 0xFF, 0xFE}, 5) == 0) return TRUE; /* FDFF:FFFF:FFFF:FF80 - FDFF:FFFF:FFFF:FFFF (Reserved Subnet Anycast Addresses [RFC2526]) */ - if (memcmp(iid, (const guint8[]){0xFD, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, 7) == 0) { + if (memcmp(iid, (const guint8[]) {0xFD, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, 7) == 0) { if (iid[7] & 0x80) return TRUE; } @@ -5255,7 +5255,7 @@ nm_utils_spawn_helper(const char *const *args, nm_assert(args && args[0]); info = g_new(HelperInfo, 1); - *info = (HelperInfo){ + *info = (HelperInfo) { .task = nm_g_task_new(NULL, cancellable, nm_utils_spawn_helper, callback, cb_data), }; diff --git a/src/core/nm-dbus-manager.c b/src/core/nm-dbus-manager.c index 7e6757f01..a89c7040c 100644 --- a/src/core/nm-dbus-manager.c +++ b/src/core/nm-dbus-manager.c @@ -549,7 +549,7 @@ _get_caller_info_ensure(NMDBusManager *self, gsize l = strlen(sender) + 1; caller_info = g_malloc(sizeof(CallerInfo) + l); - *caller_info = (CallerInfo){ + *caller_info = (CallerInfo) { .uid_checked_at = -CALLER_INFO_MAX_AGE, .pid_checked_at = -CALLER_INFO_MAX_AGE, }; diff --git a/src/core/nm-dbus-object.h b/src/core/nm-dbus-object.h index 2a0ff0eec..f9427f24e 100644 --- a/src/core/nm-dbus-object.h +++ b/src/core/nm-dbus-object.h @@ -29,7 +29,7 @@ typedef struct { #define NM_DBUS_EXPORT_PATH_STATIC(basepath) \ ({ \ - ((NMDBusExportPath){ \ + ((NMDBusExportPath) { \ .path = "" basepath "", \ }); \ }) @@ -37,7 +37,7 @@ typedef struct { #define NM_DBUS_EXPORT_PATH_NUMBERED(basepath) \ ({ \ static long long unsigned _int_counter = 0; \ - ((NMDBusExportPath){ \ + ((NMDBusExportPath) { \ .path = "" basepath "/%llu", \ .int_counter = &_int_counter, \ }); \ @@ -81,7 +81,7 @@ struct _NMDBusObject { }; #define NM_DEFINE_DBUS_INTERFACE_INFO(...) \ - ((NMDBusInterfaceInfo *) (&((const NMDBusInterfaceInfo){__VA_ARGS__}))) + ((NMDBusInterfaceInfo *) (&((const NMDBusInterfaceInfo) {__VA_ARGS__}))) typedef struct { GObjectClass parent; diff --git a/src/core/nm-dbus-utils.h b/src/core/nm-dbus-utils.h index 237b37d85..015ebb1e2 100644 --- a/src/core/nm-dbus-utils.h +++ b/src/core/nm-dbus-utils.h @@ -50,10 +50,10 @@ extern const GDBusAnnotationInfo _nm_gdbus_annotation_info_deprecated; #define NM_GDBUS_ANNOTATION_INFO_DEPRECATED() \ ((GDBusAnnotationInfo *) &_nm_gdbus_annotation_info_deprecated) -#define NM_DEFINE_DBUS_ANNOTATION_INFO(a_key, a_value) \ - ((GDBusAnnotationInfo *) &((const GDBusAnnotationInfo){ \ - .key = (a_key), \ - .value = (a_value), \ +#define NM_DEFINE_DBUS_ANNOTATION_INFO(a_key, a_value) \ + ((GDBusAnnotationInfo *) &((const GDBusAnnotationInfo) { \ + .key = (a_key), \ + .value = (a_value), \ })) extern const GDBusAnnotationInfo *const _nm_gdbus_annotation_info_list_deprecated[]; @@ -67,10 +67,10 @@ extern const GDBusAnnotationInfo *const _nm_gdbus_annotation_info_list_deprecate ((GDBusAnnotationInfo **) _nm_gdbus_annotation_info_list_deprecated) #define NM_DEFINE_DBUS_ANNOTATION_INFOS(...) \ - ((GDBusAnnotationInfo **) ((const GDBusAnnotationInfo *const[]){__VA_ARGS__, NULL})) + ((GDBusAnnotationInfo **) ((const GDBusAnnotationInfo *const[]) {__VA_ARGS__, NULL})) #define NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(m_name, m_signature, m_property_name, ...) \ - ((GDBusPropertyInfo *) &((const struct _NMDBusPropertyInfoExtendedBase){ \ + ((GDBusPropertyInfo *) &((const struct _NMDBusPropertyInfoExtendedBase) { \ ._parent = {.ref_count = -1, \ .name = m_name, \ .signature = m_signature, \ @@ -79,25 +79,25 @@ extern const GDBusAnnotationInfo *const _nm_gdbus_annotation_info_list_deprecate .property_name = m_property_name, \ })) -#define NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READWRITABLE(m_name, \ - m_signature, \ - m_property_name, \ - m_permission, \ - m_audit_op, \ - ...) \ - ((GDBusPropertyInfo *) &((const struct _NMDBusPropertyInfoExtendedReadWritable){ \ - ._base = \ - { \ - ._parent = {.ref_count = -1, \ - .name = m_name, \ - .signature = m_signature, \ - .flags = G_DBUS_PROPERTY_INFO_FLAGS_READABLE \ - | G_DBUS_PROPERTY_INFO_FLAGS_WRITABLE, \ - __VA_ARGS__}, \ - .property_name = m_property_name, \ - }, \ - .permission = m_permission, \ - .audit_op = m_audit_op, \ +#define NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READWRITABLE(m_name, \ + m_signature, \ + m_property_name, \ + m_permission, \ + m_audit_op, \ + ...) \ + ((GDBusPropertyInfo *) &((const struct _NMDBusPropertyInfoExtendedReadWritable) { \ + ._base = \ + { \ + ._parent = {.ref_count = -1, \ + .name = m_name, \ + .signature = m_signature, \ + .flags = G_DBUS_PROPERTY_INFO_FLAGS_READABLE \ + | G_DBUS_PROPERTY_INFO_FLAGS_WRITABLE, \ + __VA_ARGS__}, \ + .property_name = m_property_name, \ + }, \ + .permission = m_permission, \ + .audit_op = m_audit_op, \ })) typedef struct _NMDBusMethodInfoExtended { @@ -113,7 +113,7 @@ typedef struct _NMDBusMethodInfoExtended { } NMDBusMethodInfoExtended; #define NM_DEFINE_DBUS_METHOD_INFO_EXTENDED(parent_, ...) \ - ((GDBusMethodInfo *) (&((const NMDBusMethodInfoExtended){.parent = parent_, __VA_ARGS__}))) + ((GDBusMethodInfo *) (&((const NMDBusMethodInfoExtended) {.parent = parent_, __VA_ARGS__}))) typedef struct _NMDBusInterfaceInfoExtended { GDBusInterfaceInfo parent; diff --git a/src/core/nm-firewall-utils.c b/src/core/nm-firewall-utils.c index 45dab0930..b6b2b0d72 100644 --- a/src/core/nm-firewall-utils.c +++ b/src/core/nm-firewall-utils.c @@ -566,7 +566,7 @@ nm_firewall_nft_call(GBytes *stdin_buf, gs_free char *ss1 = NULL; call_data = g_slice_new(FwNftCallData); - *call_data = (FwNftCallData){ + *call_data = (FwNftCallData) { .task = nm_g_task_new(NULL, cancellable, nm_firewall_nft_call, callback, callback_user_data), .subprocess = NULL, @@ -661,7 +661,7 @@ _fw_nft_call_sync(GBytes *stdin_buf, GError **error) nm_auto_pop_and_unref_gmaincontext GMainContext *main_context = nm_g_main_context_push_thread_default(g_main_context_new()); nm_auto_unref_gmainloop GMainLoop *main_loop = g_main_loop_new(main_context, FALSE); - FwNftCallSyncData data = (FwNftCallSyncData){ + FwNftCallSyncData data = (FwNftCallSyncData) { .loop = main_loop, .error = error, }; @@ -964,7 +964,7 @@ nm_firewall_config_new_shared(const char *ip_iface, in_addr_t addr, guint8 plen) nm_assert(plen <= 32); self = g_slice_new(NMFirewallConfig); - *self = (NMFirewallConfig){ + *self = (NMFirewallConfig) { .ip_iface = g_strdup(ip_iface), .addr = addr, .plen = plen, diff --git a/src/core/nm-l3-config-data.c b/src/core/nm-l3-config-data.c index b82b2864b..490817246 100644 --- a/src/core/nm-l3-config-data.c +++ b/src/core/nm-l3-config-data.c @@ -678,7 +678,7 @@ nm_l3_config_data_new(NMDedupMultiIndex *multi_idx, int ifindex, NMIPConfigSourc || (source >= NM_IP_CONFIG_SOURCE_KERNEL && source <= NM_IP_CONFIG_SOURCE_USER)); self = g_slice_new(NML3ConfigData); - *self = (NML3ConfigData){ + *self = (NML3ConfigData) { .ref_count = 1, .ifindex = ifindex, .multi_idx = nm_dedup_multi_index_ref(multi_idx), @@ -2555,7 +2555,7 @@ nm_l3_config_data_get_blacklisted_ip4_routes(const NML3ConfigData *self, gboolea continue; } - rx.r4 = (NMPlatformIP4Route){ + rx.r4 = (NMPlatformIP4Route) { .ifindex = self->ifindex, .rt_source = NM_IP_CONFIG_SOURCE_KERNEL, .network = network_4, @@ -2737,7 +2737,7 @@ nm_l3_config_data_add_dependent_device_routes(NML3ConfigData *self, plen = addr_src->a6.plen; } - rx.r6 = (NMPlatformIP6Route){ + rx.r6 = (NMPlatformIP6Route) { .ifindex = self->ifindex, .rt_source = NM_IP_CONFIG_SOURCE_KERNEL, .table_coerced = nm_platform_route_table_coerce(route_table), @@ -2810,14 +2810,14 @@ _init_from_connection_ip(NML3ConfigData *self, int addr_family, NMConnection *co NMPlatformIPXRoute r; if (IS_IPv4) { - r.r4 = (NMPlatformIP4Route){ + r.r4 = (NMPlatformIP4Route) { .rt_source = NM_IP_CONFIG_SOURCE_USER, .gateway = gateway_bin.addr4, .table_any = TRUE, .metric_any = TRUE, }; } else { - r.r6 = (NMPlatformIP6Route){ + r.r6 = (NMPlatformIP6Route) { .rt_source = NM_IP_CONFIG_SOURCE_USER, .gateway = gateway_bin.addr6, .table_any = TRUE, @@ -2840,7 +2840,7 @@ _init_from_connection_ip(NML3ConfigData *self, int addr_family, NMConnection *co nm_ip_address_get_address_binary(s_addr, &addr_bin); if (IS_IPv4) { - a.a4 = (NMPlatformIP4Address){ + a.a4 = (NMPlatformIP4Address) { .address = addr_bin.addr4, .peer_address = addr_bin.addr4, .plen = nm_ip_address_get_prefix(s_addr), @@ -2854,7 +2854,7 @@ _init_from_connection_ip(NML3ConfigData *self, int addr_family, NMConnection *co nm_assert(a.a4.plen <= 32); } else { - a.a6 = (NMPlatformIP6Address){ + a.a6 = (NMPlatformIP6Address) { .address = addr_bin.addr6, .plen = nm_ip_address_get_prefix(s_addr), .lifetime = NM_PLATFORM_LIFETIME_PERMANENT, @@ -2899,7 +2899,7 @@ _init_from_connection_ip(NML3ConfigData *self, int addr_family, NMConnection *co nm_ip_addr_clear_host_address(addr_family, &network_bin, &network_bin, plen); if (IS_IPv4) { - r.r4 = (NMPlatformIP4Route){ + r.r4 = (NMPlatformIP4Route) { .network = network_bin.addr4, .plen = plen, .gateway = next_hop_bin.addr4, @@ -2909,7 +2909,7 @@ _init_from_connection_ip(NML3ConfigData *self, int addr_family, NMConnection *co }; nm_assert(r.r4.plen <= 32); } else { - r.r6 = (NMPlatformIP6Route){ + r.r6 = (NMPlatformIP6Route) { .network = network_bin.addr6, .plen = plen, .gateway = next_hop_bin.addr6, diff --git a/src/core/nm-l3-ipv4ll.c b/src/core/nm-l3-ipv4ll.c index 49477b66b..3c003c29f 100644 --- a/src/core/nm-l3-ipv4ll.c +++ b/src/core/nm-l3-ipv4ll.c @@ -191,7 +191,7 @@ _ipv4ll_emit_signal_notify(NML3IPv4LL *self) self->notify_on_idle = FALSE; notify_data.notify_type = NM_L3_CONFIG_NOTIFY_TYPE_IPV4LL_EVENT; - notify_data.ipv4ll_event = (typeof(notify_data.ipv4ll_event)){ + notify_data.ipv4ll_event = (typeof(notify_data.ipv4ll_event)) { .ipv4ll = self, }; _nm_l3cfg_emit_signal_notify(self->l3cfg, ¬ify_data); @@ -231,7 +231,7 @@ _registration_update(NML3IPv4LL *self, if (!reg) { reg = g_slice_new(NML3IPv4LLRegistration); - *reg = (NML3IPv4LLRegistration){ + *reg = (NML3IPv4LLRegistration) { .self = self, .timeout_msec = timeout_msec, }; @@ -951,7 +951,7 @@ nm_l3_ipv4ll_new(NML3Cfg *l3cfg) g_return_val_if_fail(NM_IS_L3CFG(l3cfg), NULL); self = g_slice_new(NML3IPv4LL); - *self = (NML3IPv4LL){ + *self = (NML3IPv4LL) { .l3cfg = g_object_ref(l3cfg), .ref_count = 1, .reg_lst_head = C_LIST_INIT(self->reg_lst_head), diff --git a/src/core/nm-l3-ipv6ll.c b/src/core/nm-l3-ipv6ll.c index 38aa98fc9..e5f3b85ef 100644 --- a/src/core/nm-l3-ipv6ll.c +++ b/src/core/nm-l3-ipv6ll.c @@ -646,7 +646,7 @@ _nm_l3_ipv6ll_new(NML3Cfg *l3cfg, NULL); self = g_slice_new(NML3IPv6LL); - *self = (NML3IPv6LL){ + *self = (NML3IPv6LL) { .l3cfg = g_object_ref(l3cfg), .notify_fcn = notify_fcn, .user_data = user_data, diff --git a/src/core/nm-l3cfg.c b/src/core/nm-l3cfg.c index 2c9779914..973f345b4 100644 --- a/src/core/nm-l3cfg.c +++ b/src/core/nm-l3cfg.c @@ -676,7 +676,7 @@ _nm_l3cfg_emit_signal_notify_l3cd_changed(NML3Cfg *self, NML3ConfigNotifyData notify_data; notify_data.notify_type = NM_L3_CONFIG_NOTIFY_TYPE_L3CD_CHANGED; - notify_data.l3cd_changed = (typeof(notify_data.l3cd_changed)){ + notify_data.l3cd_changed = (typeof(notify_data.l3cd_changed)) { .l3cd_old = l3cd_old, .l3cd_new = l3cd_new, .commited = commited, @@ -770,7 +770,7 @@ _nm_n_acd_data_probe_new(NML3Cfg *self, in_addr_t addr, guint32 timeout_msec, gp if (r) return NULL; - n_acd_probe_config_set_ip(probe_config, (struct in_addr){addr}); + n_acd_probe_config_set_ip(probe_config, (struct in_addr) {addr}); n_acd_probe_config_set_timeout(probe_config, timeout_msec); r = n_acd_probe(self->priv.p->nacd, &probe, probe_config); @@ -855,7 +855,7 @@ _obj_state_data_new(const NMPObject *obj, const NMPObject *plobj) ObjStateData *obj_state; obj_state = g_slice_new(ObjStateData); - *obj_state = (ObjStateData){ + *obj_state = (ObjStateData) { .obj = nmp_object_ref(obj), .os_plobj = nmp_object_ref(plobj), .os_was_in_platform = !!plobj, @@ -1581,7 +1581,7 @@ _nm_l3cfg_notify_platform_change_on_idle(NML3Cfg *self, guint32 obj_type_flags) _load_link(self, FALSE); notify_data.notify_type = NM_L3_CONFIG_NOTIFY_TYPE_PLATFORM_CHANGE_ON_IDLE; - notify_data.platform_change_on_idle = (typeof(notify_data.platform_change_on_idle)){ + notify_data.platform_change_on_idle = (typeof(notify_data.platform_change_on_idle)) { .obj_type_flags = obj_type_flags, }; _nm_l3cfg_emit_signal_notify(self, ¬ify_data); @@ -1625,7 +1625,7 @@ _nm_l3cfg_notify_platform_change(NML3Cfg *self, } notify_data.notify_type = NM_L3_CONFIG_NOTIFY_TYPE_PLATFORM_CHANGE; - notify_data.platform_change = (typeof(notify_data.platform_change)){ + notify_data.platform_change = (typeof(notify_data.platform_change)) { .obj = obj, .change_type = change_type, }; @@ -2161,7 +2161,7 @@ _l3_acd_data_add(NML3Cfg *self, } acd_data = g_slice_new(AcdData); - *acd_data = (AcdData){ + *acd_data = (AcdData) { .info = { .l3cfg = self, @@ -2193,7 +2193,7 @@ _l3_acd_data_add(NML3Cfg *self, } acd_track = (NML3AcdAddrTrackInfo *) &acd_data->info.track_infos[acd_data->info.n_track_infos++]; - *acd_track = (NML3AcdAddrTrackInfo){ + *acd_track = (NML3AcdAddrTrackInfo) { .l3cd = nm_l3_config_data_ref(l3cd), .obj = nmp_object_ref(obj), .tag = tag, @@ -2348,7 +2348,7 @@ _nm_l3cfg_emit_signal_notify_acd_event(NML3Cfg *self, AcdData *acd_data) nm_assert(acd_data->info.n_track_infos > 0); notify_data.notify_type = NM_L3_CONFIG_NOTIFY_TYPE_ACD_EVENT; - notify_data.acd_event = (typeof(notify_data.acd_event)){ + notify_data.acd_event = (typeof(notify_data.acd_event)) { .info = acd_data->info, }; @@ -3601,7 +3601,7 @@ nm_l3cfg_add_config(NML3Cfg *self, if (idx < 0) { l3_config_data = nm_g_array_append_new(self->priv.p->l3_config_datas, L3ConfigData); - *l3_config_data = (L3ConfigData){ + *l3_config_data = (L3ConfigData) { .tag_confdata = tag, .l3cd = nm_l3_config_data_ref_and_seal(l3cd), .config_flags = config_flags, @@ -4021,7 +4021,7 @@ _l3cfg_update_combined_config(NML3Cfg *self, nm_platform_ip6_address_init_loopback(&ax.a6)); } - rx.r4 = (NMPlatformIP4Route){ + rx.r4 = (NMPlatformIP4Route) { .ifindex = NM_LOOPBACK_IFINDEX, .rt_source = NM_IP_CONFIG_SOURCE_KERNEL, .network = NM_IPV4LO_ADDR1, diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c index 0d6c1e2fb..ca972e8b8 100644 --- a/src/core/nm-manager.c +++ b/src/core/nm-manager.c @@ -1635,7 +1635,7 @@ _devcon_lookup_data(NMManager *self, return NULL; data = g_slice_new(DevConData); - *data = (DevConData){ + *data = (DevConData) { .device = device, .sett_conn = sett_conn, .autoconnect = @@ -3452,7 +3452,7 @@ get_existing_connection(NMManager *self, NMDevice *device, gboolean *out_generat if (connection) { NMConnection *con = nm_settings_connection_get_connection(connection_checked); - if (nm_utils_match_connection((NMConnection *[]){con, NULL}, + if (nm_utils_match_connection((NMConnection *[]) {con, NULL}, connection, TRUE, nm_device_has_carrier(device), @@ -5344,7 +5344,7 @@ find_ports(NMManager *manager, } nm_assert(n_ports < n_all_connections); - ports[n_ports++] = (PortConnectionInfo){ + ports[n_ports++] = (PortConnectionInfo) { .connection = candidate, .device = port_device, }; @@ -8928,12 +8928,12 @@ nm_manager_init(NMManager *self) priv->capabilities = g_array_new(FALSE, FALSE, sizeof(guint32)); - priv->radio_states[NM_RFKILL_TYPE_WLAN] = (RfkillRadioState){ + priv->radio_states[NM_RFKILL_TYPE_WLAN] = (RfkillRadioState) { .user_enabled = TRUE, .sw_enabled = FALSE, .hw_enabled = TRUE, }; - priv->radio_states[NM_RFKILL_TYPE_WWAN] = (RfkillRadioState){ + priv->radio_states[NM_RFKILL_TYPE_WWAN] = (RfkillRadioState) { .user_enabled = TRUE, .sw_enabled = FALSE, .hw_enabled = TRUE, diff --git a/src/core/nm-netns.c b/src/core/nm-netns.c index ed33d3367..420d01e4b 100644 --- a/src/core/nm-netns.c +++ b/src/core/nm-netns.c @@ -274,7 +274,7 @@ _ecmp_track_init_merged_obj(EcmpTrackEcmpid *track_ecmpid, const NMPObject **out const NMPlatformIP4Route *r = NMP_OBJECT_CAST_IP4_ROUTE(track_obj->obj); NMPlatformIP4RtNextHop *nh = (gpointer) &obj_new->_ip4_route.extra_nexthops[i - 1]; - *nh = (NMPlatformIP4RtNextHop){ + *nh = (NMPlatformIP4RtNextHop) { .ifindex = r->ifindex, .gateway = r->gateway, .weight = r->weight, @@ -620,7 +620,7 @@ nm_netns_shared_ip_reserve(NMNetns *self) } handle = g_slice_new(NMNetnsSharedIPHandle); - *handle = (NMNetnsSharedIPHandle){ + *handle = (NMNetnsSharedIPHandle) { .addr = addr, ._ref_count = 1, ._self = self, @@ -717,7 +717,7 @@ nm_netns_ip_route_ecmp_register(NMNetns *self, NML3Cfg *l3cfg, const NMPObject * track_ecmpid = g_hash_table_lookup(priv->ecmp_track_by_ecmpid, &obj); if (!track_ecmpid) { track_ecmpid = g_slice_new(EcmpTrackEcmpid); - *track_ecmpid = (EcmpTrackEcmpid){ + *track_ecmpid = (EcmpTrackEcmpid) { .representative_obj = nmp_object_ref(obj), .merged_obj = NULL, .ecmpid_lst_head = C_LIST_INIT(track_ecmpid->ecmpid_lst_head), @@ -728,7 +728,7 @@ nm_netns_ip_route_ecmp_register(NMNetns *self, NML3Cfg *l3cfg, const NMPObject * track_ecmpid->needs_update = TRUE; track_obj = g_slice_new(EcmpTrackObj); - *track_obj = (EcmpTrackObj){ + *track_obj = (EcmpTrackObj) { .obj = nmp_object_ref(obj), .l3cfg = l3cfg, .parent_track_ecmpid = track_ecmpid, @@ -1031,7 +1031,7 @@ _watcher_handle_init(NMNetnsWatcherHandle *handle, nm_assert(handle); nm_assert(NM_NETNS_WATCHER_TYPE_VALID(watcher_type)); - *handle = (NMNetnsWatcherHandle){ + *handle = (NMNetnsWatcherHandle) { .watcher_type = watcher_type, .tag = tag, .watcher_tag_lst = C_LIST_INIT(handle->watcher_tag_lst), @@ -1194,7 +1194,7 @@ _watcher_register_handle(NMNetns *self, NMNetnsWatcherHandle *handle) data = _watcher_ip_data_lookup_addr(self, &handle->watcher_data.ip_addr.addr); if (!data) { data = g_slice_new(WatcherDataIPAddr); - *data = (WatcherDataIPAddr){ + *data = (WatcherDataIPAddr) { .addr = handle->watcher_data.ip_addr.addr, .watcher_ip_addr_lst_head = C_LIST_INIT(data->watcher_ip_addr_lst_head), }; @@ -1288,7 +1288,7 @@ nm_netns_watcher_add(NMNetns *self, if (!watcher_by_tag) { watcher_by_tag = g_slice_new(WatcherByTag); - *watcher_by_tag = (WatcherByTag){ + *watcher_by_tag = (WatcherByTag) { .tag = tag, .watcher_by_tag_lst_head = C_LIST_INIT(watcher_by_tag->watcher_by_tag_lst_head), }; diff --git a/src/core/nm-pacrunner-manager.c b/src/core/nm-pacrunner-manager.c index 80db755fd..12c3c9a18 100644 --- a/src/core/nm-pacrunner-manager.c +++ b/src/core/nm-pacrunner-manager.c @@ -365,7 +365,7 @@ nm_pacrunner_manager_add(NMPacrunnerManager *self, const char *iface, const NML3 priv = NM_PACRUNNER_MANAGER_GET_PRIVATE(self); conf_id = g_slice_new(NMPacrunnerConfId); - *conf_id = (NMPacrunnerConfId){ + *conf_id = (NMPacrunnerConfId) { .log_id = ++priv->log_id_counter, .refcount = 1, .self = g_object_ref(self), diff --git a/src/core/nm-policy.c b/src/core/nm-policy.c index 05d4d0064..a8d8e4068 100644 --- a/src/core/nm-policy.c +++ b/src/core/nm-policy.c @@ -824,7 +824,7 @@ build_device_hostname_infos(NMPolicy *self) array = g_array_sized_new(FALSE, FALSE, sizeof(DeviceHostnameInfo), 4); info = nm_g_array_append_new(array, DeviceHostnameInfo); - *info = (DeviceHostnameInfo){ + *info = (DeviceHostnameInfo) { .device = device, .priority = device_get_hostname_priority(device), .from_dhcp = diff --git a/src/core/nm-rfkill-manager.c b/src/core/nm-rfkill-manager.c index aea5df11f..c8efc3763 100644 --- a/src/core/nm-rfkill-manager.c +++ b/src/core/nm-rfkill-manager.c @@ -146,7 +146,7 @@ killswitch_new(struct udev_device *device, NMRfkillType rtype) platform = TRUE; ks = g_slice_new(Killswitch); - *ks = (Killswitch){ + *ks = (Killswitch) { .name = g_strdup(udev_device_get_sysname(device)), .seqnum = udev_device_get_seqnum(device), .path = g_strdup(udev_device_get_syspath(device)), diff --git a/src/core/platform/nm-fake-platform.c b/src/core/platform/nm-fake-platform.c index 6a64746e4..10c69f637 100644 --- a/src/core/platform/nm-fake-platform.c +++ b/src/core/platform/nm-fake-platform.c @@ -1000,7 +1000,7 @@ ip4_address_add(NMPlatform *platform, { NMPlatformIP4Address address; - address = (NMPlatformIP4Address){ + address = (NMPlatformIP4Address) { .addr_source = NM_IP_CONFIG_SOURCE_KERNEL, .ifindex = ifindex, .address = addr, diff --git a/src/core/platform/tests/test-common.c b/src/core/platform/tests/test-common.c index 99b8bc45f..26f8b26b3 100644 --- a/src/core/platform/tests/test-common.c +++ b/src/core/platform/tests/test-common.c @@ -224,7 +224,7 @@ _nmtstp_platform_ip_addresses_assert(const char *filename, else g_error("%s:%d: invalid IP address in argument: %s", filename, lineno, addrstr); - addrs_bin[i] = (IPAddressesAssertData){ + addrs_bin[i] = (IPAddressesAssertData) { .addr_family = addr_family, .addr = a, .found = FALSE, @@ -1117,7 +1117,7 @@ again: link = nmtstp_link_gre_add(NULL, EX, test_ifname, - &((const NMPlatformLnkGre){ + &((const NMPlatformLnkGre) { .local = nmtst_inet4_from_string("192.168.233.204"), .remote = nmtst_inet4_from_string("172.168.10.25"), .parent_ifindex = 0, @@ -1129,7 +1129,7 @@ again: link = nmtstp_link_ipip_add(NULL, EX, test_ifname, - &((const NMPlatformLnkIpIp){ + &((const NMPlatformLnkIpIp) { .local = nmtst_inet4_from_string("1.2.3.4"), .remote = nmtst_inet4_from_string("5.6.7.8"), .parent_ifindex = 0, @@ -1140,7 +1140,7 @@ again: link = nmtstp_link_ip6tnl_add(NULL, EX, test_ifname, - &((const NMPlatformLnkIp6Tnl){ + &((const NMPlatformLnkIp6Tnl) { .local = nmtst_inet6_from_string("fd01::15"), .remote = nmtst_inet6_from_string("fd01::16"), .tclass = 20, @@ -1152,7 +1152,7 @@ again: link = nmtstp_link_ip6gre_add(NULL, EX, test_ifname, - &((const NMPlatformLnkIp6Tnl){ + &((const NMPlatformLnkIp6Tnl) { .local = nmtst_inet6_from_string("fd01::42"), .remote = nmtst_inet6_from_string("fd01::aaaa"), .tclass = 21, @@ -1163,7 +1163,7 @@ again: link = nmtstp_link_sit_add(NULL, EX, test_ifname, - &((const NMPlatformLnkSit){ + &((const NMPlatformLnkSit) { .local = nmtst_inet4_from_string("192.168.200.1"), .remote = nmtst_inet4_from_string("172.25.100.14"), .ttl = 0, @@ -1174,7 +1174,7 @@ again: link = nmtstp_link_vti_add(NULL, EX, test_ifname, - &((const NMPlatformLnkVti){ + &((const NMPlatformLnkVti) { .local = nmtst_inet4_from_string("192.168.212.204"), .remote = nmtst_inet4_from_string("172.168.11.25"), .ikey = 12, @@ -1184,7 +1184,7 @@ again: link = nmtstp_link_vti6_add(NULL, EX, test_ifname, - &((const NMPlatformLnkVti6){ + &((const NMPlatformLnkVti6) { .local = nmtst_inet6_from_string("fd01::1"), .remote = nmtst_inet6_from_string("fd02::2"), .ikey = 13, @@ -1891,11 +1891,11 @@ nmtstp_ip4_address_add(NMPlatform *platform, external_command, TRUE, ifindex, - &((NMIPAddr){ + &((NMIPAddr) { .addr4 = address, }), plen, - &((NMIPAddr){ + &((NMIPAddr) { .addr4 = peer_address, }), lifetime, @@ -3592,7 +3592,7 @@ nmtstp_acd_defender_new(int ifindex, in_addr_t ip_addr, const NMEtherAddr *mac_a g_assert_cmpint(r, ==, 0); g_assert(probe_config); - n_acd_probe_config_set_ip(probe_config, (struct in_addr){ip_addr}); + n_acd_probe_config_set_ip(probe_config, (struct in_addr) {ip_addr}); n_acd_probe_config_set_timeout(probe_config, 0); r = n_acd_probe(nacd, &probe, probe_config); @@ -3600,7 +3600,7 @@ nmtstp_acd_defender_new(int ifindex, in_addr_t ip_addr, const NMEtherAddr *mac_a g_assert(probe); defender = g_slice_new(NMTstpAcdDefender); - *defender = (NMTstpAcdDefender){ + *defender = (NMTstpAcdDefender) { .ifindex = ifindex, .ip_addr = ip_addr, .nacd = g_steal_pointer(&nacd), diff --git a/src/core/platform/tests/test-common.h b/src/core/platform/tests/test-common.h index 12d6e7ce6..85ed79615 100644 --- a/src/core/platform/tests/test-common.h +++ b/src/core/platform/tests/test-common.h @@ -372,21 +372,21 @@ void _nmtstp_platform_ip_addresses_assert(const char *filename, guint addrs_len, const char *const *addrs); -#define nmtstp_platform_ip_addresses_assert(self, \ - ifindex, \ - force_exact_4, \ - force_exact_6, \ - ignore_ll6, \ - ...) \ - _nmtstp_platform_ip_addresses_assert(__FILE__, \ - __LINE__, \ - (self), \ - (ifindex), \ - (force_exact_4), \ - (force_exact_6), \ - (ignore_ll6), \ - NM_NARG(__VA_ARGS__), \ - ((const char *const[]){"dummy", ##__VA_ARGS__, NULL}) \ +#define nmtstp_platform_ip_addresses_assert(self, \ + ifindex, \ + force_exact_4, \ + force_exact_6, \ + ignore_ll6, \ + ...) \ + _nmtstp_platform_ip_addresses_assert(__FILE__, \ + __LINE__, \ + (self), \ + (ifindex), \ + (force_exact_4), \ + (force_exact_6), \ + (ignore_ll6), \ + NM_NARG(__VA_ARGS__), \ + ((const char *const[]) {"dummy", ##__VA_ARGS__, NULL}) \ + 1) /*****************************************************************************/ @@ -540,7 +540,7 @@ gboolean nmtstp_ensure_module(const char *module_name); /*****************************************************************************/ #define nmtst_object_new_mptcp_addr(...) \ - nmp_object_new(NMP_OBJECT_TYPE_MPTCP_ADDR, &((const NMPlatformMptcpAddr){__VA_ARGS__})) + nmp_object_new(NMP_OBJECT_TYPE_MPTCP_ADDR, &((const NMPlatformMptcpAddr) {__VA_ARGS__})) /*****************************************************************************/ diff --git a/src/core/platform/tests/test-link.c b/src/core/platform/tests/test-link.c index 9f63b896a..8eaabf305 100644 --- a/src/core/platform/tests/test-link.c +++ b/src/core/platform/tests/test-link.c @@ -174,7 +174,7 @@ software_add(NMLinkType link_type, const char *name) return NMTST_NM_ERR_SUCCESS(nm_platform_link_vlan_add(NM_PLATFORM_GET, name, parent_ifindex, - &((NMPlatformLnkVlan){ + &((NMPlatformLnkVlan) { .id = VLAN_ID, .protocol = ETH_P_8021Q, }), @@ -289,7 +289,7 @@ test_port(int controller, int port_type, SignalData *controller_changed) prio_supported = (lnk->mode == 1); prio_has = nmtst_get_rand_bool() && prio_supported; - bond_port = (NMPlatformLinkBondPort){ + bond_port = (NMPlatformLinkBondPort) { .queue_id = 5, .prio_has = prio_has, .prio = prio_has ? 6 : 0, @@ -315,7 +315,7 @@ test_port(int controller, int port_type, SignalData *controller_changed) lnk = nm_platform_link_get_lnk_bridge(NM_PLATFORM_GET, controller, NULL); g_assert(lnk); - bridge_port = (NMPlatformLinkBridgePort){ + bridge_port = (NMPlatformLinkBridgePort) { .path_cost = 100, .priority = 614, .hairpin = 0, @@ -724,7 +724,7 @@ test_bridge_addr(void) g_assert_cmpint(plink->l_address.len, ==, sizeof(addr)); g_assert(!memcmp(plink->l_address.data, addr, sizeof(addr))); - info_data = (const NMPlatformLinkSetBridgeInfoData){ + info_data = (const NMPlatformLinkSetBridgeInfoData) { .vlan_default_pvid_val = nmtst_rand_select(0, 5, 42, 1048), .vlan_default_pvid_has = nmtst_get_rand_bool(), .vlan_filtering_val = nmtst_get_rand_bool(), @@ -743,7 +743,7 @@ test_bridge_addr(void) "/sys/class/net/" DEVICE_NAME "/bridge/vlan_filtering", info_data.vlan_filtering_val && info_data.vlan_filtering_has ? "1" : "0"); - info_data = (const NMPlatformLinkSetBridgeInfoData){ + info_data = (const NMPlatformLinkSetBridgeInfoData) { .vlan_default_pvid_val = 55, .vlan_default_pvid_has = TRUE, .vlan_filtering_val = !info_data.vlan_filtering_val, @@ -1275,7 +1275,7 @@ _test_wireguard_change(NMPlatform *platform, int ifindex, int test_mode) peers = g_array_new(FALSE, TRUE, sizeof(NMPWireGuardPeer)); - lnk_wireguard = (NMPlatformLnkWireGuard){ + lnk_wireguard = (NMPlatformLnkWireGuard) { .listen_port = 50754, .fwmark = 0x1102, }; @@ -1295,7 +1295,7 @@ _test_wireguard_change(NMPlatform *platform, int ifindex, int test_mode) NMPWireGuardAllowedIP *allowed_ips; if ((i % 2) == 1) { - endpoint = (NMSockAddrUnion){ + endpoint = (NMSockAddrUnion) { .in = { .sin_family = AF_INET, @@ -1305,7 +1305,7 @@ _test_wireguard_change(NMPlatform *platform, int ifindex, int test_mode) }, }; } else { - endpoint = (NMSockAddrUnion){ + endpoint = (NMSockAddrUnion) { .in6 = { .sin6_family = AF_INET6, @@ -1337,7 +1337,7 @@ _test_wireguard_change(NMPlatform *platform, int ifindex, int test_mode) } } - peer = (NMPWireGuardPeer){ + peer = (NMPWireGuardPeer) { .persistent_keepalive_interval = 60 + i, .endpoint = endpoint, .allowed_ips = n_allowed_ips > 0 ? allowed_ips : NULL, @@ -1803,7 +1803,7 @@ test_software_detect(gconstpointer user_data) switch (test_data->test_mode) { case 0: - lnk_tun = (NMPlatformLnkTun){ + lnk_tun = (NMPlatformLnkTun) { .type = nmtst_get_rand_bool() ? IFF_TUN : IFF_TAP, .owner = owner_valid ? getuid() : 0, .owner_valid = owner_valid, @@ -2705,7 +2705,7 @@ test_link_set_properties(void) NMPlatformLinkChangeFlags flags; int ifindex; - props = (NMPlatformLinkProps){ + props = (NMPlatformLinkProps) { .tx_queue_length = 599, .gso_max_size = 10001, .gso_max_segments = 512, @@ -3817,7 +3817,7 @@ test_sysctl_set_async(void) cancellable = g_cancellable_new(); proc_writable = access(PATH, W_OK) == 0; - data = (SetAsyncData){ + data = (SetAsyncData) { .loop = loop, .path = PATH, .expected_success = proc_writable, @@ -3826,7 +3826,7 @@ test_sysctl_set_async(void) nm_platform_sysctl_set_async(PL, NMP_SYSCTL_PATHID_ABSOLUTE(PATH), - (const char *[]){"2", NULL}, + (const char *[]) {"2", NULL}, sysctl_set_async_cb, &data, cancellable); @@ -3834,7 +3834,7 @@ test_sysctl_set_async(void) if (!nmtst_main_loop_run(loop, 1000)) g_assert_not_reached(); - data = (SetAsyncData){ + data = (SetAsyncData) { .loop = loop, .path = PATH, .expected_success = proc_writable, @@ -3843,7 +3843,7 @@ test_sysctl_set_async(void) nm_platform_sysctl_set_async(PL, NMP_SYSCTL_PATHID_ABSOLUTE(PATH), - (const char *[]){"2", "0", "1", "0", "1", NULL}, + (const char *[]) {"2", "0", "1", "0", "1", NULL}, sysctl_set_async_cb, &data, cancellable); @@ -3870,7 +3870,7 @@ test_sysctl_set_async_fail(void) loop = g_main_loop_new(NULL, FALSE); cancellable = g_cancellable_new(); - data = (SetAsyncData){ + data = (SetAsyncData) { .loop = loop, .path = PATH, .expected_success = FALSE, @@ -3878,7 +3878,7 @@ test_sysctl_set_async_fail(void) nm_platform_sysctl_set_async(PL, NMP_SYSCTL_PATHID_ABSOLUTE(PATH), - (const char *[]){"2", NULL}, + (const char *[]) {"2", NULL}, sysctl_set_async_cb, &data, cancellable); diff --git a/src/core/platform/tests/test-route.c b/src/core/platform/tests/test-route.c index 9aa21a9ac..41debb7eb 100644 --- a/src/core/platform/tests/test-route.c +++ b/src/core/platform/tests/test-route.c @@ -638,7 +638,7 @@ test_ip4_route_options(gconstpointer test_data) switch (TEST_IDX) { case 1: - rts_add[rts_n++] = ((NMPlatformIP4Route){ + rts_add[rts_n++] = ((NMPlatformIP4Route) { .ifindex = IFINDEX, .rt_source = NM_IP_CONFIG_SOURCE_USER, .network = nmtst_inet4_from_string("172.16.1.0"), @@ -658,7 +658,7 @@ test_ip4_route_options(gconstpointer test_data) }); break; case 2: - addr[addr_n++] = ((NMPlatformIP4Address){ + addr[addr_n++] = ((NMPlatformIP4Address) { .ifindex = IFINDEX, .address = nmtst_inet4_from_string("172.16.1.5"), .peer_address = nmtst_inet4_from_string("172.16.1.5"), @@ -667,7 +667,7 @@ test_ip4_route_options(gconstpointer test_data) .preferred = NM_PLATFORM_LIFETIME_PERMANENT, .n_ifa_flags = 0, }); - rts_add[rts_n++] = ((NMPlatformIP4Route){ + rts_add[rts_n++] = ((NMPlatformIP4Route) { .ifindex = IFINDEX, .rt_source = NM_IP_CONFIG_SOURCE_USER, .network = nmtst_inet4_from_string("172.17.1.0"), @@ -676,7 +676,7 @@ test_ip4_route_options(gconstpointer test_data) .metric = 20, .n_nexthops = 1, }); - rts_add[rts_n++] = ((NMPlatformIP4Route){ + rts_add[rts_n++] = ((NMPlatformIP4Route) { .ifindex = IFINDEX, .rt_source = NM_IP_CONFIG_SOURCE_USER, .network = nmtst_inet4_from_string("172.19.1.0"), @@ -801,7 +801,7 @@ test_ip6_route_options(gconstpointer test_data) switch (TEST_IDX) { case 1: - rts_add[rts_n++] = ((NMPlatformIP6Route){ + rts_add[rts_n++] = ((NMPlatformIP6Route) { .ifindex = IFINDEX, .rt_source = NM_IP_CONFIG_SOURCE_USER, .network = nmtst_inet6_from_string("2001:db8:a:b:0:0:0:0"), @@ -817,7 +817,7 @@ test_ip6_route_options(gconstpointer test_data) }); break; case 2: - addr[addr_n++] = ((NMPlatformIP6Address){ + addr[addr_n++] = ((NMPlatformIP6Address) { .ifindex = IFINDEX, .address = nmtst_inet6_from_string("2000::2"), .plen = 128, @@ -826,7 +826,7 @@ test_ip6_route_options(gconstpointer test_data) .preferred = NM_PLATFORM_LIFETIME_PERMANENT, .n_ifa_flags = 0, }); - rts_add[rts_n++] = ((NMPlatformIP6Route){ + rts_add[rts_n++] = ((NMPlatformIP6Route) { .ifindex = IFINDEX, .rt_source = NM_IP_CONFIG_SOURCE_USER, .network = nmtst_inet6_from_string("1010::1"), @@ -837,7 +837,7 @@ test_ip6_route_options(gconstpointer test_data) }); break; case 3: - addr[addr_n++] = ((NMPlatformIP6Address){ + addr[addr_n++] = ((NMPlatformIP6Address) { .ifindex = IFINDEX, .address = nmtst_inet6_from_string("2001:db8:8086::5"), .plen = 128, @@ -846,7 +846,7 @@ test_ip6_route_options(gconstpointer test_data) .preferred = NM_PLATFORM_LIFETIME_PERMANENT, .n_ifa_flags = 0, }); - rts_add[rts_n++] = ((NMPlatformIP6Route){ + rts_add[rts_n++] = ((NMPlatformIP6Route) { .ifindex = IFINDEX, .rt_source = nmp_utils_ip_config_source_round_trip_rtprot(NM_IP_CONFIG_SOURCE_USER), .network = nmtst_inet6_from_string("2001:db8:8086::"), @@ -854,7 +854,7 @@ test_ip6_route_options(gconstpointer test_data) .metric = 10021, .mss = 0, }); - rts_add[rts_n++] = ((NMPlatformIP6Route){ + rts_add[rts_n++] = ((NMPlatformIP6Route) { .ifindex = IFINDEX, .rt_source = nmp_utils_ip_config_source_round_trip_rtprot(NM_IP_CONFIG_SOURCE_USER), .network = nmtst_inet6_from_string("2001:db8:abad:c0de::"), @@ -1595,7 +1595,7 @@ test_rule(gconstpointer test_data) #define RR(...) \ nmp_object_new(NMP_OBJECT_TYPE_ROUTING_RULE, \ - (const NMPlatformObject *) &((NMPlatformRoutingRule){__VA_ARGS__})) + (const NMPlatformObject *) &((NMPlatformRoutingRule) {__VA_ARGS__})) objs = g_ptr_array_new_with_free_func((GDestroyNotify) nmp_object_unref); @@ -1926,11 +1926,11 @@ test_blackhole(gconstpointer test_data) rtn_type = nmtst_rand_select(RTN_BLACKHOLE, RTN_UNREACHABLE, RTN_PROHIBIT, RTN_THROW); if (IS_IPv4) { - rr.r4 = (const NMPlatformIP4Route){ + rr.r4 = (const NMPlatformIP4Route) { .type_coerced = nm_platform_route_type_coerce(rtn_type), }; } else { - rr.r6 = (const NMPlatformIP6Route){ + rr.r6 = (const NMPlatformIP6Route) { .type_coerced = nm_platform_route_type_coerce(rtn_type), .metric = 1000, }; @@ -1987,7 +1987,7 @@ again: if (p == -1) { static gsize lock; - const NMPlatformMptcpAddr mptcp_addr = (NMPlatformMptcpAddr){ + const NMPlatformMptcpAddr mptcp_addr = (NMPlatformMptcpAddr) { .id = 1, .addr_family = AF_INET, .addr.addr4 = nmtst_inet4_from_string("1.2.3.4"), diff --git a/src/core/platform/tests/test-tc.c b/src/core/platform/tests/test-tc.c index 832fbea6b..dc4dafc03 100644 --- a/src/core/platform/tests/test-tc.c +++ b/src/core/platform/tests/test-tc.c @@ -16,7 +16,7 @@ qdisc_new(int ifindex, const char *kind, guint32 parent) NMPObject *obj; obj = nmp_object_new(NMP_OBJECT_TYPE_QDISC, NULL); - obj->qdisc = (NMPlatformQdisc){ + obj->qdisc = (NMPlatformQdisc) { .ifindex = ifindex, .kind = kind, .parent = parent, diff --git a/src/core/ppp/nm-ppp-manager.c b/src/core/ppp/nm-ppp-manager.c index fbc5d075a..aa95cab28 100644 --- a/src/core/ppp/nm-ppp-manager.c +++ b/src/core/ppp/nm-ppp-manager.c @@ -547,7 +547,7 @@ impl_ppp_manager_set_ip4_config(NMDBusObject *obj, nm_l3_config_data_set_mtu(l3cd, mtu); - address = (NMPlatformIP4Address){ + address = (NMPlatformIP4Address) { .plen = 32, }; @@ -662,7 +662,7 @@ impl_ppp_manager_set_ip6_config(NMDBusObject *obj, nm_l3_config_data_set_mtu(l3cd, mtu); - address = (NMPlatformIP6Address){ + address = (NMPlatformIP6Address) { .plen = 64, .addr_source = NM_IP_CONFIG_SOURCE_PPP, }; diff --git a/src/core/ppp/nm-ppp-mgr.c b/src/core/ppp/nm-ppp-mgr.c index 91d9a021b..9f6e88359 100644 --- a/src/core/ppp/nm-ppp-mgr.c +++ b/src/core/ppp/nm-ppp-mgr.c @@ -208,11 +208,11 @@ _set_state_failed(NMPppMgr *self, NMPppMgrState state, NMPppMgrState *out_old_st self->ifindex = 0; nm_clear_l3cd(&self->ip_data_4.l3cd); nm_clear_l3cd(&self->ip_data_6.l3cd); - self->ip_data_4 = (NMPppMgrIPData){ + self->ip_data_4 = (NMPppMgrIPData) { .ip_received = FALSE, .ip_enabled = FALSE, }; - self->ip_data_6 = (NMPppMgrIPData){ + self->ip_data_6 = (NMPppMgrIPData) { .ip_received = FALSE, .ip_enabled = FALSE, }; @@ -563,7 +563,7 @@ nm_ppp_mgr_start(const NMPppMgrConfig *config, GError **error) self = g_slice_new(NMPppMgr); - *self = (NMPppMgr){ + *self = (NMPppMgr) { .config = *config, .ppp_manager = ppp_manager, .idle_start = nm_g_idle_add_source(_idle_start_cb, self), diff --git a/src/core/ppp/nm-pppd-compat.c b/src/core/ppp/nm-pppd-compat.c index 04e26f226..c14160236 100644 --- a/src/core/ppp/nm-pppd-compat.c +++ b/src/core/ppp/nm-pppd-compat.c @@ -164,14 +164,14 @@ nm_pppd_compat_get_ipcp_options(NMPppdCompatIPCPOptions *out_got, NMPppdCompatIP nm_assert(out_got); nm_assert(out_his); - *out_got = (NMPppdCompatIPCPOptions){ + *out_got = (NMPppdCompatIPCPOptions) { .ouraddr = got->ouraddr, .hisaddr = got->hisaddr, .dnsaddr = {got->dnsaddr[0], got->dnsaddr[1]}, .winsaddr = {got->winsaddr[0], got->winsaddr[1]}, }; - *out_his = (NMPppdCompatIPCPOptions){ + *out_his = (NMPppdCompatIPCPOptions) { .ouraddr = his->ouraddr, .hisaddr = his->hisaddr, .dnsaddr = {his->dnsaddr[0], his->dnsaddr[1]}, @@ -191,11 +191,11 @@ nm_pppd_compat_get_ipv6cp_options(NMPppdCompatIPV6CPOptions *out_got, nm_assert(out_got); nm_assert(out_his); - *out_got = (NMPppdCompatIPV6CPOptions){}; + *out_got = (NMPppdCompatIPV6CPOptions) {}; memcpy(&out_got->ourid, &got->ourid, sizeof(guint64)); memcpy(&out_got->hisid, &got->hisid, sizeof(guint64)); - *out_his = (NMPppdCompatIPV6CPOptions){}; + *out_his = (NMPppdCompatIPV6CPOptions) {}; memcpy(&out_his->ourid, &his->ourid, sizeof(guint64)); memcpy(&out_his->hisid, &his->hisid, sizeof(guint64)); } diff --git a/src/core/settings/nm-secret-agent.c b/src/core/settings/nm-secret-agent.c index bb3003457..6448ec57c 100644 --- a/src/core/settings/nm-secret-agent.c +++ b/src/core/settings/nm-secret-agent.c @@ -142,7 +142,7 @@ _call_id_new(NMSecretAgent *self, NMSecretAgentCallId *call_id; call_id = g_slice_new(NMSecretAgentCallId); - *call_id = (NMSecretAgentCallId){ + *call_id = (NMSecretAgentCallId) { .self = g_object_ref(self), .path = g_strdup(path), .setting_name = g_strdup(setting_name), diff --git a/src/core/settings/nm-settings-connection.c b/src/core/settings/nm-settings-connection.c index 459c60ad1..d5611e764 100644 --- a/src/core/settings/nm-settings-connection.c +++ b/src/core/settings/nm-settings-connection.c @@ -1721,7 +1721,7 @@ settings_connection_update(NMSettingsConnection *self, goto error; info = g_slice_new(UpdateInfo); - *info = (UpdateInfo){ + *info = (UpdateInfo) { .is_update2 = is_update2, .context = context, .agent_mgr = g_object_ref(priv->agent_mgr), diff --git a/src/core/settings/nm-settings-plugin.c b/src/core/settings/nm-settings-plugin.c index 60181759e..5dae482f1 100644 --- a/src/core/settings/nm-settings-plugin.c +++ b/src/core/settings/nm-settings-plugin.c @@ -110,7 +110,7 @@ nm_settings_plugin_create_connection_load_entries(const char *const *filenames, entries = g_new(NMSettingsPluginConnectionLoadEntry, len); for (i = 0; i < len; i++) { - entries[i] = (NMSettingsPluginConnectionLoadEntry){ + entries[i] = (NMSettingsPluginConnectionLoadEntry) { .filename = filenames[i], .error = NULL, .handled = FALSE, diff --git a/src/core/settings/nm-settings-utils.c b/src/core/settings/nm-settings-utils.c index 4343a3768..820d4fbd4 100644 --- a/src/core/settings/nm-settings-utils.c +++ b/src/core/settings/nm-settings-utils.c @@ -37,14 +37,14 @@ nm_sett_util_stat_mtime(const char *filename, gboolean do_lstat, struct timespec } if (gettimeofday(&now_tv, NULL) == 0) { - *out_val = (struct timespec){ + *out_val = (struct timespec) { .tv_sec = now_tv.tv_sec, .tv_nsec = now_tv.tv_usec * 1000u, }; return out_val; } - *out_val = (struct timespec){}; + *out_val = (struct timespec) {}; return out_val; } diff --git a/src/core/settings/nm-settings-utils.h b/src/core/settings/nm-settings-utils.h index d3f50ddf7..949963e2a 100644 --- a/src/core/settings/nm-settings-utils.h +++ b/src/core/settings/nm-settings-utils.h @@ -81,7 +81,7 @@ typedef struct { } NMSettUtilAllowFilenameData; #define NM_SETT_UTIL_ALLOW_FILENAME_DATA(_storages, _allowed_filename) \ - (&((NMSettUtilAllowFilenameData){ \ + (&((NMSettUtilAllowFilenameData) { \ .idx_by_filename = (_storages)->idx_by_filename, \ .allowed_filename = (_allowed_filename), \ })) diff --git a/src/core/settings/nm-settings.c b/src/core/settings/nm-settings.c index 80b1f4b21..50d98ece3 100644 --- a/src/core/settings/nm-settings.c +++ b/src/core/settings/nm-settings.c @@ -703,7 +703,7 @@ _startup_complete_notify_connection(NMSettings *self, if (timeout_msec == 0) return; scd = g_slice_new(StartupCompleteData); - *scd = (StartupCompleteData){ + *scd = (StartupCompleteData) { .sett_conn = g_object_ref(sett_conn), .timeout_msec = timeout_msec, }; diff --git a/src/core/settings/plugins/ifcfg-rh/shvar.c b/src/core/settings/plugins/ifcfg-rh/shvar.c index 1ca2ea606..565e20f7e 100644 --- a/src/core/settings/plugins/ifcfg-rh/shvar.c +++ b/src/core/settings/plugins/ifcfg-rh/shvar.c @@ -722,7 +722,7 @@ svFile_new(const char *name, int fd, const char *content) nm_assert(fd >= -1); s = g_slice_new(shvarFile); - *s = (shvarFile){ + *s = (shvarFile) { .fileName = g_strdup(name), .fd = fd, .lst_head = C_LIST_INIT(s->lst_head), @@ -796,7 +796,7 @@ line_new_parse(const char *value, gsize len) nm_assert(value); line = g_slice_new(shvarLine); - *line = (shvarLine){ + *line = (shvarLine) { .lst = C_LIST_INIT(line->lst), .dirty = TRUE, }; @@ -836,7 +836,7 @@ line_new_build(const char *key, const char *value) value = svEscape(value, &value_escaped); line = g_slice_new(shvarLine); - new_key = g_strdup(key), *line = (shvarLine){ + new_key = g_strdup(key), *line = (shvarLine) { .lst = C_LIST_INIT(line->lst), .line = value_escaped ?: g_strdup(value), .key_with_prefix = new_key, diff --git a/src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.c b/src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.c index 14c82c55b..1b03ce2ae 100644 --- a/src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.c +++ b/src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.c @@ -330,7 +330,7 @@ load_eni_ifaces(NMSIfupdownPlugin *self) storage = nm_settings_storage_new(NM_SETTINGS_PLUGIN(self), uuid, NULL); sd = g_slice_new(StorageData); - *sd = (StorageData){ + *sd = (StorageData) { .connection = g_steal_pointer(&connection), .storage = g_steal_pointer(&storage), }; diff --git a/src/core/supplicant/nm-supplicant-config.c b/src/core/supplicant/nm-supplicant-config.c index 4433e809e..9e0663951 100644 --- a/src/core/supplicant/nm-supplicant-config.c +++ b/src/core/supplicant/nm-supplicant-config.c @@ -154,7 +154,7 @@ nm_supplicant_config_add_option_with_type(NMSupplicantConfig *self, } opt = g_slice_new(ConfigOption); - *opt = (ConfigOption){ + *opt = (ConfigOption) { .value = nm_memdup_nul(value, len), .len = len, .type = type, diff --git a/src/core/supplicant/nm-supplicant-interface.c b/src/core/supplicant/nm-supplicant-interface.c index eb7a40a54..d5f56dcde 100644 --- a/src/core/supplicant/nm-supplicant-interface.c +++ b/src/core/supplicant/nm-supplicant-interface.c @@ -714,7 +714,7 @@ _bss_info_properties_changed(NMSupplicantInterface *self, if (v_v) { arr_data = g_variant_get_fixed_array(v_v, &arr_len, 1); if (arr_len == ETH_ALEN && memcmp(arr_data, &nm_ether_addr_zero, ETH_ALEN) != 0 - && memcmp(arr_data, (char[ETH_ALEN]){0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, ETH_ALEN) + && memcmp(arr_data, (char[ETH_ALEN]) {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, ETH_ALEN) != 0) { /* pass */ } else @@ -839,7 +839,7 @@ _bss_info_add(NMSupplicantInterface *self, const char *object_path) } bss_info = g_slice_new(NMSupplicantBssInfo); - *bss_info = (NMSupplicantBssInfo){ + *bss_info = (NMSupplicantBssInfo) { ._self = self, .bss_path = g_steal_pointer(&bss_path), ._init_cancellable = g_cancellable_new(), @@ -953,7 +953,7 @@ _peer_info_properties_changed(NMSupplicantInterface *self, if (v_v) { arr_data = g_variant_get_fixed_array(v_v, &arr_len, 1); if (arr_len == ETH_ALEN && memcmp(arr_data, &nm_ether_addr_zero, ETH_ALEN) != 0 - && memcmp(arr_data, (char[ETH_ALEN]){0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, ETH_ALEN) + && memcmp(arr_data, (char[ETH_ALEN]) {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, ETH_ALEN) != 0) { /* pass */ } else @@ -1037,7 +1037,7 @@ _peer_info_add(NMSupplicantInterface *self, const char *object_path) } peer_info = g_slice_new(NMSupplicantPeerInfo); - *peer_info = (NMSupplicantPeerInfo){ + *peer_info = (NMSupplicantPeerInfo) { ._self = self, .peer_path = g_steal_pointer(&peer_path), ._init_cancellable = g_cancellable_new(), @@ -1831,7 +1831,7 @@ _wps_start(NMSupplicantInterface *self, const char *type, const char *bssid, con } wps_data = g_slice_new(WpsData); - *wps_data = (WpsData){ + *wps_data = (WpsData) { .self = self, .type = g_strdup(type), .bssid = g_strdup(bssid), @@ -2381,7 +2381,7 @@ add_network(NMSupplicantInterface *self) * For that we also have a shutdown_wait_obj so that on exit we still wait * to handle the response. */ add_network_data = g_slice_new(AddNetworkData); - *add_network_data = (AddNetworkData){ + *add_network_data = (AddNetworkData) { .assoc_data = priv->assoc_data, .name_owner = nm_ref_string_ref(priv->name_owner), .object_path = nm_ref_string_ref(priv->object_path), @@ -2534,7 +2534,7 @@ nm_supplicant_interface_assoc(NMSupplicantInterface *self, nm_supplicant_interface_disconnect(self); assoc_data = g_slice_new(AssocData); - *assoc_data = (AssocData){ + *assoc_data = (AssocData) { .self = self, .cfg = g_object_ref(cfg), .callback = callback, @@ -2707,7 +2707,7 @@ nm_supplicant_interface_request_scan(NMSupplicantInterface *se } data = g_slice_new(ScanRequestData); - *data = (ScanRequestData){ + *data = (ScanRequestData) { .self = self, .callback = callback, .user_data = user_data, diff --git a/src/core/supplicant/nm-supplicant-manager.c b/src/core/supplicant/nm-supplicant-manager.c index 3b805693a..ea8d08659 100644 --- a/src/core/supplicant/nm-supplicant-manager.c +++ b/src/core/supplicant/nm-supplicant-manager.c @@ -693,7 +693,7 @@ nm_supplicant_manager_create_interface(NMSupplicantManager *self priv = NM_SUPPLICANT_MANAGER_GET_PRIVATE(self); handle = g_slice_new(NMSupplMgrCreateIfaceHandle); - *handle = (NMSupplMgrCreateIfaceHandle){ + *handle = (NMSupplMgrCreateIfaceHandle) { .self = g_object_ref(self), .callback = callback, .callback_user_data = user_data, diff --git a/src/core/tests/test-core.c b/src/core/tests/test-core.c index c5a598a69..c31955394 100644 --- a/src/core/tests/test-core.c +++ b/src/core/tests/test-core.c @@ -1027,7 +1027,7 @@ test_connection_match_ip6_routes(void) } #define do_test_wildcard_match_eval(str, ...) \ - nm_wildcard_match_check(str, (const char *const[]){__VA_ARGS__}, NM_NARG(__VA_ARGS__)) + nm_wildcard_match_check(str, (const char *const[]) {__VA_ARGS__}, NM_NARG(__VA_ARGS__)) #define do_test_wildcard_match(str, result, ...) \ g_assert(do_test_wildcard_match_eval(str, __VA_ARGS__) == result) @@ -1244,7 +1244,7 @@ _test_match_spec_device(const GSList *specs, const char *match_str) { if (match_str && g_str_has_prefix(match_str, MATCH_S390)) return nm_match_spec_device(specs, - &((const NMMatchSpecDeviceData){ + &((const NMMatchSpecDeviceData) { .s390_subchannels = &match_str[NM_STRLEN(MATCH_S390)], })); if (match_str && g_str_has_prefix(match_str, MATCH_DRIVER)) { @@ -1257,13 +1257,13 @@ _test_match_spec_device(const GSList *specs, const char *match_str) t++; } return nm_match_spec_device(specs, - &((const NMMatchSpecDeviceData){ + &((const NMMatchSpecDeviceData) { .driver = s, .driver_version = t, })); } return nm_match_spec_device(specs, - &((const NMMatchSpecDeviceData){ + &((const NMMatchSpecDeviceData) { .interface_name = match_str, })); } @@ -1789,28 +1789,28 @@ test_nm_utils_strbuf_append(void) } \ G_STMT_END -#define _strbuf_append_c(buf, len, ch) \ - G_STMT_START \ - { \ - char **_buf = (buf); \ - gsize *_len = (len); \ - char _ch = (ch); \ - \ - switch (nmtst_get_rand_uint32() % 4) { \ - case 0: \ - nm_strbuf_append(_buf, _len, "%c", _ch); \ - break; \ - case 1: \ - nm_strbuf_append_str(_buf, _len, ((char[2]){_ch, 0})); \ - break; \ - case 2: \ - nm_strbuf_append_bin(_buf, _len, &_ch, 1); \ - break; \ - case 3: \ - nm_strbuf_append_c(_buf, _len, _ch); \ - break; \ - } \ - } \ +#define _strbuf_append_c(buf, len, ch) \ + G_STMT_START \ + { \ + char **_buf = (buf); \ + gsize *_len = (len); \ + char _ch = (ch); \ + \ + switch (nmtst_get_rand_uint32() % 4) { \ + case 0: \ + nm_strbuf_append(_buf, _len, "%c", _ch); \ + break; \ + case 1: \ + nm_strbuf_append_str(_buf, _len, ((char[2]) {_ch, 0})); \ + break; \ + case 2: \ + nm_strbuf_append_bin(_buf, _len, &_ch, 1); \ + break; \ + case 3: \ + nm_strbuf_append_c(_buf, _len, _ch); \ + break; \ + } \ + } \ G_STMT_END for (buf_len = 0; buf_len < 10; buf_len++) { diff --git a/src/core/tests/test-l3cfg.c b/src/core/tests/test-l3cfg.c index 6b82fe433..6a1b94967 100644 --- a/src/core/tests/test-l3cfg.c +++ b/src/core/tests/test-l3cfg.c @@ -111,7 +111,7 @@ _test_fixture_1_teardown(TestFixture1 *f) g_object_unref(f->platform); nm_dedup_multi_index_unref(f->multiidx); - *f = (TestFixture1){ + *f = (TestFixture1) { .test_idx = 0, }; } diff --git a/src/core/vpn/nm-vpn-connection.c b/src/core/vpn/nm-vpn-connection.c index b5a7fc4c2..845a74325 100644 --- a/src/core/vpn/nm-vpn-connection.c +++ b/src/core/vpn/nm-vpn-connection.c @@ -1235,7 +1235,7 @@ _parent_device_l3cd_add_gateway_route(NML3ConfigData *l3cd, return FALSE; if (IS_IPv4) { - route.r4 = (NMPlatformIP4Route){ + route.r4 = (NMPlatformIP4Route) { .ifindex = ifindex, .network = vpn_gw->addr4, .plen = 32, @@ -1244,7 +1244,7 @@ _parent_device_l3cd_add_gateway_route(NML3ConfigData *l3cd, .metric_any = TRUE, }; } else { - route.r6 = (NMPlatformIP6Route){ + route.r6 = (NMPlatformIP6Route) { .ifindex = ifindex, .network = vpn_gw->addr6, .plen = 128, @@ -1262,14 +1262,14 @@ _parent_device_l3cd_add_gateway_route(NML3ConfigData *l3cd, * the parent device's gateway would get routed through the VPN and fail. */ if (IS_IPv4) { - route.r4 = (NMPlatformIP4Route){ + route.r4 = (NMPlatformIP4Route) { .network = parent_gw.addr4, .plen = 32, .rt_source = NM_IP_CONFIG_SOURCE_VPN, .metric_any = TRUE, }; } else { - route.r6 = (NMPlatformIP6Route){ + route.r6 = (NMPlatformIP6Route) { .network = parent_gw.addr6, .plen = 128, .rt_source = NM_IP_CONFIG_SOURCE_VPN, @@ -1999,11 +1999,11 @@ _dbus_signal_ip_config_cb(NMVpnConnection *self, int addr_family, GVariant *dict &priv->ip_data_x[IS_IPv4].gw_internal); if (IS_IPv4) { - address.a4 = (NMPlatformIP4Address){ + address.a4 = (NMPlatformIP4Address) { .plen = 24, }; } else { - address.a6 = (NMPlatformIP6Address){ + address.a6 = (NMPlatformIP6Address) { .plen = 128, }; } @@ -2205,7 +2205,7 @@ _dbus_signal_ip_config_cb(NMVpnConnection *self, int addr_family, GVariant *dict if (prefix > 128) continue; - route.r6 = (NMPlatformIP6Route){ + route.r6 = (NMPlatformIP6Route) { .plen = prefix, .table_any = TRUE, .metric_any = TRUE, @@ -2251,7 +2251,7 @@ _dbus_signal_ip_config_cb(NMVpnConnection *self, int addr_family, GVariant *dict NMPlatformIPXRoute route; if (IS_IPv4) { - route.r4 = (NMPlatformIP4Route){ + route.r4 = (NMPlatformIP4Route) { .ifindex = ip_ifindex, .rt_source = NM_IP_CONFIG_SOURCE_VPN, .gateway = priv->ip_data_4.gw_internal.addr4, @@ -2260,7 +2260,7 @@ _dbus_signal_ip_config_cb(NMVpnConnection *self, int addr_family, GVariant *dict .mss = mss, }; } else { - route.r6 = (NMPlatformIP6Route){ + route.r6 = (NMPlatformIP6Route) { .ifindex = ip_ifindex, .rt_source = NM_IP_CONFIG_SOURCE_VPN, .gateway = priv->ip_data_6.gw_internal.addr6, diff --git a/src/libnm-base/nm-ethtool-base.c b/src/libnm-base/nm-ethtool-base.c index a02b90186..8e7f7814a 100644 --- a/src/libnm-base/nm-ethtool-base.c +++ b/src/libnm-base/nm-ethtool-base.c @@ -11,10 +11,10 @@ /*****************************************************************************/ -#define ETHT_DATA(xname) \ - [NM_ETHTOOL_ID_##xname] = (&((const NMEthtoolData){ \ - .optname = NM_ETHTOOL_OPTNAME_##xname, \ - .id = NM_ETHTOOL_ID_##xname, \ +#define ETHT_DATA(xname) \ + [NM_ETHTOOL_ID_##xname] = (&((const NMEthtoolData) { \ + .optname = NM_ETHTOOL_OPTNAME_##xname, \ + .id = NM_ETHTOOL_ID_##xname, \ })) const NMEthtoolData *const nm_ethtool_data[_NM_ETHTOOL_ID_NUM + 1] = { diff --git a/src/libnm-client-impl/nm-active-connection.c b/src/libnm-client-impl/nm-active-connection.c index 0d1863616..9008256ac 100644 --- a/src/libnm-client-impl/nm-active-connection.c +++ b/src/libnm-client-impl/nm-active-connection.c @@ -624,7 +624,7 @@ const NMLDBusMetaIface _nml_dbus_meta_iface_nm_connection_active = NML_DBUS_META PROP_CONTROLLER, "o", active_connection_update_prop_controller, - .extra.property_vtable_o = &((const NMLDBusPropertVTableO){ + .extra.property_vtable_o = &((const NMLDBusPropertVTableO) { .get_o_type_fcn = (nm_device_get_type)})), NML_DBUS_META_PROPERTY_INIT_B("Default", PROP_DEFAULT, @@ -664,7 +664,7 @@ const NMLDBusMetaIface _nml_dbus_meta_iface_nm_connection_active = NML_DBUS_META PROP_MASTER, "o", active_connection_update_prop_controller, - .extra.property_vtable_o = &((const NMLDBusPropertVTableO){ + .extra.property_vtable_o = &((const NMLDBusPropertVTableO) { .get_o_type_fcn = (nm_device_get_type)})), NML_DBUS_META_PROPERTY_INIT_O("SpecificObject", PROP_SPECIFIC_OBJECT_PATH, diff --git a/src/libnm-client-impl/nm-client.c b/src/libnm-client-impl/nm-client.c index 9715981fe..22a33ca0b 100644 --- a/src/libnm-client-impl/nm-client.c +++ b/src/libnm-client-impl/nm-client.c @@ -419,7 +419,7 @@ nml_init_data_new_sync(GCancellable *cancellable, GMainLoop *main_loop, GError * NMLInitData *init_data; init_data = g_slice_new(NMLInitData); - *init_data = (NMLInitData){ + *init_data = (NMLInitData) { .cancellable = nm_g_object_ref(cancellable), .is_sync = TRUE, .data.sync = @@ -437,7 +437,7 @@ nml_init_data_new_async(GCancellable *cancellable, GTask *task_take) NMLInitData *init_data; init_data = g_slice_new(NMLInitData); - *init_data = (NMLInitData){ + *init_data = (NMLInitData) { .cancellable = nm_g_object_ref(cancellable), .is_sync = FALSE, .data.async = @@ -1103,7 +1103,7 @@ nml_dbus_object_new(NMRefString *dbus_path_take) nm_assert(NM_IS_REF_STRING(dbus_path_take)); dbobj = g_slice_new(NMLDBusObject); - *dbobj = (NMLDBusObject){ + *dbobj = (NMLDBusObject) { .dbus_path = g_steal_pointer(&dbus_path_take), .ref_count = 1, .dbus_objects_lst = C_LIST_INIT(dbobj->dbus_objects_lst), @@ -1209,7 +1209,7 @@ nml_dbus_object_iface_data_get(NMLDBusObject *dbobj, G_STRUCT_OFFSET(NMLDBusObjIfaceData, prop_datas) + (meta_iface ? (sizeof(NMLDBusObjPropData) * meta_iface->n_dbus_properties) : 0u)); if (meta_iface) { - *db_iface_data = (NMLDBusObjIfaceData){ + *db_iface_data = (NMLDBusObjIfaceData) { .dbus_iface.meta = meta_iface, .dbus_iface_is_wellknown = TRUE, .changed_prop_lst_head = C_LIST_INIT(db_iface_data->changed_prop_lst_head), @@ -1217,7 +1217,7 @@ nml_dbus_object_iface_data_get(NMLDBusObject *dbobj, }; db_prop_data = &db_iface_data->prop_datas[0]; for (i = 0; i < meta_iface->n_dbus_properties; i++, db_prop_data++) { - *db_prop_data = (NMLDBusObjPropData){ + *db_prop_data = (NMLDBusObjPropData) { .prop_data_value = NULL, .changed_prop_lst = C_LIST_INIT(db_prop_data->changed_prop_lst), }; @@ -3912,7 +3912,7 @@ _request_wait_start(GTask *task_take, } request_data = g_slice_new(RequestWaitData); - *request_data = (RequestWaitData){ + *request_data = (RequestWaitData) { .task = g_steal_pointer(&task), .op_name = op_name, .gtype = gtype, @@ -7077,7 +7077,7 @@ _init_release_all(NMClient *self) nm_assert(c_list_is_empty(&priv->obj_changed_lst_head)); - dbus_objects_lst_heads = ((CList *[]){ + dbus_objects_lst_heads = ((CList *[]) { &priv->dbus_objects_lst_head_on_dbus, &priv->dbus_objects_lst_head_with_nmobj_not_ready, &priv->dbus_objects_lst_head_with_nmobj_ready, @@ -9149,7 +9149,7 @@ nm_client_wait_shutdown(NMClient *client, } data = g_slice_new(WaitShutdownData); - *data = (WaitShutdownData){ + *data = (WaitShutdownData) { .cancellable = nm_g_object_ref(cancellable), .task = g_object_ref(task), .result = -1, diff --git a/src/libnm-client-impl/nm-device.c b/src/libnm-client-impl/nm-device.c index a95501894..f9d7329ba 100644 --- a/src/libnm-client-impl/nm-device.c +++ b/src/libnm-client-impl/nm-device.c @@ -610,7 +610,7 @@ const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device = NML_DBUS_META_IFACE_INIT .prop_struct_offset = G_STRUCT_OFFSET(NMDevicePrivate, property_ao[PROPERTY_AO_IDX_PORTS]), .extra.property_vtable_ao = - &((const NMLDBusPropertVTableAO){.get_o_type_fcn = (nm_device_get_type)})), + &((const NMLDBusPropertVTableAO) {.get_o_type_fcn = (nm_device_get_type)})), NML_DBUS_META_PROPERTY_INIT_B("Real", PROP_REAL, NMDevicePrivate, real), NML_DBUS_META_PROPERTY_INIT_IGNORE("State", "u"), NML_DBUS_META_PROPERTY_INIT_FCN("StateReason", @@ -3004,7 +3004,7 @@ nm_lldp_neighbor_new(void) NMLldpNeighbor *neigh; neigh = g_slice_new(NMLldpNeighbor); - *neigh = (NMLldpNeighbor){ + *neigh = (NMLldpNeighbor) { .refcount = 1, .attrs = g_hash_table_new_full(nm_str_hash, g_str_equal, diff --git a/src/libnm-client-impl/nm-libnm-utils.h b/src/libnm-client-impl/nm-libnm-utils.h index f47b1a509..7dcf8c18d 100644 --- a/src/libnm-client-impl/nm-libnm-utils.h +++ b/src/libnm-client-impl/nm-libnm-utils.h @@ -440,8 +440,8 @@ typedef struct { v_obj_properties_idx, \ .prop_struct_offset = \ NM_STRUCT_OFFSET_ENSURE_TYPE(NMLDBusPropertyO, v_container, v_field), \ - .extra.property_vtable_o = \ - &((const NMLDBusPropertVTableO){.get_o_type_fcn = (v_get_o_type_fcn), ##__VA_ARGS__})) + .extra.property_vtable_o = &( \ + (const NMLDBusPropertVTableO) {.get_o_type_fcn = (v_get_o_type_fcn), ##__VA_ARGS__})) #define NML_DBUS_META_PROPERTY_INIT_AO_PROP(v_dbus_property_name, \ v_obj_properties_idx, \ @@ -456,7 +456,7 @@ typedef struct { .prop_struct_offset = \ NM_STRUCT_OFFSET_ENSURE_TYPE(NMLDBusPropertyAO, v_container, v_field), \ .extra.property_vtable_ao = &( \ - (const NMLDBusPropertVTableAO){.get_o_type_fcn = (v_get_o_type_fcn), ##__VA_ARGS__})) + (const NMLDBusPropertVTableAO) {.get_o_type_fcn = (v_get_o_type_fcn), ##__VA_ARGS__})) #define NML_DBUS_META_PROPERTY_INIT_FCN(v_dbus_property_name, \ v_obj_properties_idx, \ @@ -559,12 +559,12 @@ struct _NMLDBusMetaIface { #define NML_DBUS_META_IFACE_OBJ_PROPERTIES() \ .obj_properties = (const GParamSpec *const *) (obj_properties), \ .n_obj_properties = _PROPERTY_ENUMS_LAST, \ - .obj_properties_reverse_idx = ((guint8[_PROPERTY_ENUMS_LAST]){}) + .obj_properties_reverse_idx = ((guint8[_PROPERTY_ENUMS_LAST]) {}) -#define NML_DBUS_META_IFACE_DBUS_PROPERTIES(...) \ - .dbus_properties = ((const NMLDBusMetaProperty[]){__VA_ARGS__}), \ - .n_dbus_properties = \ - (sizeof((const NMLDBusMetaProperty[]){__VA_ARGS__}) / sizeof(NMLDBusMetaProperty)) +#define NML_DBUS_META_IFACE_DBUS_PROPERTIES(...) \ + .dbus_properties = ((const NMLDBusMetaProperty[]) {__VA_ARGS__}), \ + .n_dbus_properties = \ + (sizeof((const NMLDBusMetaProperty[]) {__VA_ARGS__}) / sizeof(NMLDBusMetaProperty)) #define NML_DBUS_META_IFACE_INIT(v_dbus_iface_name, v_get_type_fcn, v_interface_prio, ...) \ {.dbus_iface_name = "" v_dbus_iface_name "", \ @@ -640,7 +640,7 @@ void _nml_dbus_meta_class_init_with_properties_impl(GObjectClass #define _nml_dbus_meta_class_init_with_properties(object_class, ...) \ _nml_dbus_meta_class_init_with_properties_impl( \ (object_class), \ - ((const NMLDBusMetaIface *const[]){__VA_ARGS__, NULL})) + ((const NMLDBusMetaIface *const[]) {__VA_ARGS__, NULL})) /*****************************************************************************/ @@ -793,7 +793,7 @@ struct _NMObjectClass { * variable here. */ \ nm_assert(!_f.klass); \ \ - _f = (_NMObjectClassFieldInfo){ \ + _f = (_NMObjectClassFieldInfo) { \ .parent = _klass->field_name, \ .klass = _klass, \ .offset = (_offset), \ diff --git a/src/libnm-client-impl/nm-secret-agent-old.c b/src/libnm-client-impl/nm-secret-agent-old.c index 93b6048f9..a63c57ea5 100644 --- a/src/libnm-client-impl/nm-secret-agent-old.c +++ b/src/libnm-client-impl/nm-secret-agent-old.c @@ -476,7 +476,7 @@ impl_get_secrets(NMSecretAgentOld *self, GVariant *parameters, GDBusMethodInvoca _cancel_get_secret_request(self, info, "Request aborted due to new request"); info = g_slice_new(GetSecretsInfo); - *info = (GetSecretsInfo){ + *info = (GetSecretsInfo) { .context = context, .connection_path = g_strdup(arg_connection_path), .setting_name = g_strdup(arg_setting_name), diff --git a/src/libnm-client-impl/tests/test-libnm.c b/src/libnm-client-impl/tests/test-libnm.c index 4a59f6eca..f56521a49 100644 --- a/src/libnm-client-impl/tests/test-libnm.c +++ b/src/libnm-client-impl/tests/test-libnm.c @@ -2285,7 +2285,7 @@ typedef struct { const char *val; } ReadVpnDetailData; -#define READ_VPN_DETAIL_DATA(...) ((ReadVpnDetailData[]){__VA_ARGS__}) +#define READ_VPN_DETAIL_DATA(...) ((ReadVpnDetailData[]) {__VA_ARGS__}) static gboolean _do_read_vpn_details_impl1(const char *file, diff --git a/src/libnm-client-impl/tests/test-nm-client.c b/src/libnm-client-impl/tests/test-nm-client.c index 3d5273245..39831509b 100644 --- a/src/libnm-client-impl/tests/test-nm-client.c +++ b/src/libnm-client-impl/tests/test-nm-client.c @@ -1099,7 +1099,7 @@ test_connection_invalid(void) g_assert_cmpint(connections->len, ==, 3); n_found = nmtst_find_all_indexes(connections->pdata, connections->len, - (gpointer *) ((const char *[]){path0, path1, path2}), + (gpointer *) ((const char *[]) {path0, path1, path2}), 3, _test_connection_invalid_find_connections, NULL, @@ -1134,7 +1134,7 @@ test_connection_invalid(void) g_assert_cmpint(connections->len, ==, 4); n_found = nmtst_find_all_indexes(connections->pdata, connections->len, - (gpointer *) ((const char *[]){path0, path1, path2, path3}), + (gpointer *) ((const char *[]) {path0, path1, path2, path3}), 4, _test_connection_invalid_find_connections, NULL, @@ -1166,7 +1166,7 @@ test_connection_invalid(void) g_assert_cmpint(connections->len, ==, 4); n_found = nmtst_find_all_indexes(connections->pdata, connections->len, - (gpointer *) ((const char *[]){path0, path1, path2, path3}), + (gpointer *) ((const char *[]) {path0, path1, path2, path3}), 4, _test_connection_invalid_find_connections, NULL, @@ -1202,7 +1202,7 @@ test_connection_invalid(void) g_assert_cmpint(connections->len, ==, 4); n_found = nmtst_find_all_indexes(connections->pdata, connections->len, - (gpointer *) ((const char *[]){path0, path1, path2, path3}), + (gpointer *) ((const char *[]) {path0, path1, path2, path3}), 4, _test_connection_invalid_find_connections, NULL, @@ -1232,7 +1232,7 @@ test_connection_invalid(void) g_assert_cmpint(connections->len, ==, 4); n_found = nmtst_find_all_indexes(connections->pdata, connections->len, - (gpointer *) ((const char *[]){path0, path1, path2, path3}), + (gpointer *) ((const char *[]) {path0, path1, path2, path3}), 4, _test_connection_invalid_find_connections, NULL, @@ -1279,7 +1279,7 @@ test_connection_invalid(void) g_assert_cmpint(connections->len, ==, 4); n_found = nmtst_find_all_indexes(connections->pdata, connections->len, - (gpointer *) ((const char *[]){path0, path1, path2, path3}), + (gpointer *) ((const char *[]) {path0, path1, path2, path3}), 4, _test_connection_invalid_find_connections, NULL, @@ -1326,7 +1326,7 @@ test_connection_invalid(void) g_assert_cmpint(connections->len, ==, 4); n_found = nmtst_find_all_indexes(connections->pdata, connections->len, - (gpointer *) ((const char *[]){path0, path1, path2, path3}), + (gpointer *) ((const char *[]) {path0, path1, path2, path3}), 4, _test_connection_invalid_find_connections, NULL, diff --git a/src/libnm-client-impl/tests/test-secret-agent.c b/src/libnm-client-impl/tests/test-secret-agent.c index 1fffb5565..9871b1a42 100644 --- a/src/libnm-client-impl/tests/test-secret-agent.c +++ b/src/libnm-client-impl/tests/test-secret-agent.c @@ -344,7 +344,7 @@ test_cleanup(TestSecretAgentData *sadata, gconstpointer test_data) g_free(sadata->ifname); g_free(sadata->con_id); - *sadata = (TestSecretAgentData){}; + *sadata = (TestSecretAgentData) {}; nmtst_context_busy_watcher_wait(&watcher_data); diff --git a/src/libnm-client-test/nm-test-utils-impl.c b/src/libnm-client-test/nm-test-utils-impl.c index ba541ad83..36d18c500 100644 --- a/src/libnm-client-test/nm-test-utils-impl.c +++ b/src/libnm-client-test/nm-test-utils-impl.c @@ -314,7 +314,7 @@ add_device_common(NMTstcServiceInfo *sinfo, loop = g_main_loop_new(nm_client_get_main_context(client), FALSE); - info = (AddDeviceInfo){ + info = (AddDeviceInfo) { .ifname = ifname, .loop = loop, }; diff --git a/src/libnm-core-impl/nm-connection.c b/src/libnm-core-impl/nm-connection.c index 24c28e815..276dd8eab 100644 --- a/src/libnm-core-impl/nm-connection.c +++ b/src/libnm-core-impl/nm-connection.c @@ -89,7 +89,7 @@ _nm_connection_get_private_from_qdata(NMConnection *connection) priv = g_object_get_qdata((GObject *) connection, key); if (G_UNLIKELY(!priv)) { priv = g_slice_new(NMConnectionPrivate); - *priv = (NMConnectionPrivate){ + *priv = (NMConnectionPrivate) { .self = connection, }; g_object_set_qdata_full((GObject *) connection, key, priv, _nm_connection_private_free); diff --git a/src/libnm-core-impl/nm-keyfile.c b/src/libnm-core-impl/nm-keyfile.c index 8dadf3cdf..a288cc277 100644 --- a/src/libnm-core-impl/nm-keyfile.c +++ b/src/libnm-core-impl/nm-keyfile.c @@ -132,7 +132,7 @@ _nm_printf(5, 6) static void _read_handle_warn(KeyfileReaderInfo *info, info, kf_key, cur_property); - handler_data.warn = (NMKeyfileHandlerDataWarn){ + handler_data.warn = (NMKeyfileHandlerDataWarn) { .severity = severity, .message = NULL, .fmt = fmt, @@ -186,7 +186,7 @@ _nm_printf(6, 7) static void _write_handle_warn(KeyfileWriterInfo *info, cur_property, setting, kf_key); - handler_data.warn = (NMKeyfileHandlerDataWarn){ + handler_data.warn = (NMKeyfileHandlerDataWarn) { .severity = severity, .message = NULL, .fmt = fmt, @@ -915,7 +915,7 @@ _build_list_create(GKeyFile *keyfile, if (G_UNLIKELY(!build_list)) build_list = g_new(BuildListData, n_keys - i_keys); - build_list[build_list_len++] = (BuildListData){ + build_list[build_list_len++] = (BuildListData) { .s_key = s_key, .key_idx = key_idx, .key_type = key_type, @@ -2882,7 +2882,7 @@ cert_writer(KeyfileWriterInfo *info, NMSetting *setting, const char *key, const vtable->setting_key, setting, key); - handler_data.write_cert = (NMKeyfileHandlerDataWriteCert){ + handler_data.write_cert = (NMKeyfileHandlerDataWriteCert) { .vtable = vtable, }; @@ -2944,11 +2944,11 @@ struct _ParseInfoProperty { }; #define PARSE_INFO_PROPERTY(_property_name, ...) \ - (&((const ParseInfoProperty){.property_name = _property_name, __VA_ARGS__})) + (&((const ParseInfoProperty) {.property_name = _property_name, __VA_ARGS__})) -#define PARSE_INFO_PROPERTIES(...) \ - .properties = ((const ParseInfoProperty *const[]){ \ - __VA_ARGS__ NULL, \ +#define PARSE_INFO_PROPERTIES(...) \ + .properties = ((const ParseInfoProperty *const[]) { \ + __VA_ARGS__ NULL, \ }) typedef struct { @@ -2956,7 +2956,7 @@ typedef struct { } ParseInfoSetting; #define PARSE_INFO_SETTING(setting_type, ...) \ - [setting_type] = (&((const ParseInfoSetting){__VA_ARGS__})) + [setting_type] = (&((const ParseInfoSetting) {__VA_ARGS__})) static const ParseInfoSetting *const parse_infos[_NM_META_SETTING_TYPE_NUM] = { PARSE_INFO_SETTING( @@ -3950,7 +3950,7 @@ nm_keyfile_read(GKeyFile *keyfile, connection = nm_simple_connection_new(); - info = (KeyfileReaderInfo){ + info = (KeyfileReaderInfo) { .connection = connection, .keyfile = keyfile, .base_dir = base_dir, @@ -4084,7 +4084,7 @@ write_setting_value(KeyfileWriterInfo *info, NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST)) return; - value = (GValue){0}; + value = (GValue) {0}; g_value_init(&value, G_PARAM_SPEC_VALUE_TYPE(property_info->param_spec)); g_object_get_property(G_OBJECT(setting), property_info->param_spec->name, &value); @@ -4304,7 +4304,7 @@ nm_keyfile_write(NMConnection *connection, keyfile = g_key_file_new(); - info = (KeyfileWriterInfo){ + info = (KeyfileWriterInfo) { .connection = connection, .keyfile = keyfile, .error = NULL, diff --git a/src/libnm-core-impl/nm-meta-setting-base-impl.c b/src/libnm-core-impl/nm-meta-setting-base-impl.c index c8b77bf32..37cb61f17 100644 --- a/src/libnm-core-impl/nm-meta-setting-base-impl.c +++ b/src/libnm-core-impl/nm-meta-setting-base-impl.c @@ -831,7 +831,7 @@ again: for (i = 0; i < _NM_META_SETTING_TYPE_NUM; i++) { const NMMetaSettingInfo *m = &nm_meta_setting_infos[i]; - static_array[i] = (LookupData){ + static_array[i] = (LookupData) { .gtype = m->get_setting_gtype(), .setting_info = m, }; diff --git a/src/libnm-core-impl/nm-setting-bridge.c b/src/libnm-core-impl/nm-setting-bridge.c index 7e9a09649..c16184349 100644 --- a/src/libnm-core-impl/nm-setting-bridge.c +++ b/src/libnm-core-impl/nm-setting-bridge.c @@ -151,7 +151,7 @@ nm_bridge_vlan_new(guint16 vid_start, guint16 vid_end) g_return_val_if_fail(vid_start <= vid_end, NULL); vlan = g_slice_new(NMBridgeVlan); - *vlan = (NMBridgeVlan){ + *vlan = (NMBridgeVlan) { .refcount = 1, .vid_start = vid_start, .vid_end = vid_end, diff --git a/src/libnm-core-impl/nm-setting-connection.c b/src/libnm-core-impl/nm-setting-connection.c index 3298dce60..fb38fa517 100644 --- a/src/libnm-core-impl/nm-setting-connection.c +++ b/src/libnm-core-impl/nm-setting-connection.c @@ -139,7 +139,7 @@ _permission_set_stale(Permission *permission, PermType ptype, char *item_take) /* we don't inspect (clear) permission before setting. It takes a * stale instance. */ - *permission = (Permission){ + *permission = (Permission) { .ptype = ptype, .item = item_take, }; diff --git a/src/libnm-core-impl/nm-setting-ip-config.c b/src/libnm-core-impl/nm-setting-ip-config.c index e79f25a86..ebc60e6cf 100644 --- a/src/libnm-core-impl/nm-setting-ip-config.c +++ b/src/libnm-core-impl/nm-setting-ip-config.c @@ -175,7 +175,7 @@ nm_ip_address_new(int family, const char *addr, guint prefix, GError **error) return NULL; address = g_slice_new(NMIPAddress); - *address = (NMIPAddress){ + *address = (NMIPAddress) { .refcount = 1, .family = family, .address = canonicalize_ip_binary(family, &addr_bin, FALSE), @@ -210,7 +210,7 @@ nm_ip_address_new_binary(int family, gconstpointer addr, guint prefix, GError ** return NULL; address = g_slice_new(NMIPAddress); - *address = (NMIPAddress){ + *address = (NMIPAddress) { .refcount = 1, .family = family, .address = nm_inet_ntop_dup(family, addr), @@ -637,7 +637,7 @@ nm_ip_route_new(int family, return NULL; route = g_slice_new(NMIPRoute); - *route = (NMIPRoute){ + *route = (NMIPRoute) { .refcount = 1, .family = family, .dest = canonicalize_ip_binary(family, &dest_bin, FALSE), @@ -683,7 +683,7 @@ nm_ip_route_new_binary(int family, return NULL; route = g_slice_new0(NMIPRoute); - *route = (NMIPRoute){ + *route = (NMIPRoute) { .refcount = 1, .family = family, .dest = canonicalize_ip_binary(family, dest, FALSE), @@ -1655,7 +1655,7 @@ nm_ip_routing_rule_new(int addr_family) g_return_val_if_fail(NM_IN_SET(addr_family, AF_INET, AF_INET6), NULL); self = g_slice_new(NMIPRoutingRule); - *self = (NMIPRoutingRule){ + *self = (NMIPRoutingRule) { .ref_count = 1, .is_v4 = (addr_family == AF_INET), .action = FR_ACT_TO_TBL, @@ -1685,7 +1685,7 @@ nm_ip_routing_rule_new_clone(const NMIPRoutingRule *rule) g_return_val_if_fail(NM_IS_IP_ROUTING_RULE(rule, TRUE), NULL); self = g_slice_new(NMIPRoutingRule); - *self = (NMIPRoutingRule){ + *self = (NMIPRoutingRule) { .ref_count = 1, .sealed = FALSE, .is_v4 = rule->is_v4, diff --git a/src/libnm-core-impl/nm-setting-private.h b/src/libnm-core-impl/nm-setting-private.h index da7fdbb70..0b27d4ec3 100644 --- a/src/libnm-core-impl/nm-setting-private.h +++ b/src/libnm-core-impl/nm-setting-private.h @@ -482,7 +482,7 @@ void _nm_setting_class_commit(NMSettingClass *setting_class, &_g; \ }) -#define NM_SETT_INFO_SETT_DETAIL(...) (&((const NMSettInfoSettDetail){__VA_ARGS__})) +#define NM_SETT_INFO_SETT_DETAIL(...) (&((const NMSettInfoSettDetail) {__VA_ARGS__})) #define NM_SETT_INFO_PROPERT_TYPE_DBUS_INIT(_dbus_type, ...) {.dbus_type = _dbus_type, __VA_ARGS__} @@ -504,7 +504,7 @@ void _nm_setting_class_commit(NMSettingClass *setting_class, #define NM_SETT_INFO_PROPERT_TYPE_GPROP(_dbus_type, ...) \ NM_SETT_INFO_PROPERT_TYPE(NM_SETT_INFO_PROPERT_TYPE_GPROP_INIT(_dbus_type, __VA_ARGS__)) -#define NM_SETT_INFO_PROPERTY(...) (&((const NMSettInfoProperty){__VA_ARGS__})) +#define NM_SETT_INFO_PROPERTY(...) (&((const NMSettInfoProperty) {__VA_ARGS__})) gboolean _nm_properties_override_assert(const NMSettInfoProperty *prop_info); diff --git a/src/libnm-core-impl/nm-setting-sriov.c b/src/libnm-core-impl/nm-setting-sriov.c index 145c2b141..4dc61d823 100644 --- a/src/libnm-core-impl/nm-setting-sriov.c +++ b/src/libnm-core-impl/nm-setting-sriov.c @@ -103,7 +103,7 @@ nm_sriov_vf_new(guint index) NMSriovVF *vf; vf = g_slice_new(NMSriovVF); - *vf = (NMSriovVF){ + *vf = (NMSriovVF) { .refcount = 1, .index = index, .attributes = g_hash_table_new_full(nm_str_hash, @@ -223,7 +223,7 @@ vf_add_vlan(NMSriovVF *vf, guint vlan_id, guint qos, NMSriovVFVlanProtocol proto VFVlan *vlan; vlan = g_slice_new(VFVlan); - *vlan = (VFVlan){ + *vlan = (VFVlan) { .id = vlan_id, .qos = qos, .protocol = protocol, diff --git a/src/libnm-core-impl/nm-setting-vlan.c b/src/libnm-core-impl/nm-setting-vlan.c index 3a1f09301..5cb2470cd 100644 --- a/src/libnm-core-impl/nm-setting-vlan.c +++ b/src/libnm-core-impl/nm-setting-vlan.c @@ -130,7 +130,7 @@ priority_map_new(guint32 from, guint32 to) NMVlanQosMapping *mapping; mapping = g_new(NMVlanQosMapping, 1); - *mapping = (NMVlanQosMapping){ + *mapping = (NMVlanQosMapping) { .from = from, .to = to, }; diff --git a/src/libnm-core-impl/nm-setting-wired.c b/src/libnm-core-impl/nm-setting-wired.c index 2c8562d3c..e02c0a066 100644 --- a/src/libnm-core-impl/nm-setting-wired.c +++ b/src/libnm-core-impl/nm-setting-wired.c @@ -810,7 +810,7 @@ nm_setting_wired_add_s390_option(NMSettingWired *setting, const char *key, const &priv->s390_options.arr[dst_idx], (priv->s390_options.len - dst_idx) * sizeof(NMUtilsNamedValue)); } - priv->s390_options.arr[dst_idx] = (NMUtilsNamedValue){ + priv->s390_options.arr[dst_idx] = (NMUtilsNamedValue) { .name = g_strdup(key), .value_str = g_strdup(value), }; @@ -1253,7 +1253,7 @@ set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *ps nm_assert(priv->s390_options.len < priv->s390_options.n_alloc); - priv->s390_options.arr[priv->s390_options.len] = (NMUtilsNamedValue){ + priv->s390_options.arr[priv->s390_options.len] = (NMUtilsNamedValue) { .name = g_strdup(key), .value_str = g_strdup(val), }; diff --git a/src/libnm-core-impl/nm-setting-wireguard.c b/src/libnm-core-impl/nm-setting-wireguard.c index 4f96f7421..668af1f6e 100644 --- a/src/libnm-core-impl/nm-setting-wireguard.c +++ b/src/libnm-core-impl/nm-setting-wireguard.c @@ -77,7 +77,7 @@ nm_wireguard_peer_new(void) NMWireGuardPeer *self; self = g_slice_new(NMWireGuardPeer); - *self = (NMWireGuardPeer){ + *self = (NMWireGuardPeer) { .refcount = 1, .preshared_key_flags = NM_SETTING_SECRET_FLAG_NOT_REQUIRED, }; @@ -104,7 +104,7 @@ nm_wireguard_peer_new_clone(const NMWireGuardPeer *self, gboolean with_secrets) g_return_val_if_fail(NM_IS_WIREGUARD_PEER(self, TRUE), NULL); new = g_slice_new(NMWireGuardPeer); - *new = (NMWireGuardPeer){ + *new = (NMWireGuardPeer) { .refcount = 1, .public_key = g_strdup(self->public_key), .public_key_valid = self->public_key_valid, @@ -1310,7 +1310,7 @@ _peers_set(NMSettingWireGuardPrivate *priv, if (!pd_same_key) pd_same_key = g_slice_new(PeerData); - *pd_same_key = (PeerData){ + *pd_same_key = (PeerData) { .peer = peer, .public_key = public_key, .idx = priv->peers_arr->len, diff --git a/src/libnm-core-impl/nm-setting.c b/src/libnm-core-impl/nm-setting.c index ed34db76f..98424c76f 100644 --- a/src/libnm-core-impl/nm-setting.c +++ b/src/libnm-core-impl/nm-setting.c @@ -446,7 +446,7 @@ _nm_setting_class_commit(NMSettingClass *setting_class, const NMSettInfoProperty *property_info = &sett_info->property_infos[j]; if (property_info->param_spec) { - *(lookup_by_iter++) = (NMSettInfoPropertLookupByParamSpec){ + *(lookup_by_iter++) = (NMSettInfoPropertLookupByParamSpec) { .param_spec_as_uint = (uintptr_t) ((gpointer) property_info->param_spec), .property_info = property_info, }; @@ -4346,7 +4346,7 @@ nm_range_new(guint64 start, guint64 end) g_return_val_if_fail(start <= end, NULL); range = g_slice_new(NMRange); - *range = (NMRange){ + *range = (NMRange) { .refcount = 1, .start = start, .end = end, diff --git a/src/libnm-core-impl/nm-team-utils.c b/src/libnm-core-impl/nm-team-utils.c index 6e7f85c7e..8e1cdd64d 100644 --- a/src/libnm-core-impl/nm-team-utils.c +++ b/src/libnm-core-impl/nm-team-utils.c @@ -692,9 +692,9 @@ _team_setting_has_fields_any_v(const NMTeamSetting *self, return FALSE; } -#define _team_setting_has_fields_any(self, ...) \ - _team_setting_has_fields_any_v((self), \ - ((const NMTeamAttribute[]){__VA_ARGS__}), \ +#define _team_setting_has_fields_any(self, ...) \ + _team_setting_has_fields_any_v((self), \ + ((const NMTeamAttribute[]) {__VA_ARGS__}), \ NM_NARG(__VA_ARGS__)) static void diff --git a/src/libnm-core-impl/nm-utils-private.h b/src/libnm-core-impl/nm-utils-private.h index 1521c0f92..da442511f 100644 --- a/src/libnm-core-impl/nm-utils-private.h +++ b/src/libnm-core-impl/nm-utils-private.h @@ -14,7 +14,7 @@ #include "nm-setting-ip-config.h" #define NM_VARIANT_ATTRIBUTE_SPEC_DEFINE(_name, _type, ...) \ - (&((const NMVariantAttributeSpec){.name = _name, .type = _type, __VA_ARGS__})) + (&((const NMVariantAttributeSpec) {.name = _name, .type = _type, __VA_ARGS__})) gboolean _nm_utils_string_slist_validate(GSList *list, const char **valid_values); diff --git a/src/libnm-core-impl/nm-utils.c b/src/libnm-core-impl/nm-utils.c index f7f4e770a..06a96318a 100644 --- a/src/libnm-core-impl/nm-utils.c +++ b/src/libnm-core-impl/nm-utils.c @@ -305,14 +305,14 @@ nm_sock_addr_endpoint_get_fixed_sockaddr(NMSockAddrEndpoint *self, gpointer sock good: switch (addr_family) { case AF_INET: - *((struct sockaddr_in *) sockaddr) = (struct sockaddr_in){ + *((struct sockaddr_in *) sockaddr) = (struct sockaddr_in) { .sin_family = AF_INET, .sin_addr = addrbin.addr4_struct, .sin_port = htons(self->port), }; return TRUE; case AF_INET6: - *((struct sockaddr_in6 *) sockaddr) = (struct sockaddr_in6){ + *((struct sockaddr_in6 *) sockaddr) = (struct sockaddr_in6) { .sin6_family = AF_INET6, .sin6_addr = addrbin.addr6, .sin6_port = htons(self->port), @@ -2719,9 +2719,9 @@ typedef struct { } NMQdiscAttributeSpec; static const NMQdiscAttributeSpec *const tc_qdisc_attribute_spec[] = { - &(const NMQdiscAttributeSpec){"fq_codel", tc_qdisc_fq_codel_spec}, - &(const NMQdiscAttributeSpec){"sfq", tc_qdisc_sfq_spec}, - &(const NMQdiscAttributeSpec){"tbf", tc_qdisc_tbf_spec}, + &(const NMQdiscAttributeSpec) {"fq_codel", tc_qdisc_fq_codel_spec}, + &(const NMQdiscAttributeSpec) {"sfq", tc_qdisc_sfq_spec}, + &(const NMQdiscAttributeSpec) {"tbf", tc_qdisc_tbf_spec}, NULL, }; diff --git a/src/libnm-core-impl/tests/test-general.c b/src/libnm-core-impl/tests/test-general.c index 8d4ea069c..7de1e2f3e 100644 --- a/src/libnm-core-impl/tests/test-general.c +++ b/src/libnm-core-impl/tests/test-general.c @@ -560,13 +560,13 @@ test_nm_hash(void) g_assert_cmpmem(NM_HASH_SEED_16(55, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15), 16, - ((guint8[16]){55, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}), + ((guint8[16]) {55, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}), 16); - g_assert_cmpmem(NM_HASH_SEED_16_U64(1), 16, ((guint8[16]){0, 0, 0, 0, 0, 0, 0, 1, 0}), 16); + g_assert_cmpmem(NM_HASH_SEED_16_U64(1), 16, ((guint8[16]) {0, 0, 0, 0, 0, 0, 0, 1, 0}), 16); g_assert_cmpmem(NM_HASH_SEED_16_U64(0x1234567890ABCDEFu), 16, - ((guint8[16]){0x12, 0x34, 0x56, 0x78, 0x90, 0xAB, 0xCD, 0xEF, 0}), + ((guint8[16]) {0x12, 0x34, 0x56, 0x78, 0x90, 0xAB, 0xCD, 0xEF, 0}), 16); g_assert_cmpint(c_siphash_hash(NM_HASH_SEED_16_U64(0x780E21E45489CC6Fu), (guint8 *) "foo", 3), @@ -1702,7 +1702,7 @@ static const NMDedupMultiObjClass dedup_obj_class = { }; #define DEDUP_OBJ_INIT(val_val, other_other) \ - (&((DedupObj){ \ + (&((DedupObj) { \ .parent = \ { \ .klass = &dedup_obj_class, \ @@ -1904,7 +1904,7 @@ _dedup_entry_assert_all(const NMDedupMultiEntry *entry, } } #define _dedup_entry_assert_all(entry, expected_idx, ...) \ - _dedup_entry_assert_all(entry, expected_idx, (const DedupObj *const[]){__VA_ARGS__, NULL}) + _dedup_entry_assert_all(entry, expected_idx, (const DedupObj *const[]) {__VA_ARGS__, NULL}) static void test_dedup_multi(void) @@ -10613,7 +10613,7 @@ test_integrate_maincontext(gconstpointer test_data) loop1 = g_main_loop_new(c1, FALSE); - d = (IntegData){ + d = (IntegData) { .loop1 = loop1, .c2 = c2, }; diff --git a/src/libnm-core-impl/tests/test-keyfile.c b/src/libnm-core-impl/tests/test-keyfile.c index 1912782e2..5c66196c7 100644 --- a/src/libnm-core-impl/tests/test-keyfile.c +++ b/src/libnm-core-impl/tests/test-keyfile.c @@ -943,7 +943,7 @@ test_invalid_option(void) nm_setting_option_set_boolean(s_ethtool, NM_ETHTOOL_OPTNAME_PAUSE_RX, TRUE); - data = (InvalidOptionWriteData){}; + data = (InvalidOptionWriteData) {}; kf = nm_keyfile_write(con, NM_KEYFILE_HANDLER_FLAGS_NONE, _invalid_option_write_handler, @@ -956,7 +956,7 @@ test_invalid_option(void) nmtst_assert_connection_verifies_without_normalization(con); - data = (InvalidOptionWriteData){}; + data = (InvalidOptionWriteData) {}; kf = nm_keyfile_write(con, NM_KEYFILE_HANDLER_FLAGS_NONE, _invalid_option_write_handler, @@ -967,7 +967,7 @@ test_invalid_option(void) nm_setting_option_set(s_ethtool, "bogus", g_variant_new_int64(0)); - data = (InvalidOptionWriteData){ + data = (InvalidOptionWriteData) { .expect = TRUE, }; kf = nm_keyfile_write(con, diff --git a/src/libnm-core-impl/tests/test-setting.c b/src/libnm-core-impl/tests/test-setting.c index f33091664..55acbe94c 100644 --- a/src/libnm-core-impl/tests/test-setting.c +++ b/src/libnm-core-impl/tests/test-setting.c @@ -799,29 +799,29 @@ static void test_bond_compare(void) { test_bond_compare_options(TRUE, - ((const char *[]){"mode", "balance-rr", "miimon", "1", NULL}), - ((const char *[]){"mode", "balance-rr", "miimon", "1", NULL})); + ((const char *[]) {"mode", "balance-rr", "miimon", "1", NULL}), + ((const char *[]) {"mode", "balance-rr", "miimon", "1", NULL})); test_bond_compare_options(FALSE, - ((const char *[]){"mode", "balance-rr", "miimon", "1", NULL}), - ((const char *[]){"mode", "balance-rr", "miimon", "2", NULL})); + ((const char *[]) {"mode", "balance-rr", "miimon", "1", NULL}), + ((const char *[]) {"mode", "balance-rr", "miimon", "2", NULL})); test_bond_compare_options(FALSE, - ((const char *[]){"miimon", "1", NULL}), - ((const char *[]){"miimon", "1", "updelay", "0", NULL})); + ((const char *[]) {"miimon", "1", NULL}), + ((const char *[]) {"miimon", "1", "updelay", "0", NULL})); test_bond_compare_options(FALSE, - ((const char *[]){"num_grat_arp", "2", NULL}), - ((const char *[]){"num_grat_arp", "1", NULL})); + ((const char *[]) {"num_grat_arp", "2", NULL}), + ((const char *[]) {"num_grat_arp", "1", NULL})); test_bond_compare_options(FALSE, - ((const char *[]){"num_grat_arp", "3", NULL}), - ((const char *[]){"num_unsol_na", "3", NULL})); + ((const char *[]) {"num_grat_arp", "3", NULL}), + ((const char *[]) {"num_unsol_na", "3", NULL})); test_bond_compare_options(FALSE, - ((const char *[]){"num_grat_arp", "4", NULL}), - ((const char *[]){"num_unsol_na", "4", "num_grat_arp", "4", NULL})); + ((const char *[]) {"num_grat_arp", "4", NULL}), + ((const char *[]) {"num_unsol_na", "4", "num_grat_arp", "4", NULL})); test_bond_compare_options(FALSE, - ((const char *[]){"mode", "balance-rr", "miimon", "100", NULL}), - ((const char *[]){"mode", "balance-rr", NULL})); + ((const char *[]) {"mode", "balance-rr", "miimon", "100", NULL}), + ((const char *[]) {"mode", "balance-rr", NULL})); } static void @@ -856,20 +856,25 @@ static void test_bond_normalize(void) { test_bond_normalize_options( - ((const char *[]){"mode", "802.3ad", "ad_actor_system", "00:02:03:04:05:06", NULL}), - ((const char *[]){"mode", "802.3ad", "ad_actor_system", "00:02:03:04:05:06", NULL})); - test_bond_normalize_options(((const char *[]){"mode", "1", "miimon", "1", NULL}), - ((const char *[]){"mode", "active-backup", "miimon", "1", NULL})); + ((const char *[]) {"mode", "802.3ad", "ad_actor_system", "00:02:03:04:05:06", NULL}), + ((const char *[]) {"mode", "802.3ad", "ad_actor_system", "00:02:03:04:05:06", NULL})); + test_bond_normalize_options(((const char *[]) {"mode", "1", "miimon", "1", NULL}), + ((const char *[]) {"mode", "active-backup", "miimon", "1", NULL})); test_bond_normalize_options( - ((const char *[]){"mode", "balance-alb", "tlb_dynamic_lb", "1", NULL}), - ((const char *[]){"mode", "balance-alb", "tlb_dynamic_lb", "1", NULL})); + ((const char *[]) {"mode", "balance-alb", "tlb_dynamic_lb", "1", NULL}), + ((const char *[]) {"mode", "balance-alb", "tlb_dynamic_lb", "1", NULL})); test_bond_normalize_options( - ((const char *[]){"mode", "balance-tlb", "tlb_dynamic_lb", "1", NULL}), - ((const char *[]){"mode", "balance-tlb", "tlb_dynamic_lb", "1", NULL})); + ((const char *[]) {"mode", "balance-tlb", "tlb_dynamic_lb", "1", NULL}), + ((const char *[]) {"mode", "balance-tlb", "tlb_dynamic_lb", "1", NULL})); test_bond_normalize_options( - ((const char - *[]){"mode", "balance-rr", "ad_actor_sys_prio", "4", "packets_per_slave", "3", NULL}), - ((const char *[]){"mode", "balance-rr", "packets_per_slave", "3", NULL})); + ((const char *[]) {"mode", + "balance-rr", + "ad_actor_sys_prio", + "4", + "packets_per_slave", + "3", + NULL}), + ((const char *[]) {"mode", "balance-rr", "packets_per_slave", "3", NULL})); } /*****************************************************************************/ diff --git a/src/libnm-glib-aux/nm-dbus-aux.c b/src/libnm-glib-aux/nm-dbus-aux.c index 5c4dbc492..1be4047e2 100644 --- a/src/libnm-glib-aux/nm-dbus-aux.c +++ b/src/libnm-glib-aux/nm-dbus-aux.c @@ -382,7 +382,7 @@ nm_dbus_call(GBusType bus_type, CallAsyncInfo *info; info = g_new(CallAsyncInfo, 1); - *info = (CallAsyncInfo){ + *info = (CallAsyncInfo) { .bus_name = g_strdup(bus_name), .object_path = g_strdup(object_path), .interface_name = g_strdup(interface_name), diff --git a/src/libnm-glib-aux/nm-dedup-multi.c b/src/libnm-glib-aux/nm-dedup-multi.c index cf2dba90b..c80b17ceb 100644 --- a/src/libnm-glib-aux/nm-dedup-multi.c +++ b/src/libnm-glib-aux/nm-dedup-multi.c @@ -54,7 +54,7 @@ nm_dedup_multi_idx_type_init(NMDedupMultiIdxType *idx_type, const NMDedupMultiId nm_assert(idx_type); nm_assert(klass); - *idx_type = (NMDedupMultiIdxType){ + *idx_type = (NMDedupMultiIdxType) { .klass = klass, .lst_idx_head = C_LIST_INIT(idx_type->lst_idx_head), }; @@ -1005,7 +1005,7 @@ nm_dedup_multi_index_new(void) NMDedupMultiIndex *self; self = g_slice_new(NMDedupMultiIndex); - *self = (NMDedupMultiIndex){ + *self = (NMDedupMultiIndex) { .ref_count = 1, .idx_entries = g_hash_table_new((GHashFunc) _dict_idx_entries_hash, (GEqualFunc) _dict_idx_entries_equal), diff --git a/src/libnm-glib-aux/nm-hash-utils.h b/src/libnm-glib-aux/nm-hash-utils.h index 703c00a40..6d7cc271b 100644 --- a/src/libnm-glib-aux/nm-hash-utils.h +++ b/src/libnm-glib-aux/nm-hash-utils.h @@ -12,7 +12,7 @@ /*****************************************************************************/ #define NM_HASH_SEED_16(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, aa, ab, ac, ad, ae, af) \ - ((const guint8[16]){a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, aa, ab, ac, ad, ae, af}) + ((const guint8[16]) {a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, aa, ab, ac, ad, ae, af}) struct _nm_packed _nm_hash_seed_16_u64_data { guint64 s1; @@ -29,11 +29,11 @@ G_STATIC_ASSERT(sizeof(struct _nm_hash_seed_16_u64_data) == sizeof(guint64) * 2) * This macro takes a u64 (in host-endianness) and returns a 16 byte seed * buffer. The number will be big endian encoded, to be architecture * independent. */ -#define NM_HASH_SEED_16_U64(u64) \ - ((const guint8 *) ((gpointer) \ - & ((struct _nm_hash_seed_16_u64_data){ \ - .s1 = htobe64((u64)), \ - .s2 = 0, \ +#define NM_HASH_SEED_16_U64(u64) \ + ((const guint8 *) ((gpointer) \ + & ((struct _nm_hash_seed_16_u64_data) { \ + .s1 = htobe64((u64)), \ + .s2 = 0, \ }))) /*****************************************************************************/ @@ -212,10 +212,10 @@ nm_hash_update_str(NMHashState *state, const char *str) /* Like nm_hash_update_str(), but restricted to arrays only. nm_hash_update_str() only works * with a @str argument that cannot be NULL. If you have a string pointer, that is never NULL, use * nm_hash_update() instead. */ -#define nm_hash_update_strarr(state, str) \ - (_Generic(&(str), \ - const char(*)[sizeof(str)]: nm_hash_update_str((state), (str)), \ - char(*)[sizeof(str)]: nm_hash_update_str((state), (str)))) +#define nm_hash_update_strarr(state, str) \ + (_Generic(&(str), \ + const char(*)[sizeof(str)]: nm_hash_update_str((state), (str)), \ + char(*)[sizeof(str)]: nm_hash_update_str((state), (str)))) #else #define nm_hash_update_strarr(state, str) nm_hash_update_str((state), (str)) #endif diff --git a/src/libnm-glib-aux/nm-inet-utils.h b/src/libnm-glib-aux/nm-inet-utils.h index 4bfcb4ba4..489d21dde 100644 --- a/src/libnm-glib-aux/nm-inet-utils.h +++ b/src/libnm-glib-aux/nm-inet-utils.h @@ -22,10 +22,7 @@ typedef struct _NMIPAddrTyped { gint8 addr_family; } NMIPAddrTyped; -#define NM_IP_ADDR_INIT \ - { \ - .addr_ptr = { 0 } \ - } +#define NM_IP_ADDR_INIT {.addr_ptr = {0}} #define _NM_IN6ADDR_INIT(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, aa, ab, ac, ad, ae, af) \ { \ diff --git a/src/libnm-glib-aux/nm-io-utils.c b/src/libnm-glib-aux/nm-io-utils.c index ec016ed8a..9443172b4 100644 --- a/src/libnm-glib-aux/nm-io-utils.c +++ b/src/libnm-glib-aux/nm-io-utils.c @@ -683,7 +683,7 @@ nm_g_subprocess_terminate_in_background(GSubprocess *subprocess, int timeout_mse main_context = g_main_context_get_thread_default(); term_data = g_slice_new(SubprocessTerminateData); - *term_data = (SubprocessTerminateData){ + *term_data = (SubprocessTerminateData) { .subprocess = g_object_ref(subprocess), .timeout_source = NULL, }; @@ -845,7 +845,7 @@ nm_sd_notify(const char *state) /* systemd calls here fd_set_sndbuf(fd, SNDBUF_SIZE) .We don't bother. */ - iovec = (struct iovec){ + iovec = (struct iovec) { .iov_base = (gpointer) state, .iov_len = strlen(state), }; diff --git a/src/libnm-glib-aux/nm-json-aux.c b/src/libnm-glib-aux/nm-json-aux.c index 6216d93cd..97172726d 100644 --- a/src/libnm-glib-aux/nm-json-aux.c +++ b/src/libnm-glib-aux/nm-json-aux.c @@ -230,7 +230,7 @@ _nm_json_vt_internal_load(void) fail_symbol: dlclose(&handle); - *v = (NMJsonVtInternal){}; + *v = (NMJsonVtInternal) {}; return v; } diff --git a/src/libnm-glib-aux/nm-macros-internal.h b/src/libnm-glib-aux/nm-macros-internal.h index 0b39271e1..151e7a4f4 100644 --- a/src/libnm-glib-aux/nm-macros-internal.h +++ b/src/libnm-glib-aux/nm-macros-internal.h @@ -218,40 +218,40 @@ NM_G_ERROR_MSG(GError *error) #if _NM_CC_SUPPORT_GENERIC #define _NM_CONSTCAST_FULL_1(type, obj_expr, obj) \ (_Generic((obj_expr), \ - const void *: ((const type *) (obj)), \ - void *: ((type *) (obj)), \ - const type *: ((const type *) (obj)), \ - type *: ((type *) (obj)))) + const void *: ((const type *) (obj)), \ + void *: ((type *) (obj)), \ + const type *: ((const type *) (obj)), \ + type *: ((type *) (obj)))) #define _NM_CONSTCAST_FULL_2(type, obj_expr, obj, alias_type2) \ (_Generic((obj_expr), \ - const void *: ((const type *) (obj)), \ - void *: ((type *) (obj)), \ - const alias_type2 *: ((const type *) (obj)), \ - alias_type2 *: ((type *) (obj)), \ - const type *: ((const type *) (obj)), \ - type *: ((type *) (obj)))) + const void *: ((const type *) (obj)), \ + void *: ((type *) (obj)), \ + const alias_type2 *: ((const type *) (obj)), \ + alias_type2 *: ((type *) (obj)), \ + const type *: ((const type *) (obj)), \ + type *: ((type *) (obj)))) #define _NM_CONSTCAST_FULL_3(type, obj_expr, obj, alias_type2, alias_type3) \ (_Generic((obj_expr), \ - const void *: ((const type *) (obj)), \ - void *: ((type *) (obj)), \ - const alias_type2 *: ((const type *) (obj)), \ - alias_type2 *: ((type *) (obj)), \ - const alias_type3 *: ((const type *) (obj)), \ - alias_type3 *: ((type *) (obj)), \ - const type *: ((const type *) (obj)), \ - type *: ((type *) (obj)))) + const void *: ((const type *) (obj)), \ + void *: ((type *) (obj)), \ + const alias_type2 *: ((const type *) (obj)), \ + alias_type2 *: ((type *) (obj)), \ + const alias_type3 *: ((const type *) (obj)), \ + alias_type3 *: ((type *) (obj)), \ + const type *: ((const type *) (obj)), \ + type *: ((type *) (obj)))) #define _NM_CONSTCAST_FULL_4(type, obj_expr, obj, alias_type2, alias_type3, alias_type4) \ (_Generic((obj_expr), \ - const void *: ((const type *) (obj)), \ - void *: ((type *) (obj)), \ - const alias_type2 *: ((const type *) (obj)), \ - alias_type2 *: ((type *) (obj)), \ - const alias_type3 *: ((const type *) (obj)), \ - alias_type3 *: ((type *) (obj)), \ - const alias_type4 *: ((const type *) (obj)), \ - alias_type4 *: ((type *) (obj)), \ - const type *: ((const type *) (obj)), \ - type *: ((type *) (obj)))) + const void *: ((const type *) (obj)), \ + void *: ((type *) (obj)), \ + const alias_type2 *: ((const type *) (obj)), \ + alias_type2 *: ((type *) (obj)), \ + const alias_type3 *: ((const type *) (obj)), \ + alias_type3 *: ((type *) (obj)), \ + const alias_type4 *: ((const type *) (obj)), \ + alias_type4 *: ((type *) (obj)), \ + const type *: ((const type *) (obj)), \ + type *: ((type *) (obj)))) #define _NM_CONSTCAST_FULL_x(type, obj_expr, obj, n, ...) \ (_NM_CONSTCAST_FULL_##n(type, obj_expr, obj, ##__VA_ARGS__)) #define _NM_CONSTCAST_FULL_y(type, obj_expr, obj, n, ...) \ @@ -335,29 +335,29 @@ NM_G_ERROR_MSG(GError *error) * These macros do the cast, but they only accept a compatible input * type, otherwise they will fail compilation. */ -#define NM_CAST_STRV_MC(value) \ - (_Generic((value), \ - const char **: (const char **) (value), \ - char **: (const char **) (value), \ - void *: (const char **) (value))) -#define NM_CAST_STRV_CC(value) \ - (_Generic((value), \ - const char *const *: (const char *const *) (value), \ - const char **: (const char *const *) (value), \ - char *const *: (const char *const *) (value), \ - char **: (const char *const *) (value), \ - const void *: (const char *const *) (value), \ - void *: (const char *const *) (value))) +#define NM_CAST_STRV_MC(value) \ + (_Generic((value), \ + const char **: (const char **) (value), \ + char **: (const char **) (value), \ + void *: (const char **) (value))) +#define NM_CAST_STRV_CC(value) \ + (_Generic((value), \ + const char *const *: (const char *const *) (value), \ + const char **: (const char *const *) (value), \ + char *const *: (const char *const *) (value), \ + char **: (const char *const *) (value), \ + const void *: (const char *const *) (value), \ + void *: (const char *const *) (value))) #else #define NM_CAST_STRV_MC(value) ((const char **) (value)) #define NM_CAST_STRV_CC(value) ((const char *const *) (value)) #endif #if _NM_CC_SUPPORT_GENERIC -#define NM_PROPAGATE_CONST(test_expr, ptr) \ - (_Generic((test_expr), \ - const typeof(*(test_expr)) *: ((const typeof(*(ptr)) *) (ptr)), \ - default: (_Generic((test_expr), typeof(*(test_expr)) *: (ptr))))) +#define NM_PROPAGATE_CONST(test_expr, ptr) \ + (_Generic((test_expr), \ + const typeof(*(test_expr)) *: ((const typeof(*(ptr)) *) (ptr)), \ + default: (_Generic((test_expr), typeof(*(test_expr)) *: (ptr))))) #else #define NM_PROPAGATE_CONST(test_expr, ptr) (ptr) #endif @@ -365,8 +365,8 @@ NM_G_ERROR_MSG(GError *error) /* with the way it is implemented, the caller may or may not pass a trailing * ',' and it will work. However, this makes the macro unsuitable for initializing * an array. */ -#define NM_MAKE_STRV(...) \ - ((const char *const[(sizeof(((const char *const[]){__VA_ARGS__})) / sizeof(const char *)) \ +#define NM_MAKE_STRV(...) \ + ((const char *const[(sizeof(((const char *const[]) {__VA_ARGS__})) / sizeof(const char *)) \ + 1]){__VA_ARGS__}) /*****************************************************************************/ diff --git a/src/libnm-glib-aux/nm-prioq.c b/src/libnm-glib-aux/nm-prioq.c index e74b2b999..1b0516448 100644 --- a/src/libnm-glib-aux/nm-prioq.c +++ b/src/libnm-glib-aux/nm-prioq.c @@ -57,7 +57,7 @@ nm_prioq_init(NMPrioq *q, GCompareFunc compare_func) nm_assert(q); nm_assert(compare_func); - *q = (NMPrioq){ + *q = (NMPrioq) { ._priv = { .compare_func = compare_func, @@ -76,7 +76,7 @@ nm_prioq_init_with_data(NMPrioq *q, GCompareDataFunc compare_func, gpointer comp nm_assert(q); nm_assert(compare_func); - *q = (NMPrioq){ + *q = (NMPrioq) { ._priv = { .compare_data_func = compare_func, @@ -223,7 +223,7 @@ nm_prioq_put(NMPrioq *q, void *data, unsigned *idx) k = q->_priv.n_items++; - q->_priv.items[k] = (PrioqItem){ + q->_priv.items[k] = (PrioqItem) { .data = data, .idx = idx, }; diff --git a/src/libnm-glib-aux/nm-secret-utils.h b/src/libnm-glib-aux/nm-secret-utils.h index c175bc8f3..dfbaa9a9e 100644 --- a/src/libnm-glib-aux/nm-secret-utils.h +++ b/src/libnm-glib-aux/nm-secret-utils.h @@ -97,19 +97,19 @@ nm_secret_ptr_clear(NMSecretPtr *secret) #define nm_auto_clear_secret_ptr nm_auto(nm_secret_ptr_clear) #define NM_SECRET_PTR_INIT() \ - ((const NMSecretPtr){ \ + ((const NMSecretPtr) { \ .len = 0, \ .ptr = NULL, \ }) -#define NM_SECRET_PTR_STATIC(_len) \ - ((const NMSecretPtr){ \ - .len = _len, \ - .ptr = ((guint8[_len]){}), \ +#define NM_SECRET_PTR_STATIC(_len) \ + ((const NMSecretPtr) { \ + .len = _len, \ + .ptr = ((guint8[_len]) {}), \ }) #define NM_SECRET_PTR_ARRAY(_arr) \ - ((const NMSecretPtr){ \ + ((const NMSecretPtr) { \ .len = G_N_ELEMENTS(_arr) * sizeof((_arr)[0]), \ .ptr = &((_arr)[0]), \ }) diff --git a/src/libnm-glib-aux/nm-shared-utils.c b/src/libnm-glib-aux/nm-shared-utils.c index c344a681e..1ca3e304e 100644 --- a/src/libnm-glib-aux/nm-shared-utils.c +++ b/src/libnm-glib-aux/nm-shared-utils.c @@ -1524,7 +1524,7 @@ _char_lookup_table_set_all(CharLookupTable *lookup, const char *candidates) static void _char_lookup_table_init(CharLookupTable *lookup, const char *candidates) { - *lookup = (CharLookupTable){ + *lookup = (CharLookupTable) { .table = {0}, }; if (candidates) @@ -3720,7 +3720,7 @@ nm_utils_hashtable_cmp(const GHashTable *a, g_hash_table_iter_init(&h, hash_a); while (g_hash_table_iter_next(&h, &i_key, &i_val)) { nm_assert(i < size); - cmp_array_a[i++] = (HashTableCmpData){ + cmp_array_a[i++] = (HashTableCmpData) { .key = i_key, .val = i_val, }; @@ -3731,7 +3731,7 @@ nm_utils_hashtable_cmp(const GHashTable *a, g_hash_table_iter_init(&h, hash_b); while (g_hash_table_iter_next(&h, &i_key, &i_val)) { nm_assert(i < size); - cmp_array_b[i++] = (HashTableCmpData){ + cmp_array_b[i++] = (HashTableCmpData) { .key = i_key, .val = i_val, }; @@ -3742,7 +3742,7 @@ nm_utils_hashtable_cmp(const GHashTable *a, size, sizeof(HashTableCmpData), _hashtable_cmp_func, - &((HashTableUserData){ + &((HashTableUserData) { .cmp_keys = cmp_keys, .user_data = user_data, })); @@ -3751,7 +3751,7 @@ nm_utils_hashtable_cmp(const GHashTable *a, size, sizeof(HashTableCmpData), _hashtable_cmp_func, - &((HashTableUserData){ + &((HashTableUserData) { .cmp_keys = cmp_keys, .user_data = user_data, })); @@ -4499,7 +4499,7 @@ _nm_utils_invoke_on_idle_start(gboolean use_timeout, g_return_if_fail(callback); data = g_slice_new(InvokeOnIdleData); - *data = (InvokeOnIdleData){ + *data = (InvokeOnIdleData) { .callback = callback, .callback_user_data = callback_user_data, .cancellable = nm_g_object_ref(cancellable), @@ -5287,7 +5287,7 @@ _ctx_integ_source_prepare(GSource *source, int *out_timeout) if (G_UNLIKELY(!poll_data)) { poll_data = g_slice_new(PollData); - *poll_data = (PollData){ + *poll_data = (PollData) { .fd = fd->fd, .idx.one = i, .has_many_idx = FALSE, @@ -7305,7 +7305,7 @@ nm_utils_poll(int poll_timeout_ms, PollTaskData *poll_task_data; poll_task_data = g_slice_new(PollTaskData); - *poll_task_data = (PollTaskData){ + *poll_task_data = (PollTaskData) { .task = nm_g_task_new(NULL, cancellable, nm_utils_poll, callback, user_data), .probe_start_fcn = probe_start_fcn, .probe_finish_fcn = probe_finish_fcn, diff --git a/src/libnm-glib-aux/nm-shared-utils.h b/src/libnm-glib-aux/nm-shared-utils.h index 93be743fb..ff855784e 100644 --- a/src/libnm-glib-aux/nm-shared-utils.h +++ b/src/libnm-glib-aux/nm-shared-utils.h @@ -278,12 +278,7 @@ typedef struct _NMUtilsIPv6IfaceId { }; } NMUtilsIPv6IfaceId; -#define NM_UTILS_IPV6_IFACE_ID_INIT \ - { \ - { \ - .id = 0 \ - } \ - } +#define NM_UTILS_IPV6_IFACE_ID_INIT {{.id = 0}} /** * nm_utils_ipv6_addr_set_interface_identifier: @@ -2427,28 +2422,28 @@ int nm_utils_fd_read_loop_exact(int fd, void *buf, size_t nbytes, bool do_po /*****************************************************************************/ #define NM_DEFINE_GDBUS_ARG_INFO_FULL(name_, ...) \ - ((GDBusArgInfo *) (&((const GDBusArgInfo){.ref_count = -1, .name = name_, __VA_ARGS__}))) + ((GDBusArgInfo *) (&((const GDBusArgInfo) {.ref_count = -1, .name = name_, __VA_ARGS__}))) #define NM_DEFINE_GDBUS_ARG_INFO(name_, a_signature) \ NM_DEFINE_GDBUS_ARG_INFO_FULL(name_, .signature = a_signature, ) -#define NM_DEFINE_GDBUS_ARG_INFOS(...) \ - ((GDBusArgInfo **) ((const GDBusArgInfo *[]){ \ - __VA_ARGS__ NULL, \ +#define NM_DEFINE_GDBUS_ARG_INFOS(...) \ + ((GDBusArgInfo **) ((const GDBusArgInfo *[]) { \ + __VA_ARGS__ NULL, \ })) #define NM_DEFINE_GDBUS_PROPERTY_INFO(name_, ...) \ ((GDBusPropertyInfo *) (&( \ - (const GDBusPropertyInfo){.ref_count = -1, .name = name_, __VA_ARGS__}))) + (const GDBusPropertyInfo) {.ref_count = -1, .name = name_, __VA_ARGS__}))) #define NM_DEFINE_GDBUS_PROPERTY_INFO_READABLE(name_, m_signature) \ NM_DEFINE_GDBUS_PROPERTY_INFO(name_, \ .signature = m_signature, \ .flags = G_DBUS_PROPERTY_INFO_FLAGS_READABLE, ) -#define NM_DEFINE_GDBUS_PROPERTY_INFOS(...) \ - ((GDBusPropertyInfo **) ((const GDBusPropertyInfo *[]){ \ - __VA_ARGS__ NULL, \ +#define NM_DEFINE_GDBUS_PROPERTY_INFOS(...) \ + ((GDBusPropertyInfo **) ((const GDBusPropertyInfo *[]) { \ + __VA_ARGS__ NULL, \ })) #define NM_DEFINE_GDBUS_SIGNAL_INFO_INIT(name_, ...) {.ref_count = -1, .name = name_, __VA_ARGS__} @@ -2457,9 +2452,9 @@ int nm_utils_fd_read_loop_exact(int fd, void *buf, size_t nbytes, bool do_po ((GDBusSignalInfo *) (&( \ (const GDBusSignalInfo) NM_DEFINE_GDBUS_SIGNAL_INFO_INIT(name_, __VA_ARGS__)))) -#define NM_DEFINE_GDBUS_SIGNAL_INFOS(...) \ - ((GDBusSignalInfo **) ((const GDBusSignalInfo *[]){ \ - __VA_ARGS__ NULL, \ +#define NM_DEFINE_GDBUS_SIGNAL_INFOS(...) \ + ((GDBusSignalInfo **) ((const GDBusSignalInfo *[]) { \ + __VA_ARGS__ NULL, \ })) #define NM_DEFINE_GDBUS_METHOD_INFO_INIT(name_, ...) {.ref_count = -1, .name = name_, __VA_ARGS__} @@ -2468,9 +2463,9 @@ int nm_utils_fd_read_loop_exact(int fd, void *buf, size_t nbytes, bool do_po ((GDBusMethodInfo *) (&( \ (const GDBusMethodInfo) NM_DEFINE_GDBUS_METHOD_INFO_INIT(name_, __VA_ARGS__)))) -#define NM_DEFINE_GDBUS_METHOD_INFOS(...) \ - ((GDBusMethodInfo **) ((const GDBusMethodInfo *[]){ \ - __VA_ARGS__ NULL, \ +#define NM_DEFINE_GDBUS_METHOD_INFOS(...) \ + ((GDBusMethodInfo **) ((const GDBusMethodInfo *[]) { \ + __VA_ARGS__ NULL, \ })) #define NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(name_, ...) \ @@ -2481,7 +2476,7 @@ int nm_utils_fd_read_loop_exact(int fd, void *buf, size_t nbytes, bool do_po (const GDBusInterfaceInfo) NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(name_, __VA_ARGS__)))) #define NM_DEFINE_GDBUS_INTERFACE_VTABLE(...) \ - ((GDBusInterfaceVTable *) (&((const GDBusInterfaceVTable){__VA_ARGS__}))) + ((GDBusInterfaceVTable *) (&((const GDBusInterfaceVTable) {__VA_ARGS__}))) /*****************************************************************************/ @@ -2503,7 +2498,7 @@ typedef struct _NMUtilsUserData NMUtilsUserData; NMUtilsUserData *_nm_utils_user_data_pack(int nargs, gconstpointer *args); #define nm_utils_user_data_pack(...) \ - _nm_utils_user_data_pack(NM_NARG(__VA_ARGS__), (gconstpointer[]){__VA_ARGS__}) + _nm_utils_user_data_pack(NM_NARG(__VA_ARGS__), (gconstpointer[]) {__VA_ARGS__}) void _nm_utils_user_data_unpack(NMUtilsUserData *user_data, int nargs, ...); diff --git a/src/libnm-glib-aux/nm-test-utils.h b/src/libnm-glib-aux/nm-test-utils.h index 2a6a5d3a5..feb86301c 100644 --- a/src/libnm-glib-aux/nm-test-utils.h +++ b/src/libnm-glib-aux/nm-test-utils.h @@ -1002,7 +1002,7 @@ _nmtst_add_test_func_full(const char *testpath, data = g_malloc(G_STRUCT_OFFSET(NmtstTestData, args) + (sizeof(gpointer) * (n_args + 1u) + testpath_len)); - *data = (NmtstTestData){ + *data = (NmtstTestData) { .testpath = (gpointer) &data->args[n_args + 1u], ._func_test = func_test, ._func_setup = func_setup, diff --git a/src/libnm-glib-aux/nm-uuid.h b/src/libnm-glib-aux/nm-uuid.h index b89554520..3613902f6 100644 --- a/src/libnm-glib-aux/nm-uuid.h +++ b/src/libnm-glib-aux/nm-uuid.h @@ -7,13 +7,13 @@ typedef struct _NMUuid { guint8 uuid[16]; } NMUuid; -#define NM_UUID_INIT_ZERO() ((NMUuid){.uuid = {0}}) +#define NM_UUID_INIT_ZERO() ((NMUuid) {.uuid = {0}}) /* Beware, the 16 macro arguments are two hex-digits, not plain numbers. The macro * will automatically add the "0x". In particular, "09" is not an octal number, it's * 0x09. This oddity is so that the arguments look very much like the UUID in string form. */ #define NM_UUID_INIT(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15) \ - ((NMUuid){ \ + ((NMUuid) { \ .uuid = {(0x##a0), \ (0x##a1), \ (0x##a2), \ diff --git a/src/libnm-glib-aux/nm-value-type.h b/src/libnm-glib-aux/nm-value-type.h index 771021da4..6a0379b7b 100644 --- a/src/libnm-glib-aux/nm-value-type.h +++ b/src/libnm-glib-aux/nm-value-type.h @@ -60,7 +60,7 @@ typedef union { ({ \ NMValueTypUnion *const _arg2 = (_arg); \ \ - *_arg2 = (NMValueTypUnion){ \ + *_arg2 = (NMValueTypUnion) { \ ._type = (_val), \ }; \ _arg2; \ @@ -75,7 +75,7 @@ typedef struct { ({ \ NMValueTypUnioMaybe *const _arg2 = (_arg); \ \ - *_arg2 = (NMValueTypUnioMaybe){ \ + *_arg2 = (NMValueTypUnioMaybe) { \ .has = TRUE, \ .val._type = (_val), \ }; \ diff --git a/src/libnm-glib-aux/tests/test-json-aux.c b/src/libnm-glib-aux/tests/test-json-aux.c index 32462a298..b0ca1e6dc 100644 --- a/src/libnm-glib-aux/tests/test-json-aux.c +++ b/src/libnm-glib-aux/tests/test-json-aux.c @@ -88,16 +88,16 @@ test_jansson(void) CHECK_FCN(vt, json_array_get, nm_json_t * (*_f_nm)(const nm_json_t *, gsize), - json_t * (*_f_js)(const json_t *, size_t)); + json_t * (*_f_js)(const json_t *, size_t) ); CHECK_FCN(vt, json_array_size, gsize(*_f_nm)(const nm_json_t *), - size_t(*_f_js)(const json_t *)); + size_t (*_f_js)(const json_t *)); CHECK_FCN(vt, json_delete, void (*_f_nm)(nm_json_t *), void (*_f_js)(json_t *)); CHECK_FCN(vt, json_dumps, char *(*_f_nm)(const nm_json_t *, gsize), - char *(*_f_js)(const json_t *, size_t)); + char *(*_f_js)(const json_t *, size_t) ); CHECK_FCN(vt, json_false, nm_json_t * (*_f_nm)(void), json_t * (*_f_js)(void) ); CHECK_FCN(vt, json_integer, nm_json_t * (*_f_nm)(nm_json_int_t), json_t * (*_f_js)(json_int_t)); CHECK_FCN(vt, @@ -138,7 +138,7 @@ test_jansson(void) CHECK_FCN(vt, json_object_size, gsize(*_f_nm)(const nm_json_t *), - size_t(*_f_js)(const json_t *)); + size_t (*_f_js)(const json_t *)); CHECK_FCN(vt, json_string, nm_json_t * (*_f_nm)(const char *), diff --git a/src/libnm-glib-aux/tests/test-shared-general.c b/src/libnm-glib-aux/tests/test-shared-general.c index b19ac1ce5..48d524019 100644 --- a/src/libnm-glib-aux/tests/test-shared-general.c +++ b/src/libnm-glib-aux/tests/test-shared-general.c @@ -1622,17 +1622,17 @@ test_parse_env_file(void) gs_free char *arg2 = NULL; int r; -#define env_file_1 \ - "a=a\n" \ - "a=b\n" \ - "a=b\n" \ - "a=a\n" \ - "b=b\\\n" \ - "c\n" \ - "d= d\\\n" \ - "e \\\n" \ - "f \n" \ - "g=g\\ \n" \ +#define env_file_1 \ + "a=a\n" \ + "a=b\n" \ + "a=b\n" \ + "a=a\n" \ + "b=b\\\n" \ + "c\n" \ + "d= d\\\n" \ + "e \\\n" \ + "f \n" \ + "g=g\\ \n" \ "h= ąęół\\ śćńźżµ \n" \ "i=i\\" r = nm_parse_env_file_full(env_file_1, _env_file_push_cb, &data); diff --git a/src/libnm-lldp/nm-lldp-rx.c b/src/libnm-lldp/nm-lldp-rx.c index 90414b3ee..f1b5b47c1 100644 --- a/src/libnm-lldp/nm-lldp-rx.c +++ b/src/libnm-lldp/nm-lldp-rx.c @@ -411,7 +411,7 @@ nm_lldp_rx_new(const NMLldpRXConfig *config) G_STATIC_ASSERT_EXPR(G_STRUCT_OFFSET(NMLldpNeighbor, id) == 0); lldp_rx = g_slice_new(NMLldpRX); - *lldp_rx = (NMLldpRX){ + *lldp_rx = (NMLldpRX) { .ref_count = 1, .fd = -1, .main_context = g_main_context_ref_thread_default(), diff --git a/src/libnm-lldp/nm-lldp.h b/src/libnm-lldp/nm-lldp.h index 55e7de292..aaf87dcbe 100644 --- a/src/libnm-lldp/nm-lldp.h +++ b/src/libnm-lldp/nm-lldp.h @@ -63,16 +63,8 @@ enum { | NM_LLDP_SYSTEM_CAPABILITIES_DOCSIS | NM_LLDP_SYSTEM_CAPABILITIES_CVLAN \ | NM_LLDP_SYSTEM_CAPABILITIES_SVLAN | NM_LLDP_SYSTEM_CAPABILITIES_TPMR)) -#define NM_LLDP_OUI_802_1 \ - (const uint8_t[]) \ - { \ - 0x00, 0x80, 0xc2 \ - } -#define NM_LLDP_OUI_802_3 \ - (const uint8_t[]) \ - { \ - 0x00, 0x12, 0x0f \ - } +#define NM_LLDP_OUI_802_1 (const uint8_t[]){0x00, 0x80, 0xc2} +#define NM_LLDP_OUI_802_3 (const uint8_t[]){0x00, 0x12, 0x0f} #define _SD_LLDP_OUI_IANA 0x00, 0x00, 0x5E #define NM_LLDP_OUI_IANA \ diff --git a/src/libnm-platform/nm-linux-platform.c b/src/libnm-platform/nm-linux-platform.c index a738f9d9e..61dc61cf9 100644 --- a/src/libnm-platform/nm-linux-platform.c +++ b/src/libnm-platform/nm-linux-platform.c @@ -2710,7 +2710,7 @@ _wireguard_update_from_allowed_ips_nla(NMPWireGuardAllowedIP *allowed_ip, struct _check_addr_or_return_val(tb, WGALLOWEDIP_A_IPADDR, addr_len, FALSE); - *allowed_ip = (NMPWireGuardAllowedIP){ + *allowed_ip = (NMPWireGuardAllowedIP) { .family = family, }; @@ -2960,7 +2960,7 @@ _wireguard_read_info(NMPlatform *platform /* used only as logging context */ /* we ignore errors, and return whatever we could successfully * parse. */ nl_recvmsgs(genl, - &((const struct nl_cb){ + &((const struct nl_cb) { .valid_cb = _wireguard_get_device_cb, .valid_arg = (gpointer) &parse_data, })); @@ -3397,7 +3397,7 @@ link_wireguard_change(NMPlatform *platform, static void _nmp_link_address_set(NMPLinkAddress *dst, const struct nlattr *nla) { - *dst = (NMPLinkAddress){ + *dst = (NMPLinkAddress) { .len = 0, }; if (nla) { @@ -8211,7 +8211,7 @@ _rtnl_handle_msg(NMPlatform *platform, const struct nl_msg_lite *msg) is_del = TRUE; } - parse_nlmsg_iter = (ParseNlmsgIter){ + parse_nlmsg_iter = (ParseNlmsgIter) { .iter_more = FALSE, }; @@ -9729,13 +9729,13 @@ link_get_bridge_vlans(NMPlatform *platform, goto err; } - data = ((BridgeVlanData){ + data = ((BridgeVlanData) { .ifindex = ifindex, }); do { nle = nl_recvmsgs(sk, - &((const struct nl_cb){ + &((const struct nl_cb) { .valid_cb = get_bridge_vlans_cb, .valid_arg = &data, })); @@ -11662,12 +11662,12 @@ mptcp_addrs_dump(NMPlatform *platform) addrs = g_ptr_array_new_with_free_func((GDestroyNotify) nmp_object_unref); - parse_data = (FetchMptcpAddrParseData){ + parse_data = (FetchMptcpAddrParseData) { .addrs = addrs, }; nl_recvmsgs(priv->sk_genl_sync, - &((const struct nl_cb){ + &((const struct nl_cb) { .valid_cb = _mptcp_addrs_dump_parse_cb, .valid_arg = (gpointer) &parse_data, })); diff --git a/src/libnm-platform/nm-netlink.c b/src/libnm-platform/nm-netlink.c index 5bbbcc847..9eb6721f0 100644 --- a/src/libnm-platform/nm-netlink.c +++ b/src/libnm-platform/nm-netlink.c @@ -393,7 +393,7 @@ nlmsg_alloc(size_t len) g_return_val_if_reached(NULL); nm = g_slice_new(struct nl_msg); - *nm = (struct nl_msg){ + *nm = (struct nl_msg) { .nm_protocol = -1, .nm_size = len, .nm_nlh = g_malloc0(len), @@ -1125,7 +1125,7 @@ nl_socket_new(struct nl_sock **out_sk, nm_random_get_bytes(&seq_init, sizeof(seq_init)); sk = g_slice_new(struct nl_sock); - *sk = (struct nl_sock){ + *sk = (struct nl_sock) { .s_fd = nm_steal_fd(&fd), .s_local = { diff --git a/src/libnm-platform/nm-netlink.h b/src/libnm-platform/nm-netlink.h index efd482adf..42a81d84c 100644 --- a/src/libnm-platform/nm-netlink.h +++ b/src/libnm-platform/nm-netlink.h @@ -93,19 +93,20 @@ struct nla_policy { /* static asserts that @tb and @policy are suitable arguments to nla_parse(). */ #if _NM_CC_SUPPORT_GENERIC -#define _nl_static_assert_tb(tb, policy) \ - G_STMT_START \ - { \ - G_STATIC_ASSERT_EXPR(G_N_ELEMENTS(tb) > 0); \ - \ +#define _nl_static_assert_tb(tb, policy) \ + G_STMT_START \ + { \ + G_STATIC_ASSERT_EXPR(G_N_ELEMENTS(tb) > 0); \ + \ /* We allow @policy to be either a C array or NULL. The sizeof() * must either match the expected array size or we check that * "policy" has typeof(NULL). This isn't a perfect compile time check, - * but good enough. */ \ - G_STATIC_ASSERT_EXPR(_Generic((policy), \ - typeof(NULL): 1, \ - default: (sizeof(policy) == G_N_ELEMENTS(tb) * sizeof(struct nla_policy)))); \ - } \ + * but good enough. */ \ + G_STATIC_ASSERT_EXPR( \ + _Generic((policy), \ + typeof(NULL): 1, \ + default: (sizeof(policy) == G_N_ELEMENTS(tb) * sizeof(struct nla_policy)))); \ + } \ G_STMT_END #else #define _nl_static_assert_tb(tb, policy) G_STATIC_ASSERT_EXPR(G_N_ELEMENTS(tb) > 0) diff --git a/src/libnm-platform/nm-platform-utils.c b/src/libnm-platform/nm-platform-utils.c index 3f70f5fe7..209f00931 100644 --- a/src/libnm-platform/nm-platform-utils.c +++ b/src/libnm-platform/nm-platform-utils.c @@ -431,11 +431,11 @@ ethtool_get_stringset_index(SocketHandle *shandle, int stringset_id, const char /*****************************************************************************/ static const NMEthtoolFeatureInfo _ethtool_feature_infos[_NM_ETHTOOL_ID_FEATURE_NUM] = { -#define ETHT_FEAT(eid, ...) \ - { \ - .ethtool_id = eid, \ - .n_kernel_names = NM_NARG(__VA_ARGS__), \ - .kernel_names = ((const char *const[]){__VA_ARGS__}), \ +#define ETHT_FEAT(eid, ...) \ + { \ + .ethtool_id = eid, \ + .n_kernel_names = NM_NARG(__VA_ARGS__), \ + .kernel_names = ((const char *const[]) {__VA_ARGS__}), \ } /* the order does only matter for one thing: if it happens that more than one NMEthtoolID @@ -882,7 +882,7 @@ nmp_utils_ethtool_get_coalesce(int ifindex, NMEthtoolCoalesceState *coalesce) return FALSE; } - *coalesce = (NMEthtoolCoalesceState){ + *coalesce = (NMEthtoolCoalesceState) { .s = { [_NM_ETHTOOL_ID_COALESCE_AS_IDX(NM_ETHTOOL_ID_COALESCE_RX_USECS)] = eth_data.rx_coalesce_usecs, @@ -946,7 +946,7 @@ nmp_utils_ethtool_set_coalesce(int ifindex, const NMEthtoolCoalesceState *coales g_return_val_if_fail(ifindex > 0, FALSE); g_return_val_if_fail(coalesce, FALSE); - eth_data = (struct ethtool_coalesce){ + eth_data = (struct ethtool_coalesce) { .cmd = ETHTOOL_SCOALESCE, .rx_coalesce_usecs = coalesce->s[_NM_ETHTOOL_ID_COALESCE_AS_IDX(NM_ETHTOOL_ID_COALESCE_RX_USECS)], @@ -1027,7 +1027,7 @@ nmp_utils_ethtool_get_ring(int ifindex, NMEthtoolRingState *ring) return FALSE; } - *ring = (NMEthtoolRingState){ + *ring = (NMEthtoolRingState) { .rx_pending = eth_data.rx_pending, .rx_jumbo_pending = eth_data.rx_jumbo_pending, .rx_mini_pending = eth_data.rx_mini_pending, @@ -1049,7 +1049,7 @@ nmp_utils_ethtool_set_ring(int ifindex, const NMEthtoolRingState *ring) g_return_val_if_fail(ifindex > 0, FALSE); g_return_val_if_fail(ring, FALSE); - eth_data = (struct ethtool_ringparam){ + eth_data = (struct ethtool_ringparam) { .cmd = ETHTOOL_SRINGPARAM, .rx_pending = ring->rx_pending, .rx_jumbo_pending = ring->rx_jumbo_pending, @@ -1087,7 +1087,7 @@ nmp_utils_ethtool_get_channels(int ifindex, NMEthtoolChannelsState *channels) return FALSE; } - *channels = (NMEthtoolChannelsState){ + *channels = (NMEthtoolChannelsState) { .rx = eth_data.rx_count, .tx = eth_data.tx_count, .other = eth_data.other_count, @@ -1109,7 +1109,7 @@ nmp_utils_ethtool_set_channels(int ifindex, const NMEthtoolChannelsState *channe g_return_val_if_fail(ifindex > 0, FALSE); g_return_val_if_fail(channels, FALSE); - eth_data = (struct ethtool_channels){ + eth_data = (struct ethtool_channels) { .cmd = ETHTOOL_SCHANNELS, .rx_count = channels->rx, .tx_count = channels->tx, @@ -1150,7 +1150,7 @@ nmp_utils_ethtool_get_pause(int ifindex, NMEthtoolPauseState *pause) return FALSE; } - *pause = (NMEthtoolPauseState){ + *pause = (NMEthtoolPauseState) { .autoneg = eth_data.autoneg == 1, .rx = eth_data.rx_pause == 1, .tx = eth_data.tx_pause == 1, @@ -1181,7 +1181,7 @@ nmp_utils_ethtool_get_eee(int ifindex, NMEthtoolEEEState *eee) return FALSE; } - *eee = (NMEthtoolEEEState){ + *eee = (NMEthtoolEEEState) { .enabled = eth_data.eee_enabled == 1, }; @@ -1201,7 +1201,7 @@ nmp_utils_ethtool_set_pause(int ifindex, const NMEthtoolPauseState *pause) g_return_val_if_fail(ifindex > 0, FALSE); g_return_val_if_fail(pause, FALSE); - eth_data = (struct ethtool_pauseparam){ + eth_data = (struct ethtool_pauseparam) { .cmd = ETHTOOL_SPAUSEPARAM, .autoneg = pause->autoneg ? 1 : 0, .rx_pause = pause->rx ? 1 : 0, @@ -1271,7 +1271,7 @@ nmp_utils_ethtool_get_driver_info(int ifindex, NMPUtilsEthtoolDriverInfo *data) g_return_val_if_fail(data, FALSE); drvinfo = (struct ethtool_drvinfo *) data; - *drvinfo = (struct ethtool_drvinfo){ + *drvinfo = (struct ethtool_drvinfo) { .cmd = ETHTOOL_GDRVINFO, }; return _ethtool_call_once(ifindex, drvinfo, sizeof(*drvinfo)) >= 0; @@ -1609,7 +1609,7 @@ set_link_settings_new(SocketHandle *shandle, guint nwords; guint i; - edata0 = (struct ethtool_link_settings){ + edata0 = (struct ethtool_link_settings) { .cmd = ETHTOOL_GLINKSETTINGS, .link_mode_masks_nwords = 0, }; diff --git a/src/libnm-platform/nm-platform.c b/src/libnm-platform/nm-platform.c index a751aeeb3..085b14170 100644 --- a/src/libnm-platform/nm-platform.c +++ b/src/libnm-platform/nm-platform.c @@ -3824,7 +3824,7 @@ nm_platform_ip4_address_add(NMPlatform *self, char sbuf[NM_UTILS_TO_STRING_BUFFER_SIZE]; NMPlatformIP4Address addr; - addr = (NMPlatformIP4Address){ + addr = (NMPlatformIP4Address) { .ifindex = ifindex, .address = address, .peer_address = peer_address, @@ -4823,7 +4823,7 @@ nm_platform_ip_address_get_prune_list(NMPlatform *self, const NMPlatformIP4Address *a4 = NMP_OBJECT_CAST_IP4_ADDRESS(obj); if (a4->address == NM_IPV4LO_ADDR1 && a4->plen == NM_IPV4LO_PREFIXLEN) { - const NMPlatformIP4Address addr = (NMPlatformIP4Address){ + const NMPlatformIP4Address addr = (NMPlatformIP4Address) { .ifindex = NM_LOOPBACK_IFINDEX, .address = NM_IPV4LO_ADDR1, .peer_address = NM_IPV4LO_ADDR1, @@ -4944,7 +4944,7 @@ nm_platform_ip_route_get_prune_list(NMPlatform *self, NMPlatformIP4Route r; if (rt->r4.network == NM_IPV4LO_ADDR1) { - r = (NMPlatformIP4Route){ + r = (NMPlatformIP4Route) { .ifindex = NM_LOOPBACK_IFINDEX, .type_coerced = nm_platform_route_type_coerce(RTN_LOCAL), .table_coerced = nm_platform_route_table_coerce(local_table), @@ -4956,7 +4956,7 @@ nm_platform_ip_route_get_prune_list(NMPlatform *self, .pref_src = NM_IPV4LO_ADDR1, }; } else { - r = (NMPlatformIP4Route){ + r = (NMPlatformIP4Route) { .ifindex = NM_LOOPBACK_IFINDEX, .type_coerced = nm_platform_route_type_coerce(RTN_LOCAL), .table_coerced = nm_platform_route_table_coerce(local_table), @@ -9623,7 +9623,7 @@ nm_platform_ip4_address_generate_device_route(const NMPlatformIP4Address *addr, return NULL; } - *dst = (NMPlatformIP4Route){ + *dst = (NMPlatformIP4Route) { .ifindex = ifindex, .rt_source = NM_IP_CONFIG_SOURCE_KERNEL, .network = network_4, @@ -9970,7 +9970,7 @@ nm_platform_ip6_dadfailed_set(NMPlatform *self, if (failed) { addr = g_slice_new(IP6DadFailedAddr); - *addr = (IP6DadFailedAddr){ + *addr = (IP6DadFailedAddr) { .address = *ip6, .ifindex = ifindex, .timestamp_nsec = now_nsec, diff --git a/src/libnm-platform/nm-platform.h b/src/libnm-platform/nm-platform.h index 97dac246f..34f890603 100644 --- a/src/libnm-platform/nm-platform.h +++ b/src/libnm-platform/nm-platform.h @@ -529,9 +529,9 @@ typedef union { #undef __NMPlatformIPRoute_COMMON -#define NM_PLATFORM_IP4_ROUTE_INIT(...) (&((const NMPlatformIP4Route){__VA_ARGS__})) +#define NM_PLATFORM_IP4_ROUTE_INIT(...) (&((const NMPlatformIP4Route) {__VA_ARGS__})) -#define NM_PLATFORM_IP6_ROUTE_INIT(...) (&((const NMPlatformIP6Route){__VA_ARGS__})) +#define NM_PLATFORM_IP6_ROUTE_INIT(...) (&((const NMPlatformIP6Route) {__VA_ARGS__})) typedef struct { /* struct fib_rule_uid_range */ @@ -2686,7 +2686,7 @@ void nm_platform_ip6_dadfailed_set(NMPlatform *self, static inline NMPlatformIP4Address * nm_platform_ip4_address_init_loopback_addr1(NMPlatformIP4Address *a) { - *a = ((NMPlatformIP4Address){ + *a = ((NMPlatformIP4Address) { .address = NM_IPV4LO_ADDR1, .peer_address = NM_IPV4LO_ADDR1, .ifindex = NM_LOOPBACK_IFINDEX, @@ -2698,7 +2698,7 @@ nm_platform_ip4_address_init_loopback_addr1(NMPlatformIP4Address *a) static inline NMPlatformIP6Address * nm_platform_ip6_address_init_loopback(NMPlatformIP6Address *a) { - *a = ((NMPlatformIP6Address){ + *a = ((NMPlatformIP6Address) { .address = IN6ADDR_LOOPBACK_INIT, .ifindex = NM_LOOPBACK_IFINDEX, .plen = 128, diff --git a/src/libnm-platform/nmp-global-tracker.c b/src/libnm-platform/nmp-global-tracker.c index b06e9fe5d..8caa70ef8 100644 --- a/src/libnm-platform/nmp-global-tracker.c +++ b/src/libnm-platform/nmp-global-tracker.c @@ -422,7 +422,7 @@ nmp_global_tracker_track(NMPGlobalTracker *self, if (!track_data) { track_data = g_slice_new(TrackData); - *track_data = (TrackData){ + *track_data = (TrackData) { .obj = nm_dedup_multi_index_obj_intern(nm_platform_get_multi_idx(self->platform), p_obj_stack), .user_tag = user_tag, @@ -435,7 +435,7 @@ nmp_global_tracker_track(NMPGlobalTracker *self, obj_data = g_hash_table_lookup(self->by_obj, &track_data->obj); if (!obj_data) { obj_data = g_slice_new(TrackObjData); - *obj_data = (TrackObjData){ + *obj_data = (TrackObjData) { .obj = nmp_object_ref(track_data->obj), .obj_lst_head = C_LIST_INIT(obj_data->obj_lst_head), .config_state = CONFIG_STATE_NONE, @@ -448,7 +448,7 @@ nmp_global_tracker_track(NMPGlobalTracker *self, user_tag_data = g_hash_table_lookup(self->by_user_tag, &track_data->user_tag); if (!user_tag_data) { user_tag_data = g_slice_new(TrackUserTagData); - *user_tag_data = (TrackUserTagData){ + *user_tag_data = (TrackUserTagData) { .user_tag = user_tag, .user_tag_lst_head = C_LIST_INIT(user_tag_data->user_tag_lst_head), }; @@ -651,7 +651,7 @@ nmp_global_tracker_mptcp_addr_init_for_ifindex(NMPlatformMptcpAddr *addr, int if nm_assert(addr); nm_assert(ifindex > 0); - *addr = (NMPlatformMptcpAddr){ + *addr = (NMPlatformMptcpAddr) { .ifindex = ifindex, .addr_family = AF_UNSPEC, }; @@ -776,7 +776,7 @@ nmp_global_tracker_sync_mptcp_addrs(NMPGlobalTracker *self, gboolean reapply) entries = g_array_new(FALSE, FALSE, sizeof(MptcpSyncData)); g_array_append_val(entries, - ((const MptcpSyncData){ + ((const MptcpSyncData) { .obj_data = obj_data, .td_best = td_best, })); @@ -1158,7 +1158,7 @@ nmp_global_tracker_track_rule_default(NMPGlobalTracker *self, if (NM_IN_SET(addr_family, AF_UNSPEC, AF_INET)) { nmp_global_tracker_track_local_rule(self, addr_family, track_priority, user_tag, NULL); nmp_global_tracker_track_rule(self, - &((NMPlatformRoutingRule){ + &((NMPlatformRoutingRule) { .addr_family = AF_INET, .priority = 32766, .table = RT_TABLE_MAIN, @@ -1169,7 +1169,7 @@ nmp_global_tracker_track_rule_default(NMPGlobalTracker *self, user_tag, NULL); nmp_global_tracker_track_rule(self, - &((NMPlatformRoutingRule){ + &((NMPlatformRoutingRule) { .addr_family = AF_INET, .priority = 32767, .table = RT_TABLE_DEFAULT, @@ -1183,7 +1183,7 @@ nmp_global_tracker_track_rule_default(NMPGlobalTracker *self, if (NM_IN_SET(addr_family, AF_UNSPEC, AF_INET6)) { nmp_global_tracker_track_local_rule(self, addr_family, track_priority, user_tag, NULL); nmp_global_tracker_track_rule(self, - &((NMPlatformRoutingRule){ + &((NMPlatformRoutingRule) { .addr_family = AF_INET6, .priority = 32766, .table = RT_TABLE_MAIN, @@ -1209,7 +1209,7 @@ nmp_global_tracker_track_local_rule(NMPGlobalTracker *self, if (NM_IN_SET(addr_family, AF_UNSPEC, AF_INET)) { nmp_global_tracker_track_rule(self, - &((NMPlatformRoutingRule){ + &((NMPlatformRoutingRule) { .addr_family = AF_INET, .priority = 0, .table = RT_TABLE_LOCAL, @@ -1222,7 +1222,7 @@ nmp_global_tracker_track_local_rule(NMPGlobalTracker *self, } if (NM_IN_SET(addr_family, AF_UNSPEC, AF_INET6)) { nmp_global_tracker_track_rule(self, - &((NMPlatformRoutingRule){ + &((NMPlatformRoutingRule) { .addr_family = AF_INET6, .priority = 0, .table = RT_TABLE_LOCAL, @@ -1247,7 +1247,7 @@ nmp_global_tracker_new(NMPlatform *platform) G_STATIC_ASSERT_EXPR(G_STRUCT_OFFSET(TrackUserTagData, user_tag) == 0); self = g_slice_new(NMPGlobalTracker); - *self = (NMPGlobalTracker){ + *self = (NMPGlobalTracker) { .ref_count = 1, .platform = g_object_ref(platform), .by_data = diff --git a/src/libnm-platform/nmp-netns.c b/src/libnm-platform/nmp-netns.c index c18f67ab1..a0de83665 100644 --- a/src/libnm-platform/nmp-netns.c +++ b/src/libnm-platform/nmp-netns.c @@ -265,7 +265,7 @@ _stack_push(GArray *netns_stack, NMPNetns *netns, int ns_types) nm_assert(!NM_FLAGS_ANY(ns_types, ~_CLONE_NS_ALL)); info = nm_g_array_append_new(netns_stack, NetnsInfo); - *info = (NetnsInfo){ + *info = (NetnsInfo) { .netns = g_object_ref(netns), .ns_types = ns_types, .count = 1, diff --git a/src/libnm-platform/nmp-plobj.h b/src/libnm-platform/nmp-plobj.h index 3ba381da7..7760c02c1 100644 --- a/src/libnm-platform/nmp-plobj.h +++ b/src/libnm-platform/nmp-plobj.h @@ -156,9 +156,9 @@ typedef enum { NMPlatformIP4Address, \ NMPlatformIP6Address) -#define NM_PLATFORM_IP4_ADDRESS_INIT(...) (&((const NMPlatformIP4Address){__VA_ARGS__})) +#define NM_PLATFORM_IP4_ADDRESS_INIT(...) (&((const NMPlatformIP4Address) {__VA_ARGS__})) -#define NM_PLATFORM_IP6_ADDRESS_INIT(...) (&((const NMPlatformIP6Address){__VA_ARGS__})) +#define NM_PLATFORM_IP6_ADDRESS_INIT(...) (&((const NMPlatformIP6Address) {__VA_ARGS__})) /*****************************************************************************/ diff --git a/src/libnm-platform/tests/test-nm-platform.c b/src/libnm-platform/tests/test-nm-platform.c index 377078750..22148f8c6 100644 --- a/src/libnm-platform/tests/test-nm-platform.c +++ b/src/libnm-platform/tests/test-nm-platform.c @@ -198,12 +198,12 @@ test_nmp_utils_bridge_vlans_normalize(void) guint vlans_len; /* Single one is unmodified */ - vlans[0] = (NMPlatformBridgeVlan){ + vlans[0] = (NMPlatformBridgeVlan) { .vid_start = 1, .vid_end = 10, .untagged = TRUE, }; - expect[0] = (NMPlatformBridgeVlan){ + expect[0] = (NMPlatformBridgeVlan) { .vid_start = 1, .vid_end = 10, .untagged = TRUE, @@ -214,61 +214,61 @@ test_nmp_utils_bridge_vlans_normalize(void) g_assert(nmp_utils_bridge_normalized_vlans_equal(vlans, vlans_len, expect, vlans_len)); /* Not merged if flags are different */ - vlans[0] = (NMPlatformBridgeVlan){ + vlans[0] = (NMPlatformBridgeVlan) { .vid_start = 1, .vid_end = 10, .untagged = TRUE, }; - vlans[1] = (NMPlatformBridgeVlan){ + vlans[1] = (NMPlatformBridgeVlan) { .vid_start = 11, .vid_end = 11, .pvid = TRUE, }; - vlans[2] = (NMPlatformBridgeVlan){ + vlans[2] = (NMPlatformBridgeVlan) { .vid_start = 20, .vid_end = 25, }; - vlans[3] = (NMPlatformBridgeVlan){ + vlans[3] = (NMPlatformBridgeVlan) { .vid_start = 26, .vid_end = 30, .untagged = TRUE, }; - vlans[4] = (NMPlatformBridgeVlan){ + vlans[4] = (NMPlatformBridgeVlan) { .vid_start = 40, .vid_end = 40, .untagged = TRUE, }; - vlans[5] = (NMPlatformBridgeVlan){ + vlans[5] = (NMPlatformBridgeVlan) { .vid_start = 40, .vid_end = 40, .untagged = TRUE, .pvid = TRUE, }; - expect[0] = (NMPlatformBridgeVlan){ + expect[0] = (NMPlatformBridgeVlan) { .vid_start = 1, .vid_end = 10, .untagged = TRUE, }; - expect[1] = (NMPlatformBridgeVlan){ + expect[1] = (NMPlatformBridgeVlan) { .vid_start = 11, .vid_end = 11, .pvid = TRUE, }; - expect[2] = (NMPlatformBridgeVlan){ + expect[2] = (NMPlatformBridgeVlan) { .vid_start = 20, .vid_end = 25, }; - expect[3] = (NMPlatformBridgeVlan){ + expect[3] = (NMPlatformBridgeVlan) { .vid_start = 26, .vid_end = 30, .untagged = TRUE, }; - expect[4] = (NMPlatformBridgeVlan){ + expect[4] = (NMPlatformBridgeVlan) { .vid_start = 40, .vid_end = 40, .untagged = TRUE, }; - expect[5] = (NMPlatformBridgeVlan){ + expect[5] = (NMPlatformBridgeVlan) { .vid_start = 40, .vid_end = 40, .untagged = TRUE, @@ -280,22 +280,22 @@ test_nmp_utils_bridge_vlans_normalize(void) g_assert(nmp_utils_bridge_normalized_vlans_equal(vlans, vlans_len, expect, vlans_len)); /* Overlapping and contiguous ranges are merged */ - vlans[0] = (NMPlatformBridgeVlan){ + vlans[0] = (NMPlatformBridgeVlan) { .vid_start = 1, .vid_end = 10, .untagged = TRUE, }; - vlans[1] = (NMPlatformBridgeVlan){ + vlans[1] = (NMPlatformBridgeVlan) { .vid_start = 11, .vid_end = 20, .untagged = TRUE, }; - vlans[2] = (NMPlatformBridgeVlan){ + vlans[2] = (NMPlatformBridgeVlan) { .vid_start = 19, .vid_end = 30, .untagged = TRUE, }; - expect[0] = (NMPlatformBridgeVlan){ + expect[0] = (NMPlatformBridgeVlan) { .vid_start = 1, .vid_end = 30, .untagged = TRUE, @@ -305,42 +305,42 @@ test_nmp_utils_bridge_vlans_normalize(void) g_assert(vlans_len == 1); g_assert(nmp_utils_bridge_normalized_vlans_equal(vlans, vlans_len, expect, vlans_len)); - vlans[0] = (NMPlatformBridgeVlan){ + vlans[0] = (NMPlatformBridgeVlan) { .vid_start = 20, .vid_end = 20, }; - vlans[1] = (NMPlatformBridgeVlan){ + vlans[1] = (NMPlatformBridgeVlan) { .vid_start = 4, .vid_end = 4, .pvid = TRUE, }; - vlans[2] = (NMPlatformBridgeVlan){ + vlans[2] = (NMPlatformBridgeVlan) { .vid_start = 33, .vid_end = 33, }; - vlans[3] = (NMPlatformBridgeVlan){ + vlans[3] = (NMPlatformBridgeVlan) { .vid_start = 100, .vid_end = 100, .untagged = TRUE, }; - vlans[4] = (NMPlatformBridgeVlan){ + vlans[4] = (NMPlatformBridgeVlan) { .vid_start = 34, .vid_end = 40, }; - vlans[5] = (NMPlatformBridgeVlan){ + vlans[5] = (NMPlatformBridgeVlan) { .vid_start = 21, .vid_end = 32, }; - expect[0] = (NMPlatformBridgeVlan){ + expect[0] = (NMPlatformBridgeVlan) { .vid_start = 4, .vid_end = 4, .pvid = TRUE, }; - expect[1] = (NMPlatformBridgeVlan){ + expect[1] = (NMPlatformBridgeVlan) { .vid_start = 20, .vid_end = 40, }; - expect[2] = (NMPlatformBridgeVlan){ + expect[2] = (NMPlatformBridgeVlan) { .vid_start = 100, .vid_end = 100, .untagged = TRUE, @@ -364,7 +364,7 @@ test_nmp_utils_bridge_normalized_vlans_equal(void) g_assert(nmp_utils_bridge_normalized_vlans_equal(NULL, 0, b, 0)); /* One empty, other not */ - a[0] = (NMPlatformBridgeVlan){ + a[0] = (NMPlatformBridgeVlan) { .vid_start = 1, .vid_end = 10, .untagged = TRUE, @@ -373,22 +373,22 @@ test_nmp_utils_bridge_normalized_vlans_equal(void) g_assert(!nmp_utils_bridge_normalized_vlans_equal(NULL, 0, a, 1)); /* Equal range + VLAN */ - a[0] = (NMPlatformBridgeVlan){ + a[0] = (NMPlatformBridgeVlan) { .vid_start = 1, .vid_end = 10, .untagged = TRUE, }; - a[1] = (NMPlatformBridgeVlan){ + a[1] = (NMPlatformBridgeVlan) { .vid_start = 11, .vid_end = 11, .pvid = TRUE, }; - b[0] = (NMPlatformBridgeVlan){ + b[0] = (NMPlatformBridgeVlan) { .vid_start = 1, .vid_end = 10, .untagged = TRUE, }; - b[1] = (NMPlatformBridgeVlan){ + b[1] = (NMPlatformBridgeVlan) { .vid_start = 11, .vid_end = 11, .pvid = TRUE, @@ -402,12 +402,12 @@ test_nmp_utils_bridge_normalized_vlans_equal(void) g_assert(!nmp_utils_bridge_normalized_vlans_equal(b, 2, a, 2)); /* Different ranges */ - a[0] = (NMPlatformBridgeVlan){ + a[0] = (NMPlatformBridgeVlan) { .vid_start = 1, .vid_end = 30, .untagged = TRUE, }; - b[0] = (NMPlatformBridgeVlan){ + b[0] = (NMPlatformBridgeVlan) { .vid_start = 1, .vid_end = 29, .untagged = TRUE, diff --git a/src/libnm-platform/wifi/nm-wifi-utils-nl80211.c b/src/libnm-platform/wifi/nm-wifi-utils-nl80211.c index 3c00898a2..020c054b1 100644 --- a/src/libnm-platform/wifi/nm-wifi-utils-nl80211.c +++ b/src/libnm-platform/wifi/nm-wifi-utils-nl80211.c @@ -689,7 +689,7 @@ nl80211_wiphy_info_handler(const struct nl_msg *msg, void *arg) } f = &info->freqs[info->num_freqs]; - *f = (Nl80211Freq){ + *f = (Nl80211Freq) { .freq = nla_get_u32(tb_freq[NL80211_FREQUENCY_ATTR_FREQ]), .disabled = !!tb_freq[NL80211_FREQUENCY_ATTR_DISABLED], .no_ir = !!tb_freq[NL80211_FREQUENCY_ATTR_NO_IR], diff --git a/src/libnm-systemd-core/nm-sd.c b/src/libnm-systemd-core/nm-sd.c index b512e3fcb..aecbdf942 100644 --- a/src/libnm-systemd-core/nm-sd.c +++ b/src/libnm-systemd-core/nm-sd.c @@ -70,7 +70,7 @@ event_create_source(sd_event *event) source->event = is_default_event ? g_steal_pointer(&event) : sd_event_ref(event); - source->pollfd = (GPollFD){ + source->pollfd = (GPollFD) { .fd = sd_event_get_fd(source->event), .events = G_IO_IN | G_IO_HUP | G_IO_ERR, }; diff --git a/src/libnmc-base/nm-polkit-listener.c b/src/libnmc-base/nm-polkit-listener.c index c715b0494..65e3cfc63 100644 --- a/src/libnmc-base/nm-polkit-listener.c +++ b/src/libnmc-base/nm-polkit-listener.c @@ -574,7 +574,7 @@ create_request(NMPolkitListener *listener, AuthRequest *request; request = g_slice_new(AuthRequest); - *request = (AuthRequest){ + *request = (AuthRequest) { .listener = listener, .dbus_invocation = invocation, .action_id = g_strdup(action_id), diff --git a/src/libnmc-base/nm-secret-agent-simple.c b/src/libnmc-base/nm-secret-agent-simple.c index b6945de7d..d8c5344c0 100644 --- a/src/libnmc-base/nm-secret-agent-simple.c +++ b/src/libnmc-base/nm-secret-agent-simple.c @@ -164,7 +164,7 @@ _secret_real_new_plain(NMSecretAgentSecretType secret_type, g_object_get(setting, property, &value, NULL); real = g_slice_new(SecretReal); - *real = (SecretReal){ + *real = (SecretReal) { .base.secret_type = secret_type, .base.pretty_name = g_strdup(pretty_name), .base.entry_id = g_strdup_printf("%s.%s", nm_setting_get_name(setting), property), @@ -194,7 +194,7 @@ _secret_real_new_vpn_secret(const char *pretty_name, value = nm_setting_vpn_get_secret(NM_SETTING_VPN(setting), property); real = g_slice_new(SecretReal); - *real = (SecretReal){ + *real = (SecretReal) { .base.secret_type = NM_SECRET_AGENT_SECRET_TYPE_VPN_SECRET, .base.pretty_name = g_strdup(pretty_name), .base.entry_id = @@ -220,7 +220,7 @@ _secret_real_new_wireguard_peer_psk(NMSettingWireGuard *s_wg, nm_assert(public_key); real = g_slice_new(SecretReal); - *real = (SecretReal){ + *real = (SecretReal) { .base.secret_type = NM_SECRET_AGENT_SECRET_TYPE_WIREGUARD_PEER_PSK, .base.pretty_name = g_strdup_printf(_("Preshared-key for %s"), public_key), .base.entry_id = g_strdup_printf(NM_SETTING_WIREGUARD_SETTING_NAME @@ -840,7 +840,7 @@ try_spawn_vpn_auth_helper(RequestData *request, GPtrArray *secrets) auth_dialog_request_str = g_string_free(auth_dialog_request, FALSE); data = g_slice_new(AuthDialogData); - *data = (AuthDialogData){ + *data = (AuthDialogData) { .auth_dialog_response = g_string_new_len(NULL, sizeof(data->read_buf)), .auth_dialog_pid = auth_dialog_pid, .request = request, @@ -1100,7 +1100,7 @@ get_secrets(NMSecretAgentOld *agent, nm_assert(nm_streq(request_id_setting_name, setting_name)); request = g_slice_new(RequestData); - *request = (RequestData){ + *request = (RequestData) { .self = self, .connection = g_object_ref(connection), .setting_name = request_id_setting_name, diff --git a/src/libnmc-setting/nm-meta-setting-base-impl.c b/src/libnmc-setting/nm-meta-setting-base-impl.c index c8b77bf32..37cb61f17 100644 --- a/src/libnmc-setting/nm-meta-setting-base-impl.c +++ b/src/libnmc-setting/nm-meta-setting-base-impl.c @@ -831,7 +831,7 @@ again: for (i = 0; i < _NM_META_SETTING_TYPE_NUM; i++) { const NMMetaSettingInfo *m = &nm_meta_setting_infos[i]; - static_array[i] = (LookupData){ + static_array[i] = (LookupData) { .gtype = m->get_setting_gtype(), .setting_info = m, }; diff --git a/src/nm-cloud-setup/main.c b/src/nm-cloud-setup/main.c index 084b5f629..6f614a607 100644 --- a/src/nm-cloud-setup/main.c +++ b/src/nm-cloud-setup/main.c @@ -178,7 +178,7 @@ _map_interfaces_parse(void) nm_assert(j < alloc_len); m = &map_interfaces[j++]; - *m = (NMUtilsNamedValue){ + *m = (NMUtilsNamedValue) { .name = g_strndup(str, s - str), .value_str = hwaddr, }; @@ -187,7 +187,7 @@ _map_interfaces_parse(void) } nm_assert(j < alloc_len); - map_interfaces[j++] = (NMUtilsNamedValue){ + map_interfaces[j++] = (NMUtilsNamedValue) { .name = NULL, .value_str = NULL, }; @@ -766,7 +766,7 @@ main(int argc, const char *const *argv) sigterm_cancellable = g_cancellable_new(); - sigterm_data = (SigTermData){ + sigterm_data = (SigTermData) { .cancellable = sigterm_cancellable, .enabled = TRUE, .signal_received = FALSE, diff --git a/src/nm-cloud-setup/nm-cloud-setup-utils.c b/src/nm-cloud-setup/nm-cloud-setup-utils.c index 75739c7cd..558f413f6 100644 --- a/src/nm-cloud-setup/nm-cloud-setup-utils.c +++ b/src/nm-cloud-setup/nm-cloud-setup-utils.c @@ -126,7 +126,7 @@ nmcs_wait_for_objects_iterate_until_done(GMainContext *context, int timeout_msec _wait_for_objects_iterate_loops = g_slist_prepend(_wait_for_objects_iterate_loops, loop); G_UNLOCK(_wait_for_objects_lock); - data = (WaitForObjectsData){ + data = (WaitForObjectsData) { .loop = loop, .got_timeout = FALSE, }; diff --git a/src/nm-cloud-setup/nm-cloud-setup-utils.h b/src/nm-cloud-setup/nm-cloud-setup-utils.h index 4ca4634c2..434f7fcf0 100644 --- a/src/nm-cloud-setup/nm-cloud-setup-utils.h +++ b/src/nm-cloud-setup/nm-cloud-setup-utils.h @@ -126,7 +126,7 @@ again: char *nmcs_utils_uri_build_concat_v(const char *base, const char **components, gsize n_components); #define nmcs_utils_uri_build_concat(base, ...) \ - nmcs_utils_uri_build_concat_v(base, ((const char *[]){__VA_ARGS__}), NM_NARG(__VA_ARGS__)) + nmcs_utils_uri_build_concat_v(base, ((const char *[]) {__VA_ARGS__}), NM_NARG(__VA_ARGS__)) const char *nmcs_utils_uri_complete_interned(const char *uri); diff --git a/src/nm-cloud-setup/nm-http-client.c b/src/nm-cloud-setup/nm-http-client.c index 20ef6473d..0731ba250 100644 --- a/src/nm-cloud-setup/nm-http-client.c +++ b/src/nm-cloud-setup/nm-http-client.c @@ -201,7 +201,7 @@ _ehandle_complete(EHandleData *edata, GError *error_take) _ehandle_free_ehandle(edata); req_result = g_slice_new(GetResult); - *req_result = (GetResult){ + *req_result = (GetResult) { .response_code = response_code, /* This ensures that response_data is always NUL terminated. This is an important guarantee * that NMHttpClient makes. */ @@ -280,7 +280,7 @@ nm_http_client_req(NMHttpClient *self, priv = NM_HTTP_CLIENT_GET_PRIVATE(self); edata = g_slice_new(EHandleData); - *edata = (EHandleData){ + *edata = (EHandleData) { .task = nm_g_task_new(self, cancellable, nm_http_client_req, callback, user_data), .recv_data = NM_STR_BUF_INIT(0, FALSE), .max_data = max_data, @@ -558,7 +558,7 @@ nm_http_client_poll_req(NMHttpClient *self, g_return_if_fail(!cancellable || G_CANCELLABLE(cancellable)); poll_req_data = g_slice_new(PollReqData); - *poll_req_data = (PollReqData){ + *poll_req_data = (PollReqData) { .task = nm_g_task_new(self, cancellable, nm_http_client_poll_req, callback, user_data), .uri = g_strdup(uri), .request_timeout_ms = request_timeout_ms, diff --git a/src/nm-cloud-setup/nmcs-provider-azure.c b/src/nm-cloud-setup/nmcs-provider-azure.c index 78eda16cb..d4999b5f4 100644 --- a/src/nm-cloud-setup/nmcs-provider-azure.c +++ b/src/nm-cloud-setup/nmcs-provider-azure.c @@ -500,7 +500,7 @@ _get_net_ifaces_list_cb(GObject *source, GAsyncResult *result, gpointer user_dat continue; iface_data = g_slice_new(AzureIfaceData); - *iface_data = (AzureIfaceData){ + *iface_data = (AzureIfaceData) { .get_config_data = get_config_data, .iface_get_config = NULL, .intern_iface_idx = intern_iface_idx, diff --git a/src/nm-cloud-setup/nmcs-provider-gcp.c b/src/nm-cloud-setup/nmcs-provider-gcp.c index 4d9ef9650..ce932c1d0 100644 --- a/src/nm-cloud-setup/nmcs-provider-gcp.c +++ b/src/nm-cloud-setup/nmcs-provider-gcp.c @@ -381,7 +381,7 @@ _get_net_ifaces_list_cb(GObject *source, GAsyncResult *result, gpointer user_dat continue; iface_data = g_slice_new(GCPIfaceData); - *iface_data = (GCPIfaceData){ + *iface_data = (GCPIfaceData) { .get_config_data = get_config_data, .iface_get_config = NULL, .intern_iface_idx = intern_iface_idx, diff --git a/src/nm-cloud-setup/nmcs-provider.c b/src/nm-cloud-setup/nmcs-provider.c index 5b4412b3b..fe8fedcf1 100644 --- a/src/nm-cloud-setup/nmcs-provider.c +++ b/src/nm-cloud-setup/nmcs-provider.c @@ -95,7 +95,7 @@ nmcs_provider_get_config_result_new(GHashTable *iface_datas) g_ptr_array_add(ptrarr, NULL); result = g_new(NMCSProviderGetConfigResult, 1); - *result = (NMCSProviderGetConfigResult){ + *result = (NMCSProviderGetConfigResult) { .iface_datas = g_hash_table_ref(iface_datas), .n_iface_datas = n_iface_datas, .iface_datas_arr = @@ -185,7 +185,7 @@ nmcs_provider_get_config_iface_data_create(NMCSProviderGetConfigTaskData *get_co nm_assert(NMCS_IS_PROVIDER(get_config_data->self)); iface_data = g_slice_new(NMCSProviderGetConfigIfaceData); - *iface_data = (NMCSProviderGetConfigIfaceData){ + *iface_data = (NMCSProviderGetConfigIfaceData) { .get_config_data = get_config_data, .hwaddr = g_strdup(hwaddr), .iface_idx = -1, @@ -198,7 +198,7 @@ nmcs_provider_get_config_iface_data_create(NMCSProviderGetConfigTaskData *get_co * Also, knowing the type would allow us to initialize to something other than * false/0/NULL/0.0. */ if (G_OBJECT_TYPE(get_config_data->self) == nmcs_provider_aliyun_get_type()) { - iface_data->priv.aliyun = (typeof(iface_data->priv.aliyun)){ + iface_data->priv.aliyun = (typeof(iface_data->priv.aliyun)) { .has_primary_ip_address = FALSE, }; } @@ -293,7 +293,7 @@ nmcs_provider_get_config(NMCSProvider *self, _LOGD("get-config: starting"); get_config_data = g_slice_new(NMCSProviderGetConfigTaskData); - *get_config_data = (NMCSProviderGetConfigTaskData){ + *get_config_data = (NMCSProviderGetConfigTaskData) { /* "self" is kept alive by "task". */ .self = self, .task = nm_g_task_new(self, cancellable, nmcs_provider_get_config, callback, user_data), diff --git a/src/nm-initrd-generator/nm-initrd-generator.c b/src/nm-initrd-generator/nm-initrd-generator.c index d84e95e5e..844aebf74 100644 --- a/src/nm-initrd-generator/nm-initrd-generator.c +++ b/src/nm-initrd-generator/nm-initrd-generator.c @@ -226,7 +226,7 @@ main(int argc, char *argv[]) : "from \"rd.net.timeout.carrier\""); } - v = (NMUtilsNamedValue){ + v = (NMUtilsNamedValue) { .name = g_strdup_printf("%s/15-carrier-timeout.conf", run_config_dir), .value_str = g_key_file_to_data(keyfile, NULL, NULL), }; diff --git a/src/nm-initrd-generator/nmi-cmdline-reader.c b/src/nm-initrd-generator/nmi-cmdline-reader.c index 3703ff0cb..80fb550ce 100644 --- a/src/nm-initrd-generator/nmi-cmdline-reader.c +++ b/src/nm-initrd-generator/nmi-cmdline-reader.c @@ -50,7 +50,7 @@ reader_new(void) Reader *reader; reader = g_slice_new(Reader); - *reader = (Reader){ + *reader = (Reader) { .hash = g_hash_table_new_full(nm_str_hash, g_str_equal, g_free, g_object_unref), .explicit_ip_connections = g_hash_table_new_full(nm_direct_hash, NULL, g_object_unref, NULL), diff --git a/src/nm-priv-helper/nm-priv-helper.c b/src/nm-priv-helper/nm-priv-helper.c index e29113b11..2fe9bcf5e 100644 --- a/src/nm-priv-helper/nm-priv-helper.c +++ b/src/nm-priv-helper/nm-priv-helper.c @@ -234,7 +234,7 @@ _bus_find_nm_nameowner(GlobalData *gl) gl, NULL); - data = (BusFindNMNameOwnerData){ + data = (BusFindNMNameOwnerData) { .gl = gl, .is_cancelled = FALSE, .p_name_owner = &name_owner, diff --git a/src/nmcli/common.c b/src/nmcli/common.c index fbabdffca..2ced70f3a 100644 --- a/src/nmcli/common.c +++ b/src/nmcli/common.c @@ -355,7 +355,7 @@ print_ip_config(NMIPConfig *cfg, } if (!nmc_print_table(nmc_config, - (gpointer[]){cfg, NULL}, + (gpointer[]) {cfg, NULL}, NULL, NULL, addr_family == AF_INET @@ -386,7 +386,7 @@ print_dhcp_config(NMDhcpConfig *dhcp, } if (!nmc_print_table(nmc_config, - (gpointer[]){dhcp, NULL}, + (gpointer[]) {dhcp, NULL}, NULL, NULL, addr_family == AF_INET @@ -1399,7 +1399,7 @@ call_cmd(NmCli *nmc, GTask *task, const NMCCommand *cmd, int argc, const char *c nmc->should_wait++; call = g_slice_new(CmdCall); - *call = (CmdCall){ + *call = (CmdCall) { .cmd = cmd, .argc = argc, .argv = nm_strv_dup(argv, argc, TRUE), @@ -1430,7 +1430,7 @@ call_cmd(NmCli *nmc, GTask *task, const NMCCommand *cmd, int argc, const char *c nmc->should_wait++; call = g_slice_new(CmdCall); - *call = (CmdCall){ + *call = (CmdCall) { .cmd = cmd, .argc = argc, .argv = nm_strv_dup(argv, argc, TRUE), diff --git a/src/nmcli/common.h b/src/nmcli/common.h index 3784da354..892b2d4e9 100644 --- a/src/nmcli/common.h +++ b/src/nmcli/common.h @@ -70,7 +70,7 @@ nmc_do_cmd(NmCli *nmc, const NMCCommand cmds[], const char *cmd, int argc, const void nmc_complete_strv(const char *prefix, gssize nargs, const char *const *args); #define nmc_complete_strings(prefix, ...) \ - nmc_complete_strv((prefix), NM_NARG(__VA_ARGS__), (const char *const[]){__VA_ARGS__}) + nmc_complete_strv((prefix), NM_NARG(__VA_ARGS__), (const char *const[]) {__VA_ARGS__}) void nmc_complete_bool(const char *prefix); diff --git a/src/nmcli/connections.c b/src/nmcli/connections.c index 1d9b9e39d..b87ffdd2a 100644 --- a/src/nmcli/connections.c +++ b/src/nmcli/connections.c @@ -113,7 +113,7 @@ _add_connection_info_new(NmCli *nmc, NMConnection *orig_connection, NMConnection AddConnectionInfo *info; info = g_slice_new(AddConnectionInfo); - *info = (AddConnectionInfo){ + *info = (AddConnectionInfo) { .nmc = nmc, .orig_id = orig_connection ? g_strdup(nm_connection_get_id(orig_connection)) : NULL, .orig_uuid = orig_connection ? g_strdup(nm_connection_get_uuid(orig_connection)) : NULL, @@ -1763,7 +1763,7 @@ nmc_active_connection_details(NMActiveConnection *acon, NmCli *nmc) nmc_print_table( &nmc->nmc_config, - (gpointer[]){acon, NULL}, + (gpointer[]) {acon, NULL}, NULL, NULL, NMC_META_GENERIC_GROUP("GENERAL", metagen_con_active_general, N_("GROUP")), @@ -1820,7 +1820,7 @@ nmc_active_connection_details(NMActiveConnection *acon, NmCli *nmc) if (nmc_fields_con_active_details_groups[group_idx]->nested == metagen_con_active_vpn) { if (NM_IS_VPN_CONNECTION(acon)) { nmc_print_table(&nmc->nmc_config, - (gpointer[]){acon, NULL}, + (gpointer[]) {acon, NULL}, NULL, NULL, NMC_META_GENERIC_GROUP("VPN", metagen_con_active_vpn, N_("NAME")), diff --git a/src/nmcli/devices.c b/src/nmcli/devices.c index f6163757a..170db42e1 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), diff --git a/src/nmcli/general.c b/src/nmcli/general.c index ea070e055..c6c266a20 100644 --- a/src/nmcli/general.c +++ b/src/nmcli/general.c @@ -500,7 +500,7 @@ show_nm_status(NmCli *nmc, const char *pretty_header_name, const char *print_fld fields_str = nmc->required_fields; if (!nmc_print_table(&nmc->nmc_config, - (gpointer[]){nmc, NULL}, + (gpointer[]) {nmc, NULL}, NULL, pretty_header_name ?: N_("NetworkManager status"), (const NMMetaAbstractInfo *const *) metagen_general_status, @@ -733,7 +733,7 @@ show_general_logging(NmCli *nmc) fields_str = nmc->required_fields; if (!nmc_print_table(&nmc->nmc_config, - (gpointer const[]){&d, NULL}, + (gpointer const[]) {&d, NULL}, NULL, _("NetworkManager logging"), (const NMMetaAbstractInfo *const *) metagen_general_logging, diff --git a/src/nmcli/settings.c b/src/nmcli/settings.c index 636df466e..d7bd73fb9 100644 --- a/src/nmcli/settings.c +++ b/src/nmcli/settings.c @@ -503,7 +503,7 @@ _env_get_env_flags(const NMMetaEnvironment *environment, gpointer environment_us /*****************************************************************************/ -const NMMetaEnvironment *const nmc_meta_environment = &((NMMetaEnvironment){ +const NMMetaEnvironment *const nmc_meta_environment = &((NMMetaEnvironment) { .warn_fcn = _env_warn_fcn_handle, .get_nm_devices = _env_get_nm_devices, .get_nm_connections = _env_get_nm_connections, @@ -764,10 +764,10 @@ setting_details(const NmcConfig *nmc_config, NMSetting *setting, const char *one if (!nmc_print_table( nmc_config, - (gpointer[]){setting, NULL}, + (gpointer[]) {setting, NULL}, NULL, NULL, - (const NMMetaAbstractInfo *const[]){(const NMMetaAbstractInfo *) setting_info, NULL}, + (const NMMetaAbstractInfo *const[]) {(const NMMetaAbstractInfo *) setting_info, NULL}, fields_str, &error)) return FALSE; diff --git a/src/nmcli/utils.h b/src/nmcli/utils.h index b68a38033..b2539bf44 100644 --- a/src/nmcli/utils.h +++ b/src/nmcli/utils.h @@ -269,13 +269,13 @@ struct _NmcMetaGenericInfo { }; #define NMC_META_GENERIC(n, ...) \ - (&((NmcMetaGenericInfo){.meta_type = &nmc_meta_type_generic_info, .name = n, __VA_ARGS__})) + (&((NmcMetaGenericInfo) {.meta_type = &nmc_meta_type_generic_info, .name = n, __VA_ARGS__})) #define NMC_META_GENERIC_WITH_NESTED(n, nest, ...) \ NMC_META_GENERIC(n, .nested = (nest), __VA_ARGS__) #define NMC_META_GENERIC_GROUP(_group_name, _nested, _name_header) \ - ((const NMMetaAbstractInfo *const *) ((const NmcMetaGenericInfo *const[]){ \ + ((const NMMetaAbstractInfo *const *) ((const NmcMetaGenericInfo *const[]) { \ NMC_META_GENERIC_WITH_NESTED(_group_name, _nested, .name_header = _name_header), \ NULL, \ }))