variable name changes

Signed-off-by: kim (grufwub) <grufwub@gmail.com>

core/config.go

@@ -182,10 +182,10 @@ func setupLogger(output string) *logger.SLogger {
 	case "null":
 		return logger.NewSLogger(&logger.NilWriter{}, true)
 	default:
-		fd, err := os.OpenFile(output, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600)
+		file, err := os.OpenFile(output, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600)
 		if err != nil {
 			log.Fatalf(logOutputErrStr, output, err.Error())
 		}
-		return logger.NewSLogger(fd, true)
+		return logger.NewSLogger(file, true)
 	}
 }

core/filesystem.go

@@ -28,12 +28,12 @@ func StatForFile(file *os.File) (os.FileInfo, *errors.Error) {
 }
 
 // ReadFile reads a supplied file descriptor into a return byte slice, or error
-func ReadFile(fd *os.File) ([]byte, *errors.Error) {
+func ReadFile(file *os.File) ([]byte, *errors.Error) {
 	// Return slice
 	ret := make([]byte, 0)
 
 	// Get read buffers, defer putting back
-	br := fileBufferedReaderPool.Get(fd)
+	br := fileBufferedReaderPool.Get(file)
 	defer fileBufferedReaderPool.Put(br)
 
 	// Read through file until null bytes / error
@@ -61,9 +61,9 @@ func ReadFile(fd *os.File) ([]byte, *errors.Error) {
 }
 
 // ScanFile scans a supplied file at file descriptor, using iterator function
-func ScanFile(fd *os.File, iterator func(string) bool) *errors.Error {
+func ScanFile(file *os.File, iterator func(string) bool) *errors.Error {
 	// Get read buffer, defer putting back
-	br := fileBufferedReaderPool.Get(fd)
+	br := fileBufferedReaderPool.Get(file)
 	defer fileBufferedReaderPool.Put(br)
 
 	// Iterate through file!
@@ -94,8 +94,8 @@ func ScanFile(fd *os.File, iterator func(string) bool) *errors.Error {
 }
 
 // ScanDirectory reads the contents of a directory and performs the iterator function on each os.FileInfo entry returned
-func ScanDirectory(fd *os.File, p *Path, iterator func(os.FileInfo, *Path)) *errors.Error {
-	dirList, err := fd.Readdir(-1)
+func ScanDirectory(dir *os.File, p *Path, iterator func(os.FileInfo, *Path)) *errors.Error {
+	dirList, err := dir.Readdir(-1)
 	if err != nil {
 		return errors.WrapError(DirectoryReadErr, err)
 	}

gopher/gophermap.go

@@ -155,7 +155,7 @@ type DirectorySection struct {
 
 // RenderAndWrite scans and renders a list of the contents of a directory (skipping hidden or restricted files)
 func (s *DirectorySection) RenderAndWrite(client *core.Client) *errors.Error {
-	fd, err := core.OpenFile(s.path)
+	file, err := core.OpenFile(s.path)
 	if err != nil {
 		return err
 	}
@@ -164,7 +164,7 @@ func (s *DirectorySection) RenderAndWrite(client *core.Client) *errors.Error {
 	dirContents := make([]byte, 0)
 
 	// Scan directory and build lines
-	err = core.ScanDirectory(fd, s.path, func(file os.FileInfo, p *core.Path) {
+	err = core.ScanDirectory(file, s.path, func(file os.FileInfo, p *core.Path) {
 		// Ignore hidden files!
 		_, ok := s.hidden[file.Name()]
 		if ok {
@@ -190,7 +190,7 @@ type FileSection struct {
 // RenderAndWrite simply opens, reads and writes the file contents to the client
 func (s *FileSection) RenderAndWrite(client *core.Client) *errors.Error {
 	// Open FD for the file
-	fd, err := core.OpenFile(s.path)
+	file, err := core.OpenFile(s.path)
 	if err != nil {
 		return err
 	}
@@ -200,7 +200,7 @@ func (s *FileSection) RenderAndWrite(client *core.Client) *errors.Error {
 
 	// Scan the file contents, format for gophermap, append to byte slice
 	err = core.ScanFile(
-		fd,
+		file,
 		func(line string) bool {
 			b = append(b, buildInfoLine(line)...)
 			return true
@@ -222,13 +222,13 @@ type SubgophermapSection struct {
 // RenderAndWrite reads, renders and writes the contents of the gophermap to the client
 func (s *SubgophermapSection) RenderAndWrite(client *core.Client) *errors.Error {
 	// Get FD for gophermap
-	fd, err := core.OpenFile(s.path)
+	file, err := core.OpenFile(s.path)
 	if err != nil {
 		return err
 	}
 
 	// Read gophermap into sections
-	sections, err := readGophermap(fd, s.path)
+	sections, err := readGophermap(file, s.path)
 	if err != nil {
 		return err
 	}

gopher/server.go

@@ -50,22 +50,22 @@ func serve(client *core.Client) {
 		newFileContent,
 
 		// Handle directory function
-		func(client *core.Client, fd *os.File, p *core.Path) *errors.Error {
+		func(client *core.Client, file *os.File, p *core.Path) *errors.Error {
 			// First check for gophermap, create gophermap Path object
 			gophermap := p.JoinPath("gophermap")
 
 			// If gophermap exists, we fetch this
-			fd2, err := core.OpenFile(gophermap)
+			file2, err := core.OpenFile(gophermap)
 			if err == nil {
-				stat, osErr := fd2.Stat()
+				stat, osErr := file2.Stat()
 				if osErr == nil {
 					// Fetch gophermap and defer close
-					defer fd2.Close()
-					return core.FetchFile(client, fd2, stat, gophermap, newFileContent)
+					defer file2.Close()
+					return core.FetchFile(client, file2, stat, gophermap, newFileContent)
 				}
 
-				// Else, just close fd2
-				fd2.Close()
+				// Else, just close file2
+				file2.Close()
 			}
 
 			// Slice to write
@@ -77,8 +77,8 @@ func serve(client *core.Client) {
 
 			// Scan directory and build lines
 			err = core.ScanDirectory(
-				// Directory fd
-				fd,
+				// Directory file
+				file,
 
 				// Directory path
 				p,