From 71720092db3f5253d434744ededa931810ee7096 Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Thu, 8 Sep 2016 10:48:40 -0400 Subject: [PATCH] *: fixup and go vet Signed-off-by: Vincent Batts --- base/base.go | 1 - cryptomap/crypto.go | 2 +- main.go | 2 +- walker/walker.go | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/base/base.go b/base/base.go index 3a39e64..0002bd7 100644 --- a/base/base.go +++ b/base/base.go @@ -145,6 +145,5 @@ func (b Base) LinkTo(dest, sum string) error { // HasBlob tests whether a blob with this sum exists func (b Base) HasBlob(sum string) bool { fi, err := b.Stat(sum) - log.Println("SUCH FARTS", fi) return fi != nil && err == nil } diff --git a/cryptomap/crypto.go b/cryptomap/crypto.go index b5bb665..21aa6d6 100644 --- a/cryptomap/crypto.go +++ b/cryptomap/crypto.go @@ -29,7 +29,7 @@ func DetermineHash(str string) (h crypto.Hash) { case "sha512": h = crypto.SHA512 default: - log.Println("WARNING: unknown cipher %q. using 'sha1'", str) + log.Printf("WARNING: unknown cipher %q. using 'sha1'", str) h = crypto.SHA1 } diff --git a/main.go b/main.go index 08fdb28..cbb2493 100644 --- a/main.go +++ b/main.go @@ -14,7 +14,7 @@ import ( ) var ( - flVarBase = flag.String("b", filepath.Join(os.Getenv("HOME"), "var"), "base directory where files are duplicated") + flVarBase = flag.String("b", filepath.Join(os.Getenv("HOME"), ".local/dedupe-linker/var"), "base directory where files are duplicated") flCipher = flag.String("c", "sha1", "block cipher to use (sha1, or sha256)") flWorkers = flag.Int("w", 2, "workers to do summing") flNoop = flag.Bool("noop", false, "don't do any moving or linking") diff --git a/walker/walker.go b/walker/walker.go index ef94516..bd34869 100644 --- a/walker/walker.go +++ b/walker/walker.go @@ -9,10 +9,10 @@ type Walker struct { } func (w Walker) Walk(path string, quit chan int) error { - + // XXX what is going on here? select { case <-quit: - return nil + close(quit) } return nil }