MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-25 20:16:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

simplifying if-else chains to switches (#6208)

Browse Source
This commit is contained in:
Oleg Kovalov
2018-08-06 19:26:40 +02:00
committed by kannappanr
parent a82500f162
commit 37de2dbd3b
14 changed files with 120 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
cmd/fs-v1-rwpool.go
View File

@@ -93,18 +93,20 @@ func (fsi *fsIOPool) Open(path string) (*lock.RLockedFile, error) {
// Open file for reading with read lock.
newRlkFile, err := lock.RLockedOpenFile(path)
if err != nil {
if os.IsNotExist(err) {
switch {
case os.IsNotExist(err):
return nil, errFileNotFound
} else if os.IsPermission(err) {
case os.IsPermission(err):
return nil, errFileAccessDenied
} else if isSysErrIsDir(err) {
case isSysErrIsDir(err):
return nil, errIsNotRegular
} else if isSysErrNotDir(err) {
case isSysErrNotDir(err):
return nil, errFileAccessDenied
} else if isSysErrPathNotFound(err) {
case isSysErrPathNotFound(err):
return nil, errFileNotFound
default:
return nil, err
}
return nil, err
}
/// Save new reader on the map.
@@ -148,14 +150,16 @@ func (fsi *fsIOPool) Write(path string) (wlk *lock.LockedFile, err error) {
wlk, err = lock.LockedOpenFile(path, os.O_RDWR, 0666)
if err != nil {
if os.IsNotExist(err) {
switch {
case os.IsNotExist(err):
return nil, errFileNotFound
} else if os.IsPermission(err) {
case os.IsPermission(err):
return nil, errFileAccessDenied
} else if isSysErrIsDir(err) {
case isSysErrIsDir(err):
return nil, errIsNotRegular
default:
return nil, err
}
return nil, err
}
return wlk, nil
}
@@ -175,14 +179,16 @@ func (fsi *fsIOPool) Create(path string) (wlk *lock.LockedFile, err error) {
// Attempt to create the file.
wlk, err = lock.LockedOpenFile(path, os.O_RDWR|os.O_CREATE, 0666)
if err != nil {
if os.IsPermission(err) {
switch {
case os.IsPermission(err):
return nil, errFileAccessDenied
} else if isSysErrIsDir(err) {
case isSysErrIsDir(err):
return nil, errIsNotRegular
} else if isSysErrPathNotFound(err) {
case isSysErrPathNotFound(err):
return nil, errFileAccessDenied
default:
return nil, err
}
return nil, err
}
// Success.