From 6720906ee52a86902751abd4e6294eb4d56fc938 Mon Sep 17 00:00:00 2001
From: Jakob Borg <jakob@nym.se>
Date: Wed, 4 May 2016 07:15:56 +0000
Subject: [PATCH] lib/ignore: Refactor: notMatched should be one of the
 constants

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3031
---
 lib/ignore/ignore.go | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/ignore/ignore.go b/lib/ignore/ignore.go
index 14e7de49..493e0046 100644
--- a/lib/ignore/ignore.go
+++ b/lib/ignore/ignore.go
@@ -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