From 8ba47df8d199df97265cd1d1c44db7de700cffb4 Mon Sep 17 00:00:00 2001
From: Florian Weingarten <flo@hackvalue.de>
Date: Tue, 28 Apr 2015 02:11:01 -0400
Subject: [PATCH] golint
---
map.go | 22 +++++++++++-----------
node.go | 12 ++++++------
pools.go | 4 ++--
restorer.go | 3 +--
4 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/map.go b/map.go
index b2c708ef5..eec11d567 100644
--- a/map.go
+++ b/map.go
@@ -188,16 +188,16 @@ func (bl *Map) Len() int {
}
// Prune deletes all IDs from the map except the ones listed in ids.
-func (m *Map) Prune(ids *backend.IDSet) {
- m.m.Lock()
- defer m.m.Unlock()
+func (bl *Map) Prune(ids *backend.IDSet) {
+ bl.m.Lock()
+ defer bl.m.Unlock()
pos := 0
- for pos < len(m.list) {
- blob := m.list[pos]
+ for pos < len(bl.list) {
+ blob := bl.list[pos]
if ids.Find(blob.ID) != nil {
// remove element
- m.list = append(m.list[:pos], m.list[pos+1:]...)
+ bl.list = append(bl.list[:pos], bl.list[pos+1:]...)
continue
}
@@ -206,14 +206,14 @@ func (m *Map) Prune(ids *backend.IDSet) {
}
// DeleteID removes the plaintext ID id from the map.
-func (m *Map) DeleteID(id backend.ID) {
- m.m.Lock()
- defer m.m.Unlock()
+func (bl *Map) DeleteID(id backend.ID) {
+ bl.m.Lock()
+ defer bl.m.Unlock()
- pos, _, err := m.find(server.Blob{ID: id}, false)
+ pos, _, err := bl.find(server.Blob{ID: id}, false)
if err != nil {
return
}
- m.list = append(m.list[:pos], m.list[pos+1:]...)
+ bl.list = append(bl.list[:pos], bl.list[pos+1:]...)
}
diff --git a/node.go b/node.go
index 80bf8ffb3..d6252f572 100644
--- a/node.go
+++ b/node.go
@@ -41,17 +41,17 @@ type Node struct {
blobs server.Blobs
}
-func (n Node) String() string {
- switch n.Type {
+func (node Node) String() string {
+ switch node.Type {
case "file":
return fmt.Sprintf("%s %5d %5d %6d %s %s",
- n.Mode, n.UID, n.GID, n.Size, n.ModTime, n.Name)
+ node.Mode, node.UID, node.GID, node.Size, node.ModTime, node.Name)
case "dir":
return fmt.Sprintf("%s %5d %5d %6d %s %s",
- n.Mode|os.ModeDir, n.UID, n.GID, n.Size, n.ModTime, n.Name)
+ node.Mode|os.ModeDir, node.UID, node.GID, node.Size, node.ModTime, node.Name)
}
- return fmt.Sprintf("<Node(%s) %s>", n.Type, n.Name)
+ return fmt.Sprintf("<Node(%s) %s>", node.Type, node.Name)
}
func (node Node) Tree() *Tree {
@@ -258,7 +258,7 @@ func (node Node) MarshalJSON() ([]byte, error) {
func (node *Node) UnmarshalJSON(data []byte) error {
type nodeJSON Node
- var nj *nodeJSON = (*nodeJSON)(node)
+ nj := (*nodeJSON)(node)
err := json.Unmarshal(data, nj)
if err != nil {
diff --git a/pools.go b/pools.go
index 10dadfef6..81f243a77 100644
--- a/pools.go
+++ b/pools.go
@@ -27,7 +27,7 @@ func (s *poolStats) Get(k string) {
s.m.Lock()
defer s.m.Unlock()
- s.get += 1
+ s.get++
cur := s.get - s.put
if cur > s.max {
s.max = cur
@@ -53,7 +53,7 @@ func (s *poolStats) Put(k string) {
s.m.Lock()
defer s.m.Unlock()
- s.put += 1
+ s.put++
if k != "" {
s.mput[k]++
diff --git a/restorer.go b/restorer.go
index ef362a159..39ac01379 100644
--- a/restorer.go
+++ b/restorer.go
@@ -1,7 +1,6 @@
package restic
import (
- "errors"
"fmt"
"os"
"path/filepath"
@@ -75,7 +74,7 @@ func (res *Restorer) to(dst string, dir string, treeBlob server.Blob) error {
if node.Type == "dir" {
if node.Subtree == nil {
- return errors.New(fmt.Sprintf("Dir without subtree in tree %s", treeBlob))
+ return fmt.Errorf("Dir without subtree in tree %s", treeBlob)
}
subp := filepath.Join(dir, node.Name)