Simpler copy

diff --git a/src/node.go b/src/node.go
index c965796ead59c38de3c774ef6968d41fe66a3c12..4a28bca63f52edc1b8bcd427e598e6931655eed7 100644 (file)
--- a/src/node.go
+++ b/src/node.go
@@ -119,8 +119,7 @@ func NodeIdFromString(raw string) (*NodeId, error) {
        if len(decoded) != blake2b.Size256 {
                return nil, errors.New("Invalid node id size")
        }
-       buf := new([blake2b.Size256]byte)
-       copy(buf[:], decoded)
-       nodeId := NodeId(*buf)
-       return &nodeId, nil
+       nodeId := new(NodeId)
+       copy(nodeId[:], decoded)
+       return nodeId, nil
 }

diff --git a/src/tmp.go b/src/tmp.go
index 88a7ec3847801a9d9fdbddcdf7ae3d67bc2098f4..a1ef2e86f53f2981a8979920050950c35760946e 100644 (file)
--- a/src/tmp.go
+++ b/src/tmp.go
@@ -37,8 +37,7 @@ func TempFile(dir, prefix string) (*os.File, error) {
 
 func (ctx *Ctx) NewTmpFile() (*os.File, error) {
        jobsPath := filepath.Join(ctx.Spool, "tmp")
-       var err error
-       if err = os.MkdirAll(jobsPath, os.FileMode(0777)); err != nil {
+       if err := os.MkdirAll(jobsPath, os.FileMode(0777)); err != nil {
                return nil, err
        }
        fd, err := TempFile(jobsPath, "")