From ff54a2dc92c3950e02630ac59d95313f778cdce0 Mon Sep 17 00:00:00 2001 From: janson Date: Tue, 30 Aug 2016 14:44:55 +0800 Subject: [PATCH] better for parseJsonConfig --- client/config.go | 8 ++++---- server/config.go | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/client/config.go b/client/config.go index c7ed1ff..855d829 100644 --- a/client/config.go +++ b/client/config.go @@ -29,16 +29,16 @@ type Config struct { KeepAlive int `json:"keepalive"` } -func parseJsonConfig(config *Config, path string) (err error) { +func parseJsonConfig(config *Config, path string) error { file, err := os.Open(path) // For read access. if err != nil { - return + return err } defer file.Close() if err = json.NewDecoder(file).Decode(config); err != nil { - return + return err } - return + return err } diff --git a/server/config.go b/server/config.go index cf45f9a..bf2c7d1 100644 --- a/server/config.go +++ b/server/config.go @@ -27,16 +27,16 @@ type Config struct { KeepAlive int `json:"keepalive"` } -func parseJsonConfig(config *Config, path string) (err error) { +func parseJsonConfig(config *Config, path string) error { file, err := os.Open(path) // For read access. if err != nil { - return + return err } defer file.Close() if err = json.NewDecoder(file).Decode(config); err != nil { - return + return err } - return + return err }