2
0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00

Improve the #include block sorting

The IncludeCategories was incomplete, it missed pk11/ and dst/ headers
and the rule that put "" header after all <> headers was broken.
This commit is contained in:
Ondřej Surý
2020-03-09 15:26:54 +01:00
parent fd18da8cac
commit 5071c47fbd

View File

@@ -33,23 +33,35 @@ PointerBindsToType: false
IncludeBlocks: Regroup IncludeBlocks: Regroup
IncludeCategories: IncludeCategories:
- Regex: '^<isc/' - Regex: '^<isc/'
Priority: 2
- Regex: '^<dns/'
Priority: 3
- Regex: '^<iscccc/'
Priority: 4
- Regex: '^<isccfg/'
Priority: 5 Priority: 5
- Regex: '^<(pk11|pkcs11)/'
Priority: 10
- Regex: '^<dns/'
Priority: 15
- Regex: '^<dst/'
Priority: 20
- Regex: '^<isccc/'
Priority: 25
- Regex: '^<isccfg/'
Priority: 30
- Regex: '^<ns/' - Regex: '^<ns/'
Priority: 6 Priority: 35
- Regex: '^<bind9/)' - Regex: '^<irs/'
Priority: 7 Priority: 40
- Regex: '^(<[^/]*)/)' - Regex: '^<bind9/'
Priority: 8 Priority: 45
- Regex: '<[[:alnum:].]+>' - Regex: '^<(dig|named|rndc|confgen|dlz)/'
Priority: 50
- Regex: '^<dlz_'
Priority: 55
- Regex: '^".*"'
Priority: 99
- Regex: '<openssl/'
Priority: 1 Priority: 1
- Regex: '".*"' - Regex: '<(mysql|protobuf-c)/'
Priority: 9 Priority: 1
- Regex: '.*'
Priority: 0
KeepEmptyLinesAtTheStartOfBlocks: false KeepEmptyLinesAtTheStartOfBlocks: false
MaxEmptyLinesToKeep: 1 MaxEmptyLinesToKeep: 1
PenaltyBreakAssignment: 30 PenaltyBreakAssignment: 30