Rename some variables

arguments.go

@@ -25,13 +25,13 @@ Options:
 	-v, --verbose  Be verbose.`
 
 type arguments struct {
-	filenames    []string
+	filenames       []string
-	documentRoot string
+	documentRoot    string
-	concurrency  int
+	concurrency     int
-	timeout      time.Duration
+	timeout         time.Duration
-	recursive    bool
+	recursive       bool
-	exclude      *regexp.Regexp
+	excludedPattern *regexp.Regexp
-	verbose      bool
+	verbose         bool
 }
 
 func getArguments(argv []string) (arguments, error) {
@@ -61,9 +61,11 @@ func getArguments(argv []string) (arguments, error) {
 		}
 	}
 
-	var exclude *regexp.Regexp
+	r := (*regexp.Regexp)(nil)
+
 	if args["--exclude"] != nil {
-		exclude, err = regexp.Compile(args["--exclude"].(string))
+		r, err = regexp.Compile(args["--exclude"].(string))
+
 		if err != nil {
 			return arguments{}, err
 		}
@@ -75,7 +77,7 @@ func getArguments(argv []string) (arguments, error) {
 		int(c),
 		time.Duration(t) * time.Second,
 		args["--recursive"].(bool),
-		exclude,
+		r,
 		args["--verbose"].(bool),
 	}, nil
 }

file_checker.go

@@ -18,8 +18,8 @@ type fileChecker struct {
 	semaphore  semaphore
 }
 
-func newFileChecker(timeout time.Duration, d string, x *regexp.Regexp, s semaphore) fileChecker {
+func newFileChecker(timeout time.Duration, d string, r *regexp.Regexp, s semaphore) fileChecker {
-	return fileChecker{newURLChecker(timeout, d, x, s), s}
+	return fileChecker{newURLChecker(timeout, d, r, s), s}
 }
 
 func (c fileChecker) Check(f string) ([]urlResult, error) {

main.go

@@ -30,7 +30,11 @@ func main() {
 	}()
 
 	rc := make(chan fileResult, maxOpenFiles)
-	c := newFileChecker(args.timeout, args.documentRoot, args.exclude, newSemaphore(args.concurrency))
+	c := newFileChecker(
+		args.timeout,
+		args.documentRoot,
+		args.excludedPattern,
+		newSemaphore(args.concurrency))
 
 	go c.CheckMany(m.Filenames(), rc)
 

url_checker.go

@@ -13,14 +13,14 @@ import (
 )
 
 type urlChecker struct {
-	timeout      time.Duration
+	timeout         time.Duration
-	documentRoot string
+	documentRoot    string
-	exclude      *regexp.Regexp
+	excludedPattern *regexp.Regexp
-	semaphore    semaphore
+	semaphore       semaphore
 }
 
-func newURLChecker(t time.Duration, d string, x *regexp.Regexp, s semaphore) urlChecker {
+func newURLChecker(t time.Duration, d string, r *regexp.Regexp, s semaphore) urlChecker {
-	return urlChecker{t, d, x, s}
+	return urlChecker{t, d, r, s}
 }
 
 func (c urlChecker) Check(u string, f string) error {
@@ -29,7 +29,7 @@ func (c urlChecker) Check(u string, f string) error {
 		return err
 	}
 
-	if c.exclude != nil && c.exclude.MatchString(u) {
+	if c.excludedPattern != nil && c.excludedPattern.MatchString(u) {
 		return nil
 	}