Merge pull request #14992 from runcom/remove-unused-funcs

Remove unused functions

opts/opts.go

@@ -8,9 +8,7 @@ import (
 	"regexp"
 	"strings"
 
-	flag "github.com/docker/docker/pkg/mflag"
 	"github.com/docker/docker/pkg/parsers"
-	"github.com/docker/docker/pkg/ulimit"
 	"github.com/docker/docker/volume"
 )
 
@@ -29,60 +27,6 @@ var (
 	DefaultUnixSocket = "/var/run/docker.sock"
 )
 
-// ListVar Defines a flag with the specified names and usage, and put the value
-// list into ListOpts that will hold the values.
-func ListVar(values *[]string, names []string, usage string) {
-	flag.Var(NewListOptsRef(values, nil), names, usage)
-}
-
-// MapVar Defines a flag with the specified names and usage, and put the value
-// map into MapOpt that will hold the values (key,value).
-func MapVar(values map[string]string, names []string, usage string) {
-	flag.Var(NewMapOpts(values, nil), names, usage)
-}
-
-// LogOptsVar Defines a flag with the specified names and usage for --log-opts,
-// and put the value map into MapOpt that will hold the values (key,value).
-func LogOptsVar(values map[string]string, names []string, usage string) {
-	flag.Var(NewMapOpts(values, nil), names, usage)
-}
-
-// HostListVar Defines a flag with the specified names and usage and put the
-// value into a ListOpts that will hold the values, validating the Host format.
-func HostListVar(values *[]string, names []string, usage string) {
-	flag.Var(NewListOptsRef(values, ValidateHost), names, usage)
-}
-
-// IPListVar Defines a flag with the specified names and usage and put the
-// value into a ListOpts that will hold the values, validating the IP format.
-func IPListVar(values *[]string, names []string, usage string) {
-	flag.Var(NewListOptsRef(values, ValidateIPAddress), names, usage)
-}
-
-// DNSSearchListVar Defines a flag with the specified names and usage and put the
-// value into a ListOpts that will hold the values, validating the DNS search format.
-func DNSSearchListVar(values *[]string, names []string, usage string) {
-	flag.Var(NewListOptsRef(values, ValidateDNSSearch), names, usage)
-}
-
-// IPVar Defines a flag with the specified names and usage for IP and will use
-// the specified defaultValue if the specified value is not valid.
-func IPVar(value *net.IP, names []string, defaultValue, usage string) {
-	flag.Var(NewIpOpt(value, defaultValue), names, usage)
-}
-
-// LabelListVar Defines a flag with the specified names and usage and put the
-// value into a ListOpts that will hold the values, validating the label format.
-func LabelListVar(values *[]string, names []string, usage string) {
-	flag.Var(NewListOptsRef(values, ValidateLabel), names, usage)
-}
-
-// UlimitMapVar Defines a flag with the specified names and usage for --ulimit,
-// and put the value map into a UlimitOpt that will hold the values.
-func UlimitMapVar(values *map[string]*ulimit.Ulimit, names []string, usage string) {
-	flag.Var(NewUlimitOpt(values), names, usage)
-}
-
 // ListOpts type that hold a list of values and a validation function.
 type ListOpts struct {
 	values    *[]string