lbsadmin
/
Beego
mirror of https://github.com/astaxie/beego.git
1
0
Fork 0
Code Issues Releases Activity

refactor(FileSystem): using single-line if

This commit is contained in:
Viktor Vassilyev 2018-11-07 20:21:34 +06:00
parent 9ac4928113
commit f193e313a3
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs.go
View File

@ -41,8 +41,7 @@ func walk(fs http.FileSystem, path string, info os.FileInfo, walkFn filepath.Wal
dir, err := fs.Open(path)
defer dir.Close()
if err != nil {
err1 := walkFn(path, info, err)
if err1 != nil {
if err1 := walkFn(path, info, err); err1 != nil {
return err1
}
return err
@ -62,8 +61,7 @@ func walk(fs http.FileSystem, path string, info os.FileInfo, walkFn filepath.Wal
for _, fileInfo := range dirs {
filename := filepath.Join(path, fileInfo.Name())
err = walk(fs, filename, fileInfo, walkFn)
if err != nil {
if err = walk(fs, filename, fileInfo, walkFn); err != nil {
if !fileInfo.IsDir() || err != filepath.SkipDir {
return err
}