X-Git-Url: http://www.git.cypherpunks.ru/?p=nncp.git;a=blobdiff_plain;f=src%2Fcmd%2Fnncp-reass%2Fmain.go;fp=src%2Fcmd%2Fnncp-reass%2Fmain.go;h=7a23ac74f4fc826539f23a721e7281295d18c15f;hp=e92a2e59307f1d5f2c5580d5d8992053106cb0a6;hb=a13dfe188901835b627b02e1fc25638f5c9f68d5;hpb=9edd0bca196b4a7722ee64c27a8a2864f0677ad8

diff --git a/src/cmd/nncp-reass/main.go b/src/cmd/nncp-reass/main.go
index e92a2e5..7a23ac7 100644
--- a/src/cmd/nncp-reass/main.go
+++ b/src/cmd/nncp-reass/main.go
@@ -40,7 +40,6 @@ import (
 )
 
 func usage() {
-	fmt.Fprint(os.Stderr, nncp.UsageHeader())
 	fmt.Fprint(os.Stderr, "nncp-reass -- reassemble chunked files\n\n")
 	fmt.Fprintf(os.Stderr, "Usage: %s [options] [FILE.nncp.meta]\nOptions:\n", os.Args[0])
 	flag.PrintDefaults()
@@ -301,16 +300,16 @@ func findMetas(ctx *nncp.Ctx, dirPath string) []string {
 		return nil
 	}
 	defer dir.Close()
-	fis, err := dir.Readdir(0)
+	entries, err := dir.ReadDir(0)
 	dir.Close()
 	if err != nil {
 		ctx.LogE("reass", nncp.LEs{{K: "Path", V: dirPath}}, err, logMsg)
 		return nil
 	}
 	metaPaths := make([]string, 0)
-	for _, fi := range fis {
-		if strings.HasSuffix(fi.Name(), nncp.ChunkedSuffixMeta) {
-			metaPaths = append(metaPaths, filepath.Join(dirPath, fi.Name()))
+	for _, entry := range entries {
+		if strings.HasSuffix(entry.Name(), nncp.ChunkedSuffixMeta) {
+			metaPaths = append(metaPaths, filepath.Join(dirPath, entry.Name()))
 		}
 	}
 	return metaPaths