mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2026-11-22 04:52:27 +09:00
Generalise a construct to simplify a function
This commit is contained in:
1 parent
bdff46ec1d
commit
6a09acc262
1 file changed
+11
-9
@@ -122,21 +122,23 @@ 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 {
|
rr = rr[:max(1, i)]
|
||||||
if isWildcard(r.Domain) {
|
break
|
||||||
rr = rr[:i]
|
|
||||||
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)
|
||||||
|
|||||||
Reference in new issue
Block a user