lib/ignore: Refactor: notMatched should be one of the constants

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3031
This commit is contained in:
Jakob Borg 2016-05-04 07:15:56 +00:00
parent abb96802cb
commit 6720906ee5

View File

@ -23,13 +23,12 @@ import (
)
const (
resultInclude Result = 1 << iota
resultDeletable = 1 << iota
resultFoldCase = 1 << iota
resultNotMatched Result = 0
resultInclude Result = 1 << iota
resultDeletable = 1 << iota
resultFoldCase = 1 << iota
)
var notMatched Result = 0
type Pattern struct {
pattern string
match glob.Glob
@ -125,14 +124,14 @@ func (m *Matcher) Parse(r io.Reader, file string) error {
func (m *Matcher) Match(file string) (result Result) {
if m == nil {
return notMatched
return resultNotMatched
}
m.mut.Lock()
defer m.mut.Unlock()
if len(m.patterns) == 0 {
return notMatched
return resultNotMatched
}
if m.matches != nil {
@ -166,8 +165,8 @@ func (m *Matcher) Match(file string) (result Result) {
}
}
// Default to false.
return notMatched
// Default to not matching.
return resultNotMatched
}
// Patterns return a list of the loaded patterns, as they've been parsed