mirror of
https://github.com/octoleo/syncthing.git
synced 2024-11-09 14:50:56 +00:00
Map is a reference type, does not need * here
This commit is contained in:
parent
2a886576a6
commit
99dc1eec50
@ -38,14 +38,13 @@ type Pattern struct {
|
|||||||
type Matcher struct {
|
type Matcher struct {
|
||||||
patterns []Pattern
|
patterns []Pattern
|
||||||
oldMatches map[string]bool
|
oldMatches map[string]bool
|
||||||
|
|
||||||
newMatches map[string]bool
|
newMatches map[string]bool
|
||||||
mut sync.Mutex
|
mut sync.Mutex
|
||||||
}
|
}
|
||||||
|
|
||||||
type MatcherCache struct {
|
type MatcherCache struct {
|
||||||
patterns []Pattern
|
patterns []Pattern
|
||||||
matches *map[string]bool
|
matches map[string]bool
|
||||||
}
|
}
|
||||||
|
|
||||||
func Load(file string, cache bool) (*Matcher, error) {
|
func Load(file string, cache bool) (*Matcher, error) {
|
||||||
@ -66,7 +65,7 @@ func Load(file string, cache bool) (*Matcher, error) {
|
|||||||
matcher.newMatches = make(map[string]bool)
|
matcher.newMatches = make(map[string]bool)
|
||||||
caches[file] = MatcherCache{
|
caches[file] = MatcherCache{
|
||||||
patterns: matcher.patterns,
|
patterns: matcher.patterns,
|
||||||
matches: &matcher.newMatches,
|
matches: matcher.newMatches,
|
||||||
}
|
}
|
||||||
return matcher, nil
|
return matcher, nil
|
||||||
}
|
}
|
||||||
@ -75,9 +74,9 @@ func Load(file string, cache bool) (*Matcher, error) {
|
|||||||
// matches map and update the pointer. (This prevents matches map from
|
// matches map and update the pointer. (This prevents matches map from
|
||||||
// growing indefinately, as we only cache whatever we've matched in the last
|
// growing indefinately, as we only cache whatever we've matched in the last
|
||||||
// iteration, rather than through runtime history)
|
// iteration, rather than through runtime history)
|
||||||
matcher.oldMatches = *cached.matches
|
matcher.oldMatches = cached.matches
|
||||||
matcher.newMatches = make(map[string]bool)
|
matcher.newMatches = make(map[string]bool)
|
||||||
cached.matches = &matcher.newMatches
|
cached.matches = matcher.newMatches
|
||||||
caches[file] = cached
|
caches[file] = cached
|
||||||
return matcher, nil
|
return matcher, nil
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user