Merge pull request #29399 from Mashimiao/oci-namespace-remove-idx

oci/namespace: remove unnecessary variable idx
Upstream-commit: d34e8469606bb4ba1416b0790d4d7641de9d66f9
Component: engine
This commit is contained in:
Sebastiaan van Stijn
2016-12-22 10:50:06 +01:00
committed by GitHub
+2 -5
View File
@@ -4,13 +4,10 @@ import specs "github.com/opencontainers/runtime-spec/specs-go"
// RemoveNamespace removes the `nsType` namespace from OCI spec `s`
func RemoveNamespace(s *specs.Spec, nsType specs.NamespaceType) {
idx := -1
for i, n := range s.Linux.Namespaces {
if n.Type == nsType {
idx = i
s.Linux.Namespaces = append(s.Linux.Namespaces[:i], s.Linux.Namespaces[i+1:]...)
return
}
}
if idx >= 0 {
s.Linux.Namespaces = append(s.Linux.Namespaces[:idx], s.Linux.Namespaces[idx+1:]...)
}
}