From ba5a59931e015fc9a27ab631950c32fa890eec9f Mon Sep 17 00:00:00 2001 From: Gibheer Date: Wed, 25 Mar 2015 20:43:18 +0100 Subject: reformat code with gofmt Yes, I know that this breaks the history search, but it had to be done sooner or later. I also adjusted my editor to follow the guidelines more closely. --- io.go | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) (limited to 'io.go') diff --git a/io.go b/io.go index 382044e..56cc689 100644 --- a/io.go +++ b/io.go @@ -3,39 +3,43 @@ package main // handle all io and de/encoding of data import ( - "encoding/pem" - "errors" - "io/ioutil" + "encoding/pem" + "errors" + "io/ioutil" ) var ( - ErrBlockNotFound = errors.New("block not found") + ErrBlockNotFound = errors.New("block not found") ) // load a pem section from a file func readSectionFromFile(path, btype string) ([]byte, error) { - raw, err := readFile(path) - if err != nil { return raw, err } + raw, err := readFile(path) + if err != nil { + return raw, err + } - return decodeSection(raw, btype) + return decodeSection(raw, btype) } // read a file completely and report possible errors func readFile(path string) ([]byte, error) { - raw, err := ioutil.ReadFile(path) - if err != nil { return EmptyByteArray, err } - return raw, nil + raw, err := ioutil.ReadFile(path) + if err != nil { + return EmptyByteArray, err + } + return raw, nil } // decode a pem encoded file and search for the specified section func decodeSection(data []byte, btype string) ([]byte, error) { - rest := data - for len(rest) > 0 { - var block *pem.Block - block, rest = pem.Decode(rest) - if block.Type == btype { - return block.Bytes, nil - } - } - return EmptyByteArray, ErrBlockNotFound + rest := data + for len(rest) > 0 { + var block *pem.Block + block, rest = pem.Decode(rest) + if block.Type == btype { + return block.Bytes, nil + } + } + return EmptyByteArray, ErrBlockNotFound } -- cgit v1.2.3-70-g09d2