colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clang-format: use "IndentPPDirectives:None" instead of "BeforeHash"

Browse Source 
Subjectively, I think this looks better.
This commit is contained in:
Thomas Haller
2021-07-09 08:48:48 +02:00
parent dedd228667
commit 4e109bacab
187 changed files with 1346 additions and 1355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.clang-format
View File

@@ -44,7 +44,7 @@ BreakStringLiterals: true
IncludeBlocks: Preserve IncludeBlocks: Preserve
IndentCaseLabels: false IndentCaseLabels: false
IndentGotoLabels: false IndentGotoLabels: false
IndentPPDirectives: BeforeHash IndentPPDirectives: None
IndentWrappedFunctionNames: false IndentWrappedFunctionNames: false
KeepEmptyLinesAtTheStartOfBlocks: false KeepEmptyLinesAtTheStartOfBlocks: false
MaxEmptyLinesToKeep: 1 MaxEmptyLinesToKeep: 1

4
src/core/devices/nm-device-logging.h
View File

@@ -12,9 +12,7 @@
#define _NM_DEVICE_CAST(self) ((NMDevice *) (self)) #define _NM_DEVICE_CAST(self) ((NMDevice *) (self))
#elif !defined(_NMLOG_DEVICE_TYPE) #elif !defined(_NMLOG_DEVICE_TYPE)
#define _NM_DEVICE_CAST(self) \ #define _NM_DEVICE_CAST(self) \
_Generic((self), NMDevice * \ _Generic((self), NMDevice * : ((NMDevice *) (self)), NMDevice *const : ((NMDevice *) (self)))
: ((NMDevice *) (self)), NMDevice *const \
: ((NMDevice *) (self)))
#else #else
#define _NM_DEVICE_CAST(self) \ #define _NM_DEVICE_CAST(self) \
_Generic((self), \ _Generic((self), \

3
src/core/dhcp/nm-dhcp-dhclient.c
View File

@@ -47,8 +47,7 @@ _addr_family_to_path_part(int addr_family)
#define NM_DHCP_DHCLIENT_CLASS(klass) \ #define NM_DHCP_DHCLIENT_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_DHCP_DHCLIENT, NMDhcpDhclientClass)) (G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_DHCP_DHCLIENT, NMDhcpDhclientClass))
#define NM_IS_DHCP_DHCLIENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_DHCP_DHCLIENT)) #define NM_IS_DHCP_DHCLIENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_DHCP_DHCLIENT))
#define NM_IS_DHCP_DHCLIENT_CLASS(klass) \ #define NM_IS_DHCP_DHCLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_DHCP_DHCLIENT))
(G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_DHCP_DHCLIENT))
#define NM_DHCP_DHCLIENT_GET_CLASS(obj) \ #define NM_DHCP_DHCLIENT_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_DHCP_DHCLIENT, NMDhcpDhclientClass)) (G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_DHCP_DHCLIENT, NMDhcpDhclientClass))

3
src/core/dhcp/nm-dhcp-dhcpcanon.c
View File

@@ -22,8 +22,7 @@
#define NM_DHCP_DHCPCANON_CLASS(klass) \ #define NM_DHCP_DHCPCANON_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_DHCP_DHCPCANON, NMDhcpDhcpcanonClass)) (G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_DHCP_DHCPCANON, NMDhcpDhcpcanonClass))
#define NM_IS_DHCP_DHCPCANON(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_DHCP_DHCPCANON)) #define NM_IS_DHCP_DHCPCANON(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_DHCP_DHCPCANON))
#define NM_IS_DHCP_DHCPCANON_CLASS(klass) \ #define NM_IS_DHCP_DHCPCANON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_DHCP_DHCPCANON))
(G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_DHCP_DHCPCANON))
#define NM_DHCP_DHCPCANON_GET_CLASS(obj) \ #define NM_DHCP_DHCPCANON_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_DHCP_DHCPCANON, NMDhcpDhcpcanonClass)) (G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_DHCP_DHCPCANON, NMDhcpDhcpcanonClass))

3
src/core/dhcp/nm-dhcp-dhcpcd.c
View File

@@ -23,8 +23,7 @@
/*****************************************************************************/ /*****************************************************************************/
#define NM_TYPE_DHCP_DHCPCD (nm_dhcp_dhcpcd_get_type()) #define NM_TYPE_DHCP_DHCPCD (nm_dhcp_dhcpcd_get_type())
#define NM_DHCP_DHCPCD(obj) \ #define NM_DHCP_DHCPCD(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_DHCP_DHCPCD, NMDhcpDhcpcd))
(G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_DHCP_DHCPCD, NMDhcpDhcpcd))
#define NM_DHCP_DHCPCD_CLASS(klass) \ #define NM_DHCP_DHCPCD_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_DHCP_DHCPCD, NMDhcpDhcpcdClass)) (G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_DHCP_DHCPCD, NMDhcpDhcpcdClass))
#define NM_IS_DHCP_DHCPCD(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_DHCP_DHCPCD)) #define NM_IS_DHCP_DHCPCD(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_DHCP_DHCPCD))

3
src/libnm-glib-aux/nm-macros-internal.h
View File

@@ -192,8 +192,7 @@ _nm_auto_freev(gpointer ptr)
_Pragma("GCC diagnostic push") _Pragma(_NM_PRAGMA_WARNING_DO(warning)) _Pragma("GCC diagnostic push") _Pragma(_NM_PRAGMA_WARNING_DO(warning))
#elif defined(__clang__) #elif defined(__clang__)
#define NM_PRAGMA_WARNING_DISABLE(warning) \ #define NM_PRAGMA_WARNING_DISABLE(warning) \
_Pragma("clang diagnostic push") \ _Pragma("clang diagnostic push") _Pragma(_NM_PRAGMA_WARNING_DO("-Wunknown-warning-option")) \
_Pragma(_NM_PRAGMA_WARNING_DO("-Wunknown-warning-option")) \
_Pragma(_NM_PRAGMA_WARNING_DO(warning)) _Pragma(_NM_PRAGMA_WARNING_DO(warning))
#else #else
#define NM_PRAGMA_WARNING_DISABLE(warning) #define NM_PRAGMA_WARNING_DISABLE(warning)

5
src/libnm-glib-aux/nm-test-utils.h
View File

@@ -2741,10 +2741,7 @@ typedef enum {
} \ } \
G_STMT_END G_STMT_END
#define NMTST_VARIANT_CHANGE_PROPERTY(__setting_name, \ #define NMTST_VARIANT_CHANGE_PROPERTY(__setting_name, __property_name, __format_string, __value) \
__property_name, \
__format_string, \
__value) \
G_STMT_START \ G_STMT_START \
{ \ { \
NMTST_VARIANT_DROP_PROPERTY(__setting_name, __property_name); \ NMTST_VARIANT_DROP_PROPERTY(__setting_name, __property_name); \