From 398b795c87387d25c889a3bf700b387cd120520e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Sat, 21 Mar 2015 21:48:36 +0100 Subject: Simplify some err and return logic --- transports/obfs4/statefile.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'transports/obfs4/statefile.go') diff --git a/transports/obfs4/statefile.go b/transports/obfs4/statefile.go index 0838180..6c34f35 100644 --- a/transports/obfs4/statefile.go +++ b/transports/obfs4/statefile.go @@ -183,7 +183,7 @@ func jsonServerStateFromFile(stateDir string, js *jsonServerState) error { return err } - if err = json.Unmarshal(f, js); err != nil { + if err := json.Unmarshal(f, js); err != nil { return fmt.Errorf("failed to load statefile '%s': %s", fPath, err) } @@ -227,7 +227,7 @@ func newJSONServerState(stateDir string, js *jsonServerState) (err error) { return nil } -func newBridgeFile(stateDir string, st *obfs4ServerState) (err error) { +func newBridgeFile(stateDir string, st *obfs4ServerState) error { const prefix = "# obfs4 torrc client bridge line\n" + "#\n" + "# This file is an automatically generated bridge line based on\n" + @@ -244,7 +244,7 @@ func newBridgeFile(stateDir string, st *obfs4ServerState) (err error) { st.clientString()) tmp := []byte(prefix + bridgeLine) - if err = ioutil.WriteFile(path.Join(stateDir, bridgeFile), tmp, 0600); err != nil { + if err := ioutil.WriteFile(path.Join(stateDir, bridgeFile), tmp, 0600); err != nil { return err } -- cgit v1.2.3