Skip to content

Commit b348482

Browse files
committed
*: golint (part 1)
1 parent 42c8b50 commit b348482

File tree

10 files changed

+286
-290
lines changed

10 files changed

+286
-290
lines changed

attrs.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ type FileStat struct {
5050
Mode uint32
5151
Mtime uint32
5252
Atime uint32
53-
Uid uint32
54-
Gid uint32
53+
UID uint32
54+
GID uint32
5555
Extended []StatExtended
5656
}
5757

@@ -98,10 +98,10 @@ func unmarshalAttrs(b []byte) (*FileStat, []byte) {
9898
fs.Size, b = unmarshalUint64(b)
9999
}
100100
if flags&ssh_FILEXFER_ATTR_UIDGID == ssh_FILEXFER_ATTR_UIDGID {
101-
fs.Uid, b = unmarshalUint32(b)
101+
fs.UID, b = unmarshalUint32(b)
102102
}
103103
if flags&ssh_FILEXFER_ATTR_UIDGID == ssh_FILEXFER_ATTR_UIDGID {
104-
fs.Gid, b = unmarshalUint32(b)
104+
fs.GID, b = unmarshalUint32(b)
105105
}
106106
if flags&ssh_FILEXFER_ATTR_PERMISSIONS == ssh_FILEXFER_ATTR_PERMISSIONS {
107107
fs.Mode, b = unmarshalUint32(b)
@@ -149,8 +149,8 @@ func marshalFileInfo(b []byte, fi os.FileInfo) []byte {
149149
b = marshalUint64(b, fileStat.Size)
150150
}
151151
if flags&ssh_FILEXFER_ATTR_UIDGID != 0 {
152-
b = marshalUint32(b, fileStat.Uid)
153-
b = marshalUint32(b, fileStat.Gid)
152+
b = marshalUint32(b, fileStat.UID)
153+
b = marshalUint32(b, fileStat.GID)
154154
}
155155
if flags&ssh_FILEXFER_ATTR_PERMISSIONS != 0 {
156156
b = marshalUint32(b, fileStat.Mode)

attrs_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ var unmarshalAttrsTests = []struct {
2929
{marshal(nil, struct {
3030
Flags uint32
3131
Size uint64
32-
Uid, Gid, Permissions uint32
32+
UID, GID, Permissions uint32
3333
}{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},
3434
}
3535

attrs_unix.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
func fileStatFromInfoOs(fi os.FileInfo, flags *uint32, fileStat *FileStat) {
1212
if statt, ok := fi.Sys().(*syscall.Stat_t); ok {
1313
*flags |= ssh_FILEXFER_ATTR_UIDGID
14-
fileStat.Uid = statt.Uid
15-
fileStat.Gid = statt.Gid
14+
fileStat.UID = statt.Uid
15+
fileStat.GID = statt.Gid
1616
}
1717
}

0 commit comments

Comments
 (0)