daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull request: 2479 simpl

Browse Source 
Updates #2479.

Squashed commit of the following:

commit 0fdb0d041d0bd0d9af64513cf82397456a30e2f2
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Mar 29 19:22:56 2021 +0300

    dnsfilter: add a comment

commit d5d6538b8b5133d7c1e9b242a8ac802448d40893
Merge: 6a09acc2 e710ce11
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Mar 29 19:19:39 2021 +0300

    Merge branch 'master' into 2479-simpl

commit 6a09acc262
Author: jvoisin <julien.voisin@dustri.org>
Date:   Tue Dec 22 16:43:47 2020 +0100

    Generalise a construct to simplify a function
This commit is contained in:
Ainar Garipov
2021-03-29 19:35:35 +03:00
parent e710ce1100
commit 48e82f9ab5
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
internal/dnsfilter/rewrites.go
View File

@@ -122,21 +122,27 @@ func findRewrites(a []RewriteEntry, host string) []RewriteEntry {
sort.Sort(rr) sort.Sort(rr)
isWC := isWildcard(rr[0].Domain) for i, r := range rr {
if !isWC { if isWildcard(r.Domain) {
for i, r := range rr { // Don't use rr[:0], because we need to return at least
if isWildcard(r.Domain) { // one item here.
rr = rr[:i] rr = rr[:max(1, i)]
break
} break
} }
} else {
rr = rr[:1]
} }
return rr return rr
} }
func max(a, b int) int {
if a > b {
return a
}
return b
}
func rewriteArrayDup(a []RewriteEntry) []RewriteEntry { func rewriteArrayDup(a []RewriteEntry) []RewriteEntry {
a2 := make([]RewriteEntry, len(a)) a2 := make([]RewriteEntry, len(a))
copy(a2, a) copy(a2, a)