aboutsummaryrefslogtreecommitdiff
path: root/src/embed
diff options
context:
space:
mode:
author徐志伟 <juwan.xu@qq.com>2021-04-06 04:56:32 +0000
committerTobias Klauser <tobias.klauser@gmail.com>2021-04-07 09:59:58 +0000
commitd6aa162f30d63f21f5f4db75e302dbb90595bbe2 (patch)
tree73345ca16f5824dd57b1b0aa54e4fc7f6b3ba38d /src/embed
parent5d5f779db40528faa82e16c361691864dc80975b (diff)
downloadgo-d6aa162f30d63f21f5f4db75e302dbb90595bbe2.tar.gz
go-d6aa162f30d63f21f5f4db75e302dbb90595bbe2.zip
embed, testing/fstest: small optimization for ReadDir
Change-Id: If8dc6d917b55119b5662ce5b0b87328d220d684d GitHub-Last-Rev: cc9a1d5a7e2599ee7f98c61d35b2450b9b6a92c3 GitHub-Pull-Request: golang/go#45388 Reviewed-on: https://go-review.googlesource.com/c/go/+/307250 Run-TryBot: Ian Lance Taylor <iant@golang.org> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Ian Lance Taylor <iant@golang.org> Trust: Tobias Klauser <tobias.klauser@gmail.com>
Diffstat (limited to 'src/embed')
-rw-r--r--src/embed/embed.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/embed/embed.go b/src/embed/embed.go
index 7f2719d2a7..851cc216fc 100644
--- a/src/embed/embed.go
+++ b/src/embed/embed.go
@@ -386,15 +386,15 @@ func (d *openDir) Read([]byte) (int, error) {
func (d *openDir) ReadDir(count int) ([]fs.DirEntry, error) {
n := len(d.files) - d.offset
- if count > 0 && n > count {
- n = count
- }
if n == 0 {
if count <= 0 {
return nil, nil
}
return nil, io.EOF
}
+ if count > 0 && n > count {
+ n = count
+ }
list := make([]fs.DirEntry, n)
for i := range list {
list[i] = &d.files[d.offset+i]