vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Correct mismatched function names (UID() and Gid())

Browse source 
All the go-lint work forced any existing "Uid" -> "UID", but seems to
not have the same rules for Gid, so stat package has calls UID() and
Gid().

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
This commit is contained in:
Phil Estes 2015-10-12 10:58:33 -04:00
parent 54df0b606e
commit 2ca1c23a5d
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
archive/changes_unix.go
View file

@ -12,7 +12,7 @@ func statDifferent(oldStat *system.StatT, newStat *system.StatT) bool {
// Don't look at size for dirs, its not a good measure of change // Don't look at size for dirs, its not a good measure of change
if oldStat.Mode() != newStat.Mode() || if oldStat.Mode() != newStat.Mode() ||
oldStat.UID() != newStat.UID() || oldStat.UID() != newStat.UID() ||
oldStat.Gid() != newStat.Gid() || oldStat.GID() != newStat.GID() ||
oldStat.Rdev() != newStat.Rdev() || oldStat.Rdev() != newStat.Rdev() ||
// Don't look at size for dirs, its not a good measure of change // Don't look at size for dirs, its not a good measure of change
(oldStat.Mode()&syscall.S_IFDIR != syscall.S_IFDIR && (oldStat.Mode()&syscall.S_IFDIR != syscall.S_IFDIR &&

4
system/stat.go
View file

@ -27,8 +27,8 @@ func (s StatT) UID() uint32 {
return s.uid return s.uid
} }
// Gid returns file's group id of owner. // GID returns file's group id of owner.
func (s StatT) Gid() uint32 { func (s StatT) GID() uint32 {
return s.gid return s.gid
} }

2
system/stat_unix_test.go
View file

@ -27,7 +27,7 @@ func TestFromStatT(t *testing.T) {
if stat.Uid != s.UID() { if stat.Uid != s.UID() {
t.Fatal("got invalid uid") t.Fatal("got invalid uid")
} }
if stat.Gid != s.Gid() { if stat.Gid != s.GID() {
t.Fatal("got invalid gid") t.Fatal("got invalid gid")
} }
if stat.Rdev != s.Rdev() { if stat.Rdev != s.Rdev() {