[cfg] Make parseBaseConfig() independent of cmd/gost/main.go

Carlos Ibáñez · Carlos Ibáñez · commit 1bead18d5322 · 2021-12-01T17:34:47.000+01:00
diff --git a/cmd/gost/cfg.go b/cmd/gost/cfg.go
@@ -25,18 +25,18 @@ type baseConfig struct {
 	Debug  bool
 }
 
-func parseBaseConfig(s string) (*baseConfig, error) {
+func parseBaseConfig(s string, baseCfg *baseConfig) error {
 	file, err := os.Open(s)
 	if err != nil {
-		return nil, err
+		return err
 	}
 	defer file.Close()
 
 	if err := json.NewDecoder(file).Decode(baseCfg); err != nil {
-		return nil, err
+		return err
 	}
 
-	return baseCfg, nil
+	return nil
 }
 
 var (

Original file line number	Diff line number	Diff line change
`@@ -25,18 +25,18 @@ type baseConfig struct {`
`25`	`25`	`Debug bool`
`26`	`26`	`}`
`27`	`27`
`28`		`-func parseBaseConfig(s string) (*baseConfig, error) {`
	`28`	`+func parseBaseConfig(s string, baseCfg *baseConfig) error {`
`29`	`29`	`file, err := os.Open(s)`
`30`	`30`	`if err != nil {`
`31`		`- return nil, err`
	`31`	`+ return err`
`32`	`32`	`}`
`33`	`33`	`defer file.Close()`
`34`	`34`
`35`	`35`	`if err := json.NewDecoder(file).Decode(baseCfg); err != nil {`
`36`		`- return nil, err`
	`36`	`+ return err`
`37`	`37`	`}`
`38`	`38`
`39`		`- return baseCfg, nil`
	`39`	`+ return nil`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`var (`