From: Sergey Matveev <stargrave@stargrave.org>
Date: Thu, 1 Jul 2021 07:52:57 +0000 (+0300)
Subject: Simpler copy
X-Git-Tag: v7.1.0^2~13
X-Git-Url: http://www.git.cypherpunks.ru/?p=nncp.git;a=commitdiff_plain;h=38c1f9a8c6b8d41ea2d4c86d6f18adea407fdc35

Simpler copy
---

diff --git a/src/node.go b/src/node.go
index c965796..4a28bca 100644
--- 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 88a7ec3..a1ef2e8 100644
--- 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, "")