From: Sergey Matveev <stargrave@stargrave.org>
Date: Sun, 4 Jun 2023 08:38:43 +0000 (+0300)
Subject: Use more efficient ReadDir instead of Readdir
X-Git-Tag: v8.9.0^2~19
X-Git-Url: http://www.git.cypherpunks.ru/?p=nncp.git;a=commitdiff_plain;h=6fca394308061e321accfcc6e26432c6a32177a4

Use more efficient ReadDir instead of Readdir
---

diff --git a/src/cmd/nncp-reass/main.go b/src/cmd/nncp-reass/main.go
index e92a2e5..fc71bd0 100644
--- a/src/cmd/nncp-reass/main.go
+++ b/src/cmd/nncp-reass/main.go
@@ -301,16 +301,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
diff --git a/src/cmd/nncp-xfer/main.go b/src/cmd/nncp-xfer/main.go
index 016c441..73a6fc2 100644
--- a/src/cmd/nncp-xfer/main.go
+++ b/src/cmd/nncp-xfer/main.go
@@ -106,7 +106,7 @@ func main() {
 	selfPath := filepath.Join(flag.Arg(0), ctx.SelfId.String())
 	isBad := false
 	var dir *os.File
-	var fis []os.FileInfo
+	var entries []os.DirEntry
 	var les nncp.LEs
 	var logMsg func(les nncp.LEs) string
 	if *txOnly {
@@ -141,7 +141,7 @@ func main() {
 		isBad = true
 		goto Tx
 	}
-	fis, err = dir.Readdir(0)
+	entries, err = dir.ReadDir(0)
 	dir.Close()
 	if err != nil {
 		ctx.LogE("xfer-self-read", les, err, func(les nncp.LEs) string {
@@ -150,12 +150,12 @@ func main() {
 		isBad = true
 		goto Tx
 	}
-	for _, fi := range fis {
-		if !fi.IsDir() {
+	for _, entry := range entries {
+		if !entry.IsDir() {
 			continue
 		}
-		nodeId, err := nncp.NodeIdFromString(fi.Name())
-		les := append(les, nncp.LE{K: "Node", V: fi.Name()})
+		nodeId, err := nncp.NodeIdFromString(entry.Name())
+		les := append(les, nncp.LE{K: "Node", V: entry.Name()})
 		logMsg := func(les nncp.LEs) string {
 			return "Packet transfer, received from " + ctx.NodeName(nodeId)
 		}
@@ -177,7 +177,7 @@ func main() {
 			})
 			continue
 		}
-		dir, err = os.Open(filepath.Join(selfPath, fi.Name()))
+		dir, err = os.Open(filepath.Join(selfPath, entry.Name()))
 		if err != nil {
 			ctx.LogE("xfer-rx-open", les, err, func(les nncp.LEs) string {
 				return logMsg(les) + ": opening"