New upstream version 1.27.90 upstream/1.27.90

1 files changed, 65 insertions, 63 deletions

diff --git a/libnm-core/nm-setting-bridge.h b/libnm-core/nm-setting-bridge.h
index 5f0ef0b3..4ab9af92 100644
--- a/libnm-core/nm-setting-bridge.h
+++ b/libnm-core/nm-setting-bridge.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1+ */
 /*
  * Copyright (C) 2011 - 2015 Red Hat, Inc.
  */
@@ -6,20 +6,23 @@
 #ifndef __NM_SETTING_BRIDGE_H__
 #define __NM_SETTING_BRIDGE_H__
 
-#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
-#error "Only <NetworkManager.h> can be included directly."
+#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
+    #error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
 
 G_BEGIN_DECLS
 
-#define NM_TYPE_SETTING_BRIDGE            (nm_setting_bridge_get_type ())
-#define NM_SETTING_BRIDGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_BRIDGE, NMSettingBridge))
-#define NM_SETTING_BRIDGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_BRIDGE, NMSettingBridgeClass))
-#define NM_IS_SETTING_BRIDGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_BRIDGE))
-#define NM_IS_SETTING_BRIDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_BRIDGE))
-#define NM_SETTING_BRIDGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_BRIDGE, NMSettingBridgeClass))
+#define NM_TYPE_SETTING_BRIDGE (nm_setting_bridge_get_type())
+#define NM_SETTING_BRIDGE(obj) \
+    (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_SETTING_BRIDGE, NMSettingBridge))
+#define NM_SETTING_BRIDGE_CLASS(klass) \
+    (G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_SETTING_BRIDGE, NMSettingBridgeClass))
+#define NM_IS_SETTING_BRIDGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_SETTING_BRIDGE))
+#define NM_IS_SETTING_BRIDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_SETTING_BRIDGE))
+#define NM_SETTING_BRIDGE_GET_CLASS(obj) \
+    (G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_SETTING_BRIDGE, NMSettingBridgeClass))
 
 #define NM_SETTING_BRIDGE_SETTING_NAME "bridge"
 
@@ -51,130 +54,129 @@ G_BEGIN_DECLS
 #define NM_SETTING_BRIDGE_VLAN_PROTOCOL                     "vlan-protocol"
 #define NM_SETTING_BRIDGE_VLAN_STATS_ENABLED                "vlan-stats-enabled"
 
-#define NM_BRIDGE_VLAN_VID_MIN            1
-#define NM_BRIDGE_VLAN_VID_MAX            4094
+#define NM_BRIDGE_VLAN_VID_MIN 1
+#define NM_BRIDGE_VLAN_VID_MAX 4094
 
 typedef struct _NMSettingBridgeClass NMSettingBridgeClass;
 
 typedef struct _NMBridgeVlan NMBridgeVlan;
 
-GType nm_setting_bridge_get_type (void);
+GType nm_setting_bridge_get_type(void);
 
-NMSetting *  nm_setting_bridge_new                (void);
+NMSetting *nm_setting_bridge_new(void);
 
-const char * nm_setting_bridge_get_mac_address    (NMSettingBridge *setting);
+const char *nm_setting_bridge_get_mac_address(NMSettingBridge *setting);
 
-gboolean     nm_setting_bridge_get_stp            (NMSettingBridge *setting);
+gboolean nm_setting_bridge_get_stp(NMSettingBridge *setting);
 
-guint16      nm_setting_bridge_get_priority       (NMSettingBridge *setting);
+guint16 nm_setting_bridge_get_priority(NMSettingBridge *setting);
 
-guint16      nm_setting_bridge_get_forward_delay  (NMSettingBridge *setting);
+guint16 nm_setting_bridge_get_forward_delay(NMSettingBridge *setting);
 
-guint16      nm_setting_bridge_get_hello_time     (NMSettingBridge *setting);
+guint16 nm_setting_bridge_get_hello_time(NMSettingBridge *setting);
 
-guint16      nm_setting_bridge_get_max_age        (NMSettingBridge *setting);
+guint16 nm_setting_bridge_get_max_age(NMSettingBridge *setting);
 
-guint32      nm_setting_bridge_get_ageing_time    (NMSettingBridge *setting);
+guint32 nm_setting_bridge_get_ageing_time(NMSettingBridge *setting);
 NM_AVAILABLE_IN_1_10
-guint16      nm_setting_bridge_get_group_forward_mask (NMSettingBridge *setting);
+guint16 nm_setting_bridge_get_group_forward_mask(NMSettingBridge *setting);
 
-gboolean     nm_setting_bridge_get_multicast_snooping (NMSettingBridge *setting);
+gboolean nm_setting_bridge_get_multicast_snooping(NMSettingBridge *setting);
 NM_AVAILABLE_IN_1_18
-gboolean     nm_setting_bridge_get_vlan_filtering (NMSettingBridge *setting);
+gboolean nm_setting_bridge_get_vlan_filtering(NMSettingBridge *setting);
 NM_AVAILABLE_IN_1_18
-guint16      nm_setting_bridge_get_vlan_default_pvid (NMSettingBridge *setting);
+guint16 nm_setting_bridge_get_vlan_default_pvid(NMSettingBridge *setting);
 NM_AVAILABLE_IN_1_18
-void          nm_setting_bridge_add_vlan (NMSettingBridge *setting,
-                                          NMBridgeVlan *vlan);
+void nm_setting_bridge_add_vlan(NMSettingBridge *setting, NMBridgeVlan *vlan);
 NM_AVAILABLE_IN_1_18
-guint         nm_setting_bridge_get_num_vlans (NMSettingBridge *setting);
+guint nm_setting_bridge_get_num_vlans(NMSettingBridge *setting);
 NM_AVAILABLE_IN_1_18
-NMBridgeVlan *nm_setting_bridge_get_vlan (NMSettingBridge *setting, guint idx);
+NMBridgeVlan *nm_setting_bridge_get_vlan(NMSettingBridge *setting, guint idx);
 NM_AVAILABLE_IN_1_18
-void          nm_setting_bridge_remove_vlan (NMSettingBridge *setting, guint idx);
+void nm_setting_bridge_remove_vlan(NMSettingBridge *setting, guint idx);
 NM_AVAILABLE_IN_1_18
-gboolean      nm_setting_bridge_remove_vlan_by_vid (NMSettingBridge *setting,
-                                                    guint16 vid_start,
-                                                    guint16 vid_end);
+gboolean
+nm_setting_bridge_remove_vlan_by_vid(NMSettingBridge *setting, guint16 vid_start, guint16 vid_end);
 NM_AVAILABLE_IN_1_18
-void          nm_setting_bridge_clear_vlans (NMSettingBridge *setting);
+void nm_setting_bridge_clear_vlans(NMSettingBridge *setting);
 
 NM_AVAILABLE_IN_1_18
-GType          nm_bridge_vlan_get_type (void);
+GType nm_bridge_vlan_get_type(void);
 NM_AVAILABLE_IN_1_18
-NMBridgeVlan * nm_bridge_vlan_new (guint16 vid_start, guint16 vid_end);
+NMBridgeVlan *nm_bridge_vlan_new(guint16 vid_start, guint16 vid_end);
 NM_AVAILABLE_IN_1_18
-NMBridgeVlan * nm_bridge_vlan_ref (NMBridgeVlan *vlan);
+NMBridgeVlan *nm_bridge_vlan_ref(NMBridgeVlan *vlan);
 NM_AVAILABLE_IN_1_18
-void           nm_bridge_vlan_unref (NMBridgeVlan *vlan);
+void nm_bridge_vlan_unref(NMBridgeVlan *vlan);
 NM_AVAILABLE_IN_1_18
-NMBridgeVlan * nm_bridge_vlan_new_clone (const NMBridgeVlan *vlan);
+NMBridgeVlan *nm_bridge_vlan_new_clone(const NMBridgeVlan *vlan);
 NM_AVAILABLE_IN_1_18
-int            nm_bridge_vlan_cmp (const NMBridgeVlan *a, const NMBridgeVlan *b);
+int nm_bridge_vlan_cmp(const NMBridgeVlan *a, const NMBridgeVlan *b);
 NM_AVAILABLE_IN_1_18
-void           nm_bridge_vlan_seal (NMBridgeVlan *vlan);
+void nm_bridge_vlan_seal(NMBridgeVlan *vlan);
 NM_AVAILABLE_IN_1_18
-gboolean       nm_bridge_vlan_is_sealed (const NMBridgeVlan *vlan);
+gboolean nm_bridge_vlan_is_sealed(const NMBridgeVlan *vlan);
 NM_AVAILABLE_IN_1_18
-void           nm_bridge_vlan_set_untagged (NMBridgeVlan *vlan, gboolean value);
+void nm_bridge_vlan_set_untagged(NMBridgeVlan *vlan, gboolean value);
 NM_AVAILABLE_IN_1_18
-void           nm_bridge_vlan_set_pvid (NMBridgeVlan *vlan, gboolean value);
+void nm_bridge_vlan_set_pvid(NMBridgeVlan *vlan, gboolean value);
 NM_AVAILABLE_IN_1_18
-gboolean       nm_bridge_vlan_get_vid_range (const NMBridgeVlan *vlan, guint16 *vid_start, guint16 *vid_end);
+gboolean
+nm_bridge_vlan_get_vid_range(const NMBridgeVlan *vlan, guint16 *vid_start, guint16 *vid_end);
 NM_AVAILABLE_IN_1_18
-gboolean       nm_bridge_vlan_is_untagged (const NMBridgeVlan *vlan);
+gboolean nm_bridge_vlan_is_untagged(const NMBridgeVlan *vlan);
 NM_AVAILABLE_IN_1_18
-gboolean       nm_bridge_vlan_is_pvid (const NMBridgeVlan *vlan);
+gboolean nm_bridge_vlan_is_pvid(const NMBridgeVlan *vlan);
 
 NM_AVAILABLE_IN_1_18
-char         * nm_bridge_vlan_to_str (const NMBridgeVlan *vlan, GError **error);
+char *nm_bridge_vlan_to_str(const NMBridgeVlan *vlan, GError **error);
 NM_AVAILABLE_IN_1_18
-NMBridgeVlan * nm_bridge_vlan_from_str (const char *str, GError **error);
+NMBridgeVlan *nm_bridge_vlan_from_str(const char *str, GError **error);
 
 NM_AVAILABLE_IN_1_24
-const char *   nm_setting_bridge_get_group_address (const NMSettingBridge *setting);
+const char *nm_setting_bridge_get_group_address(const NMSettingBridge *setting);
 
 NM_AVAILABLE_IN_1_24
-const char *   nm_setting_bridge_get_vlan_protocol (const NMSettingBridge *setting);
+const char *nm_setting_bridge_get_vlan_protocol(const NMSettingBridge *setting);
 
 NM_AVAILABLE_IN_1_24
-gboolean nm_setting_bridge_get_vlan_stats_enabled (const NMSettingBridge *setting);
+gboolean nm_setting_bridge_get_vlan_stats_enabled(const NMSettingBridge *setting);
 
 NM_AVAILABLE_IN_1_24
-const char *   nm_setting_bridge_get_multicast_router (const NMSettingBridge *setting);
+const char *nm_setting_bridge_get_multicast_router(const NMSettingBridge *setting);
 
 NM_AVAILABLE_IN_1_24
-gboolean nm_setting_bridge_get_multicast_query_use_ifaddr (const NMSettingBridge *setting);
+gboolean nm_setting_bridge_get_multicast_query_use_ifaddr(const NMSettingBridge *setting);
 
 NM_AVAILABLE_IN_1_24
-gboolean nm_setting_bridge_get_multicast_querier (const NMSettingBridge *setting);
+gboolean nm_setting_bridge_get_multicast_querier(const NMSettingBridge *setting);
 
 NM_AVAILABLE_IN_1_26
-guint32 nm_setting_bridge_get_multicast_hash_max (const NMSettingBridge *setting);
+guint32 nm_setting_bridge_get_multicast_hash_max(const NMSettingBridge *setting);
 
 NM_AVAILABLE_IN_1_26
-guint32 nm_setting_bridge_get_multicast_last_member_count (const NMSettingBridge *setting);
+guint32 nm_setting_bridge_get_multicast_last_member_count(const NMSettingBridge *setting);
 
 NM_AVAILABLE_IN_1_26
-guint64 nm_setting_bridge_get_multicast_last_member_interval (const NMSettingBridge *setting);
+guint64 nm_setting_bridge_get_multicast_last_member_interval(const NMSettingBridge *setting);
 
 NM_AVAILABLE_IN_1_26
-guint64 nm_setting_bridge_get_multicast_membership_interval (const NMSettingBridge *setting);
+guint64 nm_setting_bridge_get_multicast_membership_interval(const NMSettingBridge *setting);
 
 NM_AVAILABLE_IN_1_26
-guint64 nm_setting_bridge_get_multicast_querier_interval (const NMSettingBridge *setting);
+guint64 nm_setting_bridge_get_multicast_querier_interval(const NMSettingBridge *setting);
 
 NM_AVAILABLE_IN_1_26
-guint64 nm_setting_bridge_get_multicast_query_interval (const NMSettingBridge *setting);
+guint64 nm_setting_bridge_get_multicast_query_interval(const NMSettingBridge *setting);
 
 NM_AVAILABLE_IN_1_26
-guint64 nm_setting_bridge_get_multicast_query_response_interval (const NMSettingBridge *setting);
+guint64 nm_setting_bridge_get_multicast_query_response_interval(const NMSettingBridge *setting);
 
 NM_AVAILABLE_IN_1_26
-guint32 nm_setting_bridge_get_multicast_startup_query_count (const NMSettingBridge *setting);
+guint32 nm_setting_bridge_get_multicast_startup_query_count(const NMSettingBridge *setting);
 
 NM_AVAILABLE_IN_1_26
-guint64 nm_setting_bridge_get_multicast_startup_query_interval (const NMSettingBridge *setting);
+guint64 nm_setting_bridge_get_multicast_startup_query_interval(const NMSettingBridge *setting);
 
 G_END_DECLS