fix: Use common pointer for common flags for dhclientctl

pojntfx · pojntfx · commit d125b96be99b · 2020-01-27T17:04:30.000+01:00
diff --git a/cmd/dhclientctl/cmd/apply.go b/cmd/dhclientctl/cmd/apply.go
@@ -51,9 +51,7 @@ var applyCmd = &cobra.Command{
 
 func init() {
 	var (
-		serverHostPortFlag string
-		configFileFlag     string
-		deviceFlag         string
+		deviceFlag string
 	)
 
 	applyCmd.PersistentFlags().StringVarP(&serverHostPortFlag, serverHostPortKey, "s", constants.DHClientDHostPortDefault, constants.HostPortDocs)
diff --git a/cmd/dhclientctl/cmd/constants.go b/cmd/dhclientctl/cmd/constants.go
@@ -7,3 +7,8 @@ const (
 	configFileKey     = keyPrefix + "configFile"
 	deviceKey         = keyPrefix + "device"
 )
+
+var (
+	serverHostPortFlag string
+	configFileFlag     string
+)
diff --git a/cmd/dhclientctl/cmd/delete.go b/cmd/dhclientctl/cmd/delete.go
@@ -60,10 +60,6 @@ var deleteCmd = &cobra.Command{
 }
 
 func init() {
-	var (
-		serverHostPortFlag string
-	)
-
 	deleteCmd.PersistentFlags().StringVarP(&serverHostPortFlag, serverHostPortKey, "s", constants.DHClientDHostPortDefault, constants.HostPortDocs)
 
 	if err := viper.BindPFlags(deleteCmd.PersistentFlags()); err != nil {
diff --git a/cmd/dhclientctl/cmd/get.go b/cmd/dhclientctl/cmd/get.go
@@ -71,10 +71,6 @@ var getCmd = &cobra.Command{
 }
 
 func init() {
-	var (
-		serverHostPortFlag string
-	)
-
 	getCmd.PersistentFlags().StringVarP(&serverHostPortFlag, serverHostPortKey, "s", constants.DHClientDHostPortDefault, constants.HostPortDocs)
 
 	if err := viper.BindPFlags(getCmd.PersistentFlags()); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -51,9 +51,7 @@ var applyCmd = &cobra.Command{`
`51`	`51`
`52`	`52`	`func init() {`
`53`	`53`	`var (`
`54`		`- serverHostPortFlag string`
`55`		`- configFileFlag string`
`56`		`- deviceFlag string`
	`54`	`+ deviceFlag string`
`57`	`55`	`)`
`58`	`56`
`59`	`57`	`applyCmd.PersistentFlags().StringVarP(&serverHostPortFlag, serverHostPortKey, "s", constants.DHClientDHostPortDefault, constants.HostPortDocs)`
Original file line number	Diff line number	Diff line change
`@@ -7,3 +7,8 @@ const (`
`7`	`7`	`configFileKey = keyPrefix + "configFile"`
`8`	`8`	`deviceKey = keyPrefix + "device"`
`9`	`9`	`)`
	`10`	`+`
	`11`	`+var (`
	`12`	`+ serverHostPortFlag string`
	`13`	`+ configFileFlag string`
	`14`	`+)`
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.DHClientDHostPortDefault, 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.DHClientDHostPortDefault, constants.HostPortDocs)`
`79`	`75`
`80`	`76`	`if err := viper.BindPFlags(getCmd.PersistentFlags()); err != nil {`