mirror of
https://github.com/OpenDiablo2/OpenDiablo2
synced 2024-11-17 18:06:03 -05:00
Fix golang-ci gocritic error
It should fix this error: `nilValReturn: returned expr is always nil; replace err with nil`
This commit is contained in:
parent
ecab467a0f
commit
4558da0136
@ -4,6 +4,7 @@ import (
|
||||
"bufio"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io/fs"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"path/filepath"
|
||||
@ -181,24 +182,26 @@ func (mpq *MPQ) Size() uint32 {
|
||||
func openIgnoreCase(mpqPath string) (*os.File, error) {
|
||||
// First see if file exists with specified case
|
||||
mpqFile, err := os.Open(mpqPath) //nolint:gosec // Will fix later
|
||||
if err == nil {
|
||||
return mpqFile, err
|
||||
}
|
||||
|
||||
mpqName := filepath.Base(mpqPath)
|
||||
mpqDir := filepath.Dir(mpqPath)
|
||||
|
||||
files, err := ioutil.ReadDir(mpqDir)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
mpqName := filepath.Base(mpqPath)
|
||||
mpqDir := filepath.Dir(mpqPath)
|
||||
|
||||
for _, file := range files {
|
||||
if strings.EqualFold(file.Name(), mpqName) {
|
||||
mpqName = file.Name()
|
||||
break
|
||||
var files []fs.FileInfo
|
||||
files, err = ioutil.ReadDir(mpqDir)
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
for _, file := range files {
|
||||
if strings.EqualFold(file.Name(), mpqName) {
|
||||
mpqName = file.Name()
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
return os.Open(filepath.Join(mpqDir, mpqName)) //nolint:gosec // Will fix later
|
||||
}
|
||||
|
||||
return os.Open(filepath.Join(mpqDir, mpqName)) //nolint:gosec // Will fix later
|
||||
return mpqFile, err
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user