diff options
author | Antonio Cardace <acardace@redhat.com> | 2020-09-28 15:46:32 +0200 |
---|---|---|
committer | Antonio Cardace <acardace@redhat.com> | 2020-09-28 15:46:32 +0200 |
commit | e8b54b9ddf906025a90aa185f8fe8d686ed17c27 (patch) | |
tree | 102191a257575d561e8348b71b53912374eeb237 | |
parent | 059c144afbb5aa1f1b571645021a81aef37a9a45 (diff) | |
download | NetworkManager-e8b54b9ddf906025a90aa185f8fe8d686ed17c27.tar.gz |
libnm-core: turn off clang-format for 'glib-mkenums'
glib-mkenums doesn't work with enums on single line
or with enums entries that span multiple lines, turn off
automatic formatting for these special cases to not break
docs generation.
Signed-off-by: Antonio Cardace <acardace@redhat.com>
-rw-r--r-- | libnm-core/nm-setting-vlan.h | 6 | ||||
-rw-r--r-- | libnm-core/nm-setting-wireless-security.h | 14 | ||||
-rw-r--r-- | libnm-core/nm-setting-wireless.h | 36 |
3 files changed, 31 insertions, 25 deletions
diff --git a/libnm-core/nm-setting-vlan.h b/libnm-core/nm-setting-vlan.h index bd0da80f7a..3370edd8b2 100644 --- a/libnm-core/nm-setting-vlan.h +++ b/libnm-core/nm-setting-vlan.h @@ -54,10 +54,12 @@ typedef struct { * A selector for traffic priority maps; these map Linux SKB priorities * to 802.1p priorities used in VLANs. **/ +// clang-format off typedef enum { - NM_VLAN_INGRESS_MAP, - NM_VLAN_EGRESS_MAP + NM_VLAN_INGRESS_MAP, + NM_VLAN_EGRESS_MAP } NMVlanPriorityMap; +// clang-format on /** * NMVlanFlags: diff --git a/libnm-core/nm-setting-wireless-security.h b/libnm-core/nm-setting-wireless-security.h index 1ca0c280fb..1b89f92983 100644 --- a/libnm-core/nm-setting-wireless-security.h +++ b/libnm-core/nm-setting-wireless-security.h @@ -109,14 +109,16 @@ typedef enum { /*< flags >*/ * * Since: 1.12 **/ +// clang-format off typedef enum { - NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT = 0, - NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE = 1, - NM_SETTING_WIRELESS_SECURITY_FILS_OPTIONAL = 2, - NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED = 3, - _NM_SETTING_WIRELESS_SECURITY_FILS_NUM, /*< skip >*/ - NM_SETTING_WIRELESS_SECURITY_FILS_LAST = _NM_SETTING_WIRELESS_SECURITY_FILS_NUM - 1, /*< skip >*/ + NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT = 0, + NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE = 1, + NM_SETTING_WIRELESS_SECURITY_FILS_OPTIONAL = 2, + NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED = 3, + _NM_SETTING_WIRELESS_SECURITY_FILS_NUM, /*< skip >*/ + NM_SETTING_WIRELESS_SECURITY_FILS_LAST = _NM_SETTING_WIRELESS_SECURITY_FILS_NUM - 1, /*< skip >*/ } NMSettingWirelessSecurityFils; +// clang-format on #define NM_SETTING_WIRELESS_SECURITY_KEY_MGMT "key-mgmt" #define NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX "wep-tx-keyidx" diff --git a/libnm-core/nm-setting-wireless.h b/libnm-core/nm-setting-wireless.h index 0ae64486f4..f52543a72d 100644 --- a/libnm-core/nm-setting-wireless.h +++ b/libnm-core/nm-setting-wireless.h @@ -48,24 +48,26 @@ G_BEGIN_DECLS * * Since: 1.12 */ -typedef enum { /*< flags >*/ - NM_SETTING_WIRELESS_WAKE_ON_WLAN_NONE = 0, /*< skip >*/ - NM_SETTING_WIRELESS_WAKE_ON_WLAN_ANY = 0x2, - NM_SETTING_WIRELESS_WAKE_ON_WLAN_DISCONNECT = 0x4, - NM_SETTING_WIRELESS_WAKE_ON_WLAN_MAGIC = 0x8, - NM_SETTING_WIRELESS_WAKE_ON_WLAN_GTK_REKEY_FAILURE = 0x10, - NM_SETTING_WIRELESS_WAKE_ON_WLAN_EAP_IDENTITY_REQUEST = 0x20, - NM_SETTING_WIRELESS_WAKE_ON_WLAN_4WAY_HANDSHAKE = 0x40, - NM_SETTING_WIRELESS_WAKE_ON_WLAN_RFKILL_RELEASE = 0x80, - NM_SETTING_WIRELESS_WAKE_ON_WLAN_TCP = 0x100, - - NM_SETTING_WIRELESS_WAKE_ON_WLAN_ALL = 0x1FE, - - NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT = 0x1, - NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE = 0x8000, - - NM_SETTING_WIRELESS_WAKE_ON_WLAN_EXCLUSIVE_FLAGS = NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT | NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE, /*< skip >*/ +// clang-format off +typedef enum { /*< flags >*/ + NM_SETTING_WIRELESS_WAKE_ON_WLAN_NONE = 0, /*< skip >*/ + NM_SETTING_WIRELESS_WAKE_ON_WLAN_ANY = 0x2, + NM_SETTING_WIRELESS_WAKE_ON_WLAN_DISCONNECT = 0x4, + NM_SETTING_WIRELESS_WAKE_ON_WLAN_MAGIC = 0x8, + NM_SETTING_WIRELESS_WAKE_ON_WLAN_GTK_REKEY_FAILURE = 0x10, + NM_SETTING_WIRELESS_WAKE_ON_WLAN_EAP_IDENTITY_REQUEST = 0x20, + NM_SETTING_WIRELESS_WAKE_ON_WLAN_4WAY_HANDSHAKE = 0x40, + NM_SETTING_WIRELESS_WAKE_ON_WLAN_RFKILL_RELEASE = 0x80, + NM_SETTING_WIRELESS_WAKE_ON_WLAN_TCP = 0x100, + + NM_SETTING_WIRELESS_WAKE_ON_WLAN_ALL = 0x1FE, + + NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT = 0x1, + NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE = 0x8000, + + NM_SETTING_WIRELESS_WAKE_ON_WLAN_EXCLUSIVE_FLAGS = NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT | NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE, /*< skip >*/ } NMSettingWirelessWakeOnWLan; +// clang-format on #define NM_SETTING_WIRELESS_SSID "ssid" #define NM_SETTING_WIRELESS_MODE "mode" |