diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-09-29 18:22:18 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-09-29 18:22:18 +0200 |
| commit | f9d0489123d84eb9626987fe34dae9c43228f56d (patch) | |
| tree | a8d3ac1d1553dcb0254c05f7e3e6d4c0bd26d02d | |
| parent | 88071abb4355a7f680d87277272d2ba34a235a9b (diff) | |
| download | NetworkManager-f9d0489123d84eb9626987fe34dae9c43228f56d.tar.gz | |
all: use C-style comments for "clang-format on|off"
| -rw-r--r-- | clients/common/nm-meta-setting-desc.c | 6 | ||||
| -rw-r--r-- | libnm-core/nm-setting-vlan.h | 4 | ||||
| -rw-r--r-- | libnm-core/nm-setting-wireless-security.h | 4 | ||||
| -rw-r--r-- | libnm-core/nm-setting-wireless.h | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index e8edc02a32..cdb3084a07 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -4286,9 +4286,9 @@ static const char *const *_complete_fcn_ethtool(ARGS_COMPLETE_FCN) /*****************************************************************************/ -static const NMMetaPropertyInfo property_info_BOND_OPTIONS; +/* clang-format off */ -// clang-format off +static const NMMetaPropertyInfo property_info_BOND_OPTIONS; #define NESTED_PROPERTY_INFO_BOND(...) \ .parent_info = &property_info_BOND_OPTIONS, \ @@ -8271,7 +8271,7 @@ const NMMetaSettingInfoEditor nm_meta_setting_infos_editor[] = { ), }; -// clang-format on +/* clang-format on */ /*****************************************************************************/ diff --git a/libnm-core/nm-setting-vlan.h b/libnm-core/nm-setting-vlan.h index a300833d7b..9d2cf3a0b7 100644 --- a/libnm-core/nm-setting-vlan.h +++ b/libnm-core/nm-setting-vlan.h @@ -57,12 +57,12 @@ typedef struct { * A selector for traffic priority maps; these map Linux SKB priorities * to 802.1p priorities used in VLANs. **/ -// clang-format off +/* clang-format off */ typedef enum { NM_VLAN_INGRESS_MAP, NM_VLAN_EGRESS_MAP } NMVlanPriorityMap; -// clang-format on +/* clang-format on */ /** * NMVlanFlags: diff --git a/libnm-core/nm-setting-wireless-security.h b/libnm-core/nm-setting-wireless-security.h index 096eed55cd..d488077d5b 100644 --- a/libnm-core/nm-setting-wireless-security.h +++ b/libnm-core/nm-setting-wireless-security.h @@ -120,7 +120,7 @@ typedef enum { /*< flags >*/ * * Since: 1.12 **/ -// clang-format off +/* clang-format off */ typedef enum { NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT = 0, NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE = 1, @@ -129,7 +129,7 @@ typedef enum { _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 +/* 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 0ecd4582a0..dec7916a3d 100644 --- a/libnm-core/nm-setting-wireless.h +++ b/libnm-core/nm-setting-wireless.h @@ -52,7 +52,7 @@ G_BEGIN_DECLS * * Since: 1.12 */ -// clang-format off +/* clang-format off */ typedef enum { /*< flags >*/ NM_SETTING_WIRELESS_WAKE_ON_WLAN_NONE = 0, /*< skip >*/ NM_SETTING_WIRELESS_WAKE_ON_WLAN_ANY = 0x2, @@ -71,7 +71,7 @@ typedef enum { /*< fl 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 +/* clang-format on */ #define NM_SETTING_WIRELESS_SSID "ssid" #define NM_SETTING_WIRELESS_MODE "mode" |