From 9911d46996807f411e7473f63b3bc256f22c2aef Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 21 Jul 2015 21:34:59 +0200 Subject: [PATCH] fuse: rename child/children -> node/items --- cmd/restic/fuse/dir.go | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/cmd/restic/fuse/dir.go b/cmd/restic/fuse/dir.go index ef7013977..ff4fa2e95 100644 --- a/cmd/restic/fuse/dir.go +++ b/cmd/restic/fuse/dir.go @@ -16,9 +16,9 @@ var _ = fs.HandleReadDirAller(&dir{}) var _ = fs.NodeStringLookuper(&dir{}) type dir struct { - repo *repository.Repository - children map[string]*restic.Node - inode uint64 + repo *repository.Repository + items map[string]*restic.Node + inode uint64 } func newDir(repo *repository.Repository, node *restic.Node) (*dir, error) { @@ -26,15 +26,15 @@ func newDir(repo *repository.Repository, node *restic.Node) (*dir, error) { if err != nil { return nil, err } - children := make(map[string]*restic.Node) - for _, child := range tree.Nodes { - children[child.Name] = child + items := make(map[string]*restic.Node) + for _, node := range tree.Nodes { + items[node.Name] = node } return &dir{ - repo: repo, - children: children, - inode: node.Inode, + repo: repo, + items: items, + inode: node.Inode, }, nil } @@ -43,15 +43,15 @@ func newDirFromSnapshot(repo *repository.Repository, snapshot SnapshotWithId) (* if err != nil { return nil, err } - children := make(map[string]*restic.Node) + items := make(map[string]*restic.Node) for _, node := range tree.Nodes { - children[node.Name] = node + items[node.Name] = node } return &dir{ - repo: repo, - children: children, - inode: inodeFromBackendId(snapshot.ID), + repo: repo, + items: items, + inode: inodeFromBackendId(snapshot.ID), }, nil } @@ -62,9 +62,9 @@ func (d *dir) Attr(ctx context.Context, a *fuse.Attr) error { } func (d *dir) ReadDirAll(ctx context.Context) ([]fuse.Dirent, error) { - ret := make([]fuse.Dirent, 0, len(d.children)) + ret := make([]fuse.Dirent, 0, len(d.items)) - for _, node := range d.children { + for _, node := range d.items { var typ fuse.DirentType switch node.Type { case "dir": @@ -86,17 +86,17 @@ func (d *dir) ReadDirAll(ctx context.Context) ([]fuse.Dirent, error) { } func (d *dir) Lookup(ctx context.Context, name string) (fs.Node, error) { - child, ok := d.children[name] + node, ok := d.items[name] if !ok { return nil, fuse.ENOENT } - switch child.Type { + switch node.Type { case "dir": - return newDir(d.repo, child) + return newDir(d.repo, node) case "file": - return newFile(d.repo, child) + return newFile(d.repo, node) case "symlink": - return newLink(d.repo, child) + return newLink(d.repo, node) default: return nil, fuse.ENOENT }