fix: Use common pointer for common flags for dhcpdctl

pojntfx · pojntfx · commit 0eaa710e7a8f · 2020-01-27T17:03:06.000+01:00
diff --git a/cmd/dhcpdctl/cmd/apply.go b/cmd/dhcpdctl/cmd/apply.go
@@ -63,10 +63,8 @@ var applyCmd = &cobra.Command{
 
 func init() {
 	var (
-		serverHostPortFlag string
-		configFileFlag     string
-		deviceFlag         string
-		subnetsFlag        string
+		deviceFlag  string
+		subnetsFlag string
 	)
 
 	applyCmd.PersistentFlags().StringVarP(&serverHostPortFlag, serverHostPortKey, "s", constants.DHCPDDHostPortDefault, constants.HostPortDocs)
diff --git a/cmd/dhcpdctl/cmd/constants.go b/cmd/dhcpdctl/cmd/constants.go
@@ -8,3 +8,8 @@ const (
 	deviceKey         = keyPrefix + "device"
 	subnetsKey        = keyPrefix + "subnets"
 )
+
+var (
+	serverHostPortFlag string
+	configFileFlag     string
+)
diff --git a/cmd/dhcpdctl/cmd/delete.go b/cmd/dhcpdctl/cmd/delete.go
@@ -60,10 +60,6 @@ var deleteCmd = &cobra.Command{
 }
 
 func init() {
-	var (
-		serverHostPortFlag string
-	)
-
 	deleteCmd.PersistentFlags().StringVarP(&serverHostPortFlag, serverHostPortKey, "s", constants.DHCPDDHostPortDefault, constants.HostPortDocs)
 
 	if err := viper.BindPFlags(deleteCmd.PersistentFlags()); err != nil {
diff --git a/cmd/dhcpdctl/cmd/get.go b/cmd/dhcpdctl/cmd/get.go
@@ -71,10 +71,6 @@ var getCmd = &cobra.Command{
 }
 
 func init() {
-	var (
-		serverHostPortFlag string
-	)
-
 	getCmd.PersistentFlags().StringVarP(&serverHostPortFlag, serverHostPortKey, "s", constants.DHCPDDHostPortDefault, constants.HostPortDocs)
 
 	if err := viper.BindPFlags(getCmd.PersistentFlags()); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -8,3 +8,8 @@ const (`
`8`	`8`	`deviceKey = keyPrefix + "device"`
`9`	`9`	`subnetsKey = keyPrefix + "subnets"`
`10`	`10`	`)`
	`11`	`+`
	`12`	`+var (`
	`13`	`+ serverHostPortFlag string`
	`14`	`+ configFileFlag string`
	`15`	`+)`
Original file line number	Diff line number	Diff line change
`@@ -60,10 +60,6 @@ var deleteCmd = &cobra.Command{`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`func init() {`
`63`		`- var (`
`64`		`- serverHostPortFlag string`
`65`		`- )`
`66`		`-`
`67`	`63`	`deleteCmd.PersistentFlags().StringVarP(&serverHostPortFlag, serverHostPortKey, "s", constants.DHCPDDHostPortDefault, constants.HostPortDocs)`
`68`	`64`
`69`	`65`	`if err := viper.BindPFlags(deleteCmd.PersistentFlags()); err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -71,10 +71,6 @@ var getCmd = &cobra.Command{`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`func init() {`
`74`		`- var (`
`75`		`- serverHostPortFlag string`
`76`		`- )`
`77`		`-`
`78`	`74`	`getCmd.PersistentFlags().StringVarP(&serverHostPortFlag, serverHostPortKey, "s", constants.DHCPDDHostPortDefault, constants.HostPortDocs)`
`79`	`75`
`80`	`76`	`if err := viper.BindPFlags(getCmd.PersistentFlags()); err != nil {`