*: golint (part 1)

attrs.go

@@ -50,8 +50,8 @@ type FileStat struct {
 	Mode     uint32
 	Mtime    uint32
 	Atime    uint32
-	Uid      uint32
-	Gid      uint32
+	UID      uint32
+	GID      uint32
 	Extended []StatExtended
 }
 
@@ -98,10 +98,10 @@ func unmarshalAttrs(b []byte) (*FileStat, []byte) {
 		fs.Size, b = unmarshalUint64(b)
 	}
 	if flags&ssh_FILEXFER_ATTR_UIDGID == ssh_FILEXFER_ATTR_UIDGID {
-		fs.Uid, b = unmarshalUint32(b)
+		fs.UID, b = unmarshalUint32(b)
 	}
 	if flags&ssh_FILEXFER_ATTR_UIDGID == ssh_FILEXFER_ATTR_UIDGID {
-		fs.Gid, b = unmarshalUint32(b)
+		fs.GID, b = unmarshalUint32(b)
 	}
 	if flags&ssh_FILEXFER_ATTR_PERMISSIONS == ssh_FILEXFER_ATTR_PERMISSIONS {
 		fs.Mode, b = unmarshalUint32(b)
@@ -149,8 +149,8 @@ func marshalFileInfo(b []byte, fi os.FileInfo) []byte {
 		b = marshalUint64(b, fileStat.Size)
 	}
 	if flags&ssh_FILEXFER_ATTR_UIDGID != 0 {
-		b = marshalUint32(b, fileStat.Uid)
-		b = marshalUint32(b, fileStat.Gid)
+		b = marshalUint32(b, fileStat.UID)
+		b = marshalUint32(b, fileStat.GID)
 	}
 	if flags&ssh_FILEXFER_ATTR_PERMISSIONS != 0 {
 		b = marshalUint32(b, fileStat.Mode)

attrs_test.go

@@ -29,7 +29,7 @@ var unmarshalAttrsTests = []struct {
 	{marshal(nil, struct {
 		Flags                 uint32
 		Size                  uint64
-		Uid, Gid, Permissions uint32
+		UID, GID, Permissions uint32
 	}{ssh_FILEXFER_ATTR_SIZE | ssh_FILEXFER_ATTR_UIDGID | ssh_FILEXFER_ATTR_UIDGID | ssh_FILEXFER_ATTR_PERMISSIONS, 20, 1000, 1000, 0644}), &fileInfo{size: 20, mode: os.FileMode(0644), mtime: time.Unix(int64(0), 0)}, nil},
 }
 

attrs_unix.go

@@ -11,7 +11,7 @@ import (
 func fileStatFromInfoOs(fi os.FileInfo, flags *uint32, fileStat *FileStat) {
 	if statt, ok := fi.Sys().(*syscall.Stat_t); ok {
 		*flags |= ssh_FILEXFER_ATTR_UIDGID
-		fileStat.Uid = statt.Uid
-		fileStat.Gid = statt.Gid
+		fileStat.UID = statt.Uid
+		fileStat.GID = statt.Gid
 	}
 }