q3k
/
docker-cli-openbsd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor all pre-compiled regexp to package level vars 

Addresses #8057

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
master
Phil Estes 2014-09-15 23:30:10 -04:00 committed by Vincent Demeester
parent cc0954586a
commit 8b27eee0f0
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
opts/opts.go
View File

@ -14,6 +14,11 @@ import (
"github.com/docker/docker/pkg/parsers" "github.com/docker/docker/pkg/parsers"
) )
var (
alphaRegexp = regexp.MustCompile(`[a-zA-Z]`)
domainRegexp = regexp.MustCompile(`^(:?(:?[a-zA-Z0-9]|(:?[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9]))(:?\.(:?[a-zA-Z0-9]|(:?[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])))*)\.?\s*$`)
)
func ListVar(values *[]string, names []string, usage string) { func ListVar(values *[]string, names []string, usage string) {
flag.Var(newListOptsRef(values, nil), names, usage) flag.Var(newListOptsRef(values, nil), names, usage)
} }
@ -184,12 +189,10 @@ func ValidateDnsSearch(val string) (string, error) {
} }
func validateDomain(val string) (string, error) { func validateDomain(val string) (string, error) {
alpha := regexp.MustCompile(`[a-zA-Z]`) if alphaRegexp.FindString(val) == "" {
if alpha.FindString(val) == "" {
return "", fmt.Errorf("%s is not a valid domain", val) return "", fmt.Errorf("%s is not a valid domain", val)
} }
re := regexp.MustCompile(`^(:?(:?[a-zA-Z0-9]|(:?[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9]))(:?\.(:?[a-zA-Z0-9]|(:?[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])))*)\.?\s*$`) ns := domainRegexp.FindSubmatch([]byte(val))
ns := re.FindSubmatch([]byte(val))
if len(ns) > 0 { if len(ns) > 0 {
return string(ns[1]), nil return string(ns[1]), nil
} }