Fixed issue with Extended Symlinks

Removed some shadowed err's
This commit is contained in:
Caleb Gardner
2021-01-16 01:32:00 -06:00
parent 4187598783
commit 80946f58e7
3 changed files with 17 additions and 11 deletions
+3 -3
View File
@@ -203,7 +203,7 @@ func (f *File) IsDir() bool {
//IsSymlink returns if the file is a symlink.
func (f *File) IsSymlink() bool {
return f.filType == inode.SymType || f.filType == inode.ExtSymlinkType
return f.filType == inode.SymType || f.filType == inode.ExtSymType
}
//IsFile returns if the file is a file.
@@ -217,8 +217,8 @@ func (f *File) SymlinkPath() string {
switch f.filType {
case inode.SymType:
return f.in.Info.(inode.Sym).Path
case inode.ExtSymlinkType:
return f.in.Info.(inode.Sym).Path
case inode.ExtSymType:
return f.in.Info.(inode.ExtSym).Path
default:
return ""
}
+3 -2
View File
@@ -16,7 +16,7 @@ const (
SocketType
ExtDirType
ExtFileType
ExtSymlinkType
ExtSymType
ExtBlockDeviceType
ExtCharDeviceType
ExtFifoType
@@ -67,7 +67,8 @@ func NewExtendedDirectory(rdr io.Reader) (ExtDir, error) {
return inode, err
}
for i := uint16(0); i < inode.IndexCount; i++ {
tmp, err := NewDirectoryIndex(rdr)
var tmp DirIndex
tmp, err = NewDirectoryIndex(rdr)
if err != nil {
return inode, err
}
+11 -6
View File
@@ -31,13 +31,15 @@ func ProcessInode(br io.Reader, blockSize uint32) (*Inode, error) {
}
info = inode
case FileType:
inode, err := NewFile(br, blockSize)
var inode File
inode, err = NewFile(br, blockSize)
if err != nil {
return nil, err
}
info = inode
case SymType:
inode, err := NewSymlink(br)
var inode Sym
inode, err = NewSymlink(br)
if err != nil {
return nil, err
}
@@ -71,19 +73,22 @@ func ProcessInode(br io.Reader, blockSize uint32) (*Inode, error) {
}
info = inode
case ExtDirType:
inode, err := NewExtendedDirectory(br)
var inode ExtDir
inode, err = NewExtendedDirectory(br)
if err != nil {
return nil, err
}
info = inode
case ExtFileType:
inode, err := NewExtendedFile(br, blockSize)
var inode ExtFile
inode, err = NewExtendedFile(br, blockSize)
if err != nil {
return nil, err
}
info = inode
case ExtSymlinkType:
inode, err := NewExtendedSymlink(br)
case ExtSymType:
var inode ExtSym
inode, err = NewExtendedSymlink(br)
if err != nil {
return nil, err
}