mirror
/
restic
mirror of https://github.com/restic/restic.git
1
0
Fork 0
Code Issues Releases Wiki Activity

golint

This commit is contained in:
Florian Weingarten 2015-04-28 02:11:01 -04:00
parent edfd86624c
commit 8ba47df8d1
4 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
map.go
View File

@ -188,16 +188,16 @@ func (bl *Map) Len() int {
} }
// Prune deletes all IDs from the map except the ones listed in ids. // Prune deletes all IDs from the map except the ones listed in ids.
func (m *Map) Prune(ids *backend.IDSet) { func (bl *Map) Prune(ids *backend.IDSet) {
m.m.Lock() bl.m.Lock()
defer m.m.Unlock() defer bl.m.Unlock()
pos := 0 pos := 0
for pos < len(m.list) { for pos < len(bl.list) {
blob := m.list[pos] blob := bl.list[pos]
if ids.Find(blob.ID) != nil { if ids.Find(blob.ID) != nil {
// remove element // remove element
m.list = append(m.list[:pos], m.list[pos+1:]...) bl.list = append(bl.list[:pos], bl.list[pos+1:]...)
continue continue
} }
@ -206,14 +206,14 @@ func (m *Map) Prune(ids *backend.IDSet) {
} }
// DeleteID removes the plaintext ID id from the map. // DeleteID removes the plaintext ID id from the map.
func (m *Map) DeleteID(id backend.ID) { func (bl *Map) DeleteID(id backend.ID) {
m.m.Lock() bl.m.Lock()
defer m.m.Unlock() 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 { if err != nil {
return return
} }
m.list = append(m.list[:pos], m.list[pos+1:]...) bl.list = append(bl.list[:pos], bl.list[pos+1:]...)
} }

12
node.go
View File

@ -41,17 +41,17 @@ type Node struct {
blobs server.Blobs blobs server.Blobs
} }
func (n Node) String() string { func (node Node) String() string {
switch n.Type { switch node.Type {
case "file": case "file":
return fmt.Sprintf("%s %5d %5d %6d %s %s", 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": case "dir":
return fmt.Sprintf("%s %5d %5d %6d %s %s", 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 { func (node Node) Tree() *Tree {
@ -258,7 +258,7 @@ func (node Node) MarshalJSON() ([]byte, error) {
func (node *Node) UnmarshalJSON(data []byte) error { func (node *Node) UnmarshalJSON(data []byte) error {
type nodeJSON Node type nodeJSON Node
var nj *nodeJSON = (*nodeJSON)(node) nj := (*nodeJSON)(node)
err := json.Unmarshal(data, nj) err := json.Unmarshal(data, nj)
if err != nil { if err != nil {

4
pools.go
View File

@ -27,7 +27,7 @@ func (s *poolStats) Get(k string) {
s.m.Lock() s.m.Lock()
defer s.m.Unlock() defer s.m.Unlock()
s.get += 1 s.get++
cur := s.get - s.put cur := s.get - s.put
if cur > s.max { if cur > s.max {
s.max = cur s.max = cur
@ -53,7 +53,7 @@ func (s *poolStats) Put(k string) {
s.m.Lock() s.m.Lock()
defer s.m.Unlock() defer s.m.Unlock()
s.put += 1 s.put++
if k != "" { if k != "" {
s.mput[k]++ s.mput[k]++

3
restorer.go
View File

@ -1,7 +1,6 @@
package restic package restic
import ( import (
"errors"
"fmt" "fmt"
"os" "os"
"path/filepath" "path/filepath"
@ -75,7 +74,7 @@ func (res *Restorer) to(dst string, dir string, treeBlob server.Blob) error {
if node.Type == "dir" { if node.Type == "dir" {
if node.Subtree == nil { 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) subp := filepath.Join(dir, node.Name)