Skip to content

Commit

Permalink
Merge pull request #5 from Martyrshot/upgrade-v9.19.17
Browse files Browse the repository at this point in the history
Upgrade v9.19.17
  • Loading branch information
Martyrshot authored Oct 18, 2023
2 parents db4dabe + 8702103 commit 5808549
Show file tree
Hide file tree
Showing 4,644 changed files with 208,681 additions and 204,356 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
13 changes: 9 additions & 4 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ PointerAlignment: Right
PointerBindsToType: false
IncludeBlocks: Regroup
IncludeCategories:
- Regex: '^<(urcu\.h|urcu/urcu-|urcu-)'
Priority: 2
- Regex: '^<urcu/'
Priority: 3
- Regex: '^<isc/'
Priority: 5
- Regex: '^<(pk11|pkcs11)/'
Expand All @@ -50,18 +54,18 @@ IncludeCategories:
Priority: 35
- Regex: '^<irs/'
Priority: 40
- Regex: '^<bind9/'
Priority: 45
- Regex: '^<(dig|named|rndc|confgen|dlz)/'
Priority: 50
- Regex: '^<dlz_'
Priority: 55
- Regex: '^".*"'
Priority: 99
- Regex: '^<tests/'
Priority: 100
- Regex: '<openssl/'
Priority: 1
Priority: 4
- Regex: '<(mysql|protobuf-c)/'
Priority: 1
Priority: 4
- Regex: '.*'
Priority: 0
IndentExternBlock: NoIndent
Expand All @@ -74,3 +78,4 @@ PenaltyBreakString: 80
PenaltyExcessCharacter: 100
Standard: Cpp11
ContinuationIndentWidth: 8
ForEachMacros: [ 'cds_lfs_for_each', 'cds_lfs_for_each_safe', 'cds_list_for_each_entry_safe', 'ISC_LIST_FOREACH', 'ISC_LIST_FOREACH_SAFE' ]
44 changes: 30 additions & 14 deletions .clang-format.headers
Original file line number Diff line number Diff line change
Expand Up @@ -34,24 +34,40 @@ PointerAlignment: Right
PointerBindsToType: false
IncludeBlocks: Regroup
IncludeCategories:
- Regex: '^<isc/'
- Regex: '^<(urcu/urcu-|urcu-)'
Priority: 2
- Regex: '^<dns/'
- Regex: '^<urcu/'
Priority: 3
- Regex: '^<iscccc/'
Priority: 4
- Regex: '^<isccfg/'
- Regex: '^<isc/'
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/'
Priority: 6
- Regex: '^<bind9/)'
Priority: 7
- Regex: '^(<[^/]*)/)'
Priority: 8
- Regex: '<[[:alnum:].]+>'
Priority: 1
- Regex: '".*"'
Priority: 9
Priority: 35
- Regex: '^<irs/'
Priority: 40
- Regex: '^<(dig|named|rndc|confgen|dlz)/'
Priority: 50
- Regex: '^<dlz_'
Priority: 55
- Regex: '^".*"'
Priority: 99
- Regex: '^<tests/'
Priority: 100
- Regex: '<openssl/'
Priority: 4
- Regex: '<(mysql|protobuf-c)/'
Priority: 4
- Regex: '.*'
Priority: 0
IndentExternBlock: NoIndent
KeepEmptyLinesAtTheStartOfBlocks: false
MaxEmptyLinesToKeep: 1
Expand Down
14 changes: 11 additions & 3 deletions .dir-locals.el
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@
(expand-file-name
(concat directory-of-current-dir-locals-file "lib/bind9/include"))

;; libtest
(expand-file-name
(concat directory-of-current-dir-locals-file "tests/include"))

;; bin
(expand-file-name
(concat directory-of-current-dir-locals-file "bin/check"))
Expand All @@ -57,7 +61,7 @@
(expand-file-name
(concat directory-of-current-dir-locals-file "bin/confgen"))
(expand-file-name
(concat directory-of-current-dir-locals-file "bin/confgen/include"))
(concat directory-of-current-dir-locals-file "bin/confgen/include"))
(expand-file-name
(concat directory-of-current-dir-locals-file "bin/dig/include"))
(expand-file-name
Expand All @@ -73,6 +77,9 @@
(expand-file-name
(concat directory-of-current-dir-locals-file "bin/rndc/include"))

(expand-file-name "/usr/include/libxml2")
(expand-file-name "/usr/include/json-c")

(expand-file-name "/usr/local/opt/[email protected]/include")
(expand-file-name "/usr/local/opt/libxml2/include/libxml2")
(expand-file-name "/usr/local/opt/json-c/include/json-c/")
Expand Down Expand Up @@ -103,8 +110,9 @@
"--enable=all"
"--suppress=missingIncludeSystem"
"--suppress=nullPointerRedundantCheck"
(concat "--suppressions-list=" (expand-file-name
(concat directory-of-current-dir-locals-file "util/suppressions.txt")))
"--suppress=preprocessorErrorDirective"
"--suppress=unknownMacro"
"--suppress=unmatchedSuppression"
(concat "-include=" (expand-file-name
(concat directory-of-current-dir-locals-file "config.h")))
)
Expand Down
Loading

0 comments on commit 5808549

Please sign in to comment.