From 0e24590e1dd91fe008c0ae0a43ac3172737525e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Mon, 24 May 2021 00:11:58 +0300 Subject: [PATCH] doc + bugfix --- internal/cmdrootfs/cmdrootfs.go | 2 +- main.go | 1 - rootfs/tree.go | 8 ++++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/internal/cmdrootfs/cmdrootfs.go b/internal/cmdrootfs/cmdrootfs.go index 2492e1a..ed72215 100644 --- a/internal/cmdrootfs/cmdrootfs.go +++ b/internal/cmdrootfs/cmdrootfs.go @@ -61,7 +61,7 @@ func (c *Command) Execute(args []string) (err error) { return fmt.Errorf("create: %w", err) } defer func() { - err1 = outf.Close() + err1 := outf.Close() if err == nil { err = err1 } diff --git a/main.go b/main.go index 64a91a1..8b6c162 100644 --- a/main.go +++ b/main.go @@ -4,7 +4,6 @@ import ( "os" goflags "github.com/jessevdk/go-flags" - "github.com/motiejus/code/undocker/internal/cmdlxcconfig" "github.com/motiejus/code/undocker/internal/cmdrootfs" ) diff --git a/rootfs/tree.go b/rootfs/tree.go index 50079c9..de9ac6f 100644 --- a/rootfs/tree.go +++ b/rootfs/tree.go @@ -31,10 +31,10 @@ func (t *tree) Add(path string) { // HasPrefix returns if tree contains a prefix matching a given sequence. // Search algorithm is naive: it does linear search when going through the -// nodes instead of binary-search. Since we expect number of children to be -// really small (usually 1 or 2), it does not really matter. If you find a -// real-world container with 30+ whiteout paths on a single path, please ping -// the author/maintainer of this code. +// nodes, whereas binary search would work here too. Since we expect number of +// children to be really small (usually 1 or 2), it does not really matter. If +// you find a real-world container with 30+ whiteout paths on a single path, it +// may make sense to replace the algorithm. func (t *tree) HasPrefix(path string) bool { return t.hasprefix(strings.Split(filepath.Clean(path), "/")) }