From 5026acc6dfeca1db200e164c4fd79d70065e6111 Mon Sep 17 00:00:00 2001
From: Yota Toyama <raviqqe@gmail.com>
Date: Wed, 1 Aug 2018 16:11:33 -0700
Subject: [PATCH] Rename some variables

---
 arguments.go    | 22 ++++++++++++----------
 file_checker.go |  4 ++--
 main.go         |  6 +++++-
 url_checker.go  | 14 +++++++-------
 4 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/arguments.go b/arguments.go
index 735278f..69a771f 100644
--- a/arguments.go
+++ b/arguments.go
@@ -25,13 +25,13 @@ Options:
 	-v, --verbose  Be verbose.`
 
 type arguments struct {
-	filenames    []string
-	documentRoot string
-	concurrency  int
-	timeout      time.Duration
-	recursive    bool
-	exclude      *regexp.Regexp
-	verbose      bool
+	filenames       []string
+	documentRoot    string
+	concurrency     int
+	timeout         time.Duration
+	recursive       bool
+	excludedPattern *regexp.Regexp
+	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
 }
diff --git a/file_checker.go b/file_checker.go
index 7c456be..1b473ca 100644
--- a/file_checker.go
+++ b/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 {
-	return fileChecker{newURLChecker(timeout, d, x, s), s}
+func newFileChecker(timeout time.Duration, d string, r *regexp.Regexp, s semaphore) fileChecker {
+	return fileChecker{newURLChecker(timeout, d, r, s), s}
 }
 
 func (c fileChecker) Check(f string) ([]urlResult, error) {
diff --git a/main.go b/main.go
index a2f8d4b..6687ff2 100644
--- a/main.go
+++ b/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)
 
diff --git a/url_checker.go b/url_checker.go
index 5e4713a..3d5527d 100644
--- a/url_checker.go
+++ b/url_checker.go
@@ -13,14 +13,14 @@ import (
 )
 
 type urlChecker struct {
-	timeout      time.Duration
-	documentRoot string
-	exclude      *regexp.Regexp
-	semaphore    semaphore
+	timeout         time.Duration
+	documentRoot    string
+	excludedPattern *regexp.Regexp
+	semaphore       semaphore
 }
 
-func newURLChecker(t time.Duration, d string, x *regexp.Regexp, s semaphore) urlChecker {
-	return urlChecker{t, d, x, s}
+func newURLChecker(t time.Duration, d string, r *regexp.Regexp, s semaphore) urlChecker {
+	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
 	}