GitList

Browse code

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

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)

Phil Estes authored on 2015/10/12 23:58:33
Showing 5 changed files

daemon/volumes_unix.go index b860aa3..3b32c65 100644
integration-cli/docker_cli_experimental_test.go index e0ed4c7..8cbb1bb 100644
pkg/archive/changes_unix.go index a2ccbb2..05f109a 100644
pkg/system/stat.go index 7392c82..087034c 100644
pkg/system/stat_unix_test.go index 8b3c42b..dee8d30 100644

daemon/volumes_unix.go

History View file @ 79240b9

@@ -28,7 +28,7 @@ func copyOwnership(source, destination string) error {
 		return err
 	}
 
-	if err := os.Chown(destination, int(stat.UID()), int(stat.Gid())); err != nil {
+	if err := os.Chown(destination, int(stat.UID()), int(stat.GID())); err != nil {
 		return err
 	}
 

integration-cli/docker_cli_experimental_test.go

History View file @ 79240b9

@@ -80,5 +80,5 @@ func (s *DockerDaemonSuite) TestDaemonUserNamespaceRootSetting(c *check.C) {
 		c.Fatal(err)
 	}
 	c.Assert(stat.UID(), check.Equals, uint32(uid), check.Commentf("Touched file not owned by remapped root UID"))
-	c.Assert(stat.Gid(), check.Equals, uint32(gid), check.Commentf("Touched file not owned by remapped root GID"))
+	c.Assert(stat.GID(), check.Equals, uint32(gid), check.Commentf("Touched file not owned by remapped root GID"))
 }

pkg/archive/changes_unix.go

History View file @ 79240b9

@@ -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
                      	if oldStat.Mode() != newStat.Mode() ||
                      		oldStat.UID() != newStat.UID() ||
                     -		oldStat.Gid() != newStat.Gid() ||
                     +		oldStat.GID() != newStat.GID() ||
                      		oldStat.Rdev() != newStat.Rdev() ||
                      		// Don't look at size for dirs, its not a good measure of change
                      		(oldStat.Mode()&syscall.S_IFDIR != syscall.S_IFDIR &&

pkg/system/stat.go

History View file @ 79240b9

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

pkg/system/stat_unix_test.go

History View file @ 79240b9

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

...	...	@@ -28,7 +28,7 @@ func copyOwnership(source, destination string) error {
28	28	return err
29	29	}
30	30
31		- if err := os.Chown(destination, int(stat.UID()), int(stat.Gid())); err != nil {
	31	+ if err := os.Chown(destination, int(stat.UID()), int(stat.GID())); err != nil {
32	32	return err
33	33	}
34	34

...	...	@@ -80,5 +80,5 @@ func (s DockerDaemonSuite) TestDaemonUserNamespaceRootSetting(c check.C) {
80	80	c.Fatal(err)
81	81	}
82	82	c.Assert(stat.UID(), check.Equals, uint32(uid), check.Commentf("Touched file not owned by remapped root UID"))
83		- c.Assert(stat.Gid(), check.Equals, uint32(gid), check.Commentf("Touched file not owned by remapped root GID"))
	83	+ c.Assert(stat.GID(), check.Equals, uint32(gid), check.Commentf("Touched file not owned by remapped root GID"))
84	84	}

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

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