gravestench/OpenDiablo2
1
1
Fork 0
mirror of https://github.com/OpenDiablo2/OpenDiablo2 synced 2024-12-27 04:26:29 -05:00
Code Issues Releases Wiki Activity

Fix golang-ci gocritic error

Browse Source 
It should fix this error:
`nilValReturn: returned expr is always nil; replace err with nil`
This commit is contained in:
Panagiotis Georgiadis 2021-03-26 18:52:43 +01:00
parent ecab467a0f
commit 4558da0136
No known key found for this signature in database
GPG Key ID: A5B9AF563B15B24F
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
d2common/d2fileformats/d2mpq/mpq.go
View File

@ -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
}