From 80946f58e77b6f4c871f34460299e6e340049ce8 Mon Sep 17 00:00:00 2001
From: Caleb Gardner <calebq23@gmail.com>
Date: Sat, 16 Jan 2021 01:32:00 -0600
Subject: [PATCH] Fixed issue with Extended Symlinks Removed some shadowed
 err's

---
 file.go                      |  6 +++---
 internal/inode/inodetypes.go |  5 +++--
 internal/inode/process.go    | 17 +++++++++++------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/file.go b/file.go
index 9fc920f..1dd66db 100644
--- a/file.go
+++ b/file.go
@@ -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 ""
 	}
diff --git a/internal/inode/inodetypes.go b/internal/inode/inodetypes.go
index 4992f16..4239fa1 100644
--- a/internal/inode/inodetypes.go
+++ b/internal/inode/inodetypes.go
@@ -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
 		}
diff --git a/internal/inode/process.go b/internal/inode/process.go
index d63f4f0..8e42f89 100644
--- a/internal/inode/process.go
+++ b/internal/inode/process.go
@@ -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
 		}