diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-10-30 14:29:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-30 14:29:46 +0100 |
| commit | 7318b0e8c75f50d909f88b9878580fcc53998900 (patch) | |
| tree | e6b2ba26ec9d1825f7bc7524a22ca894e4f9f64b /pkg | |
| parent | 4762b630701c9e4c6f6dd9d1c0a80c51b890530e (diff) | |
| parent | 91baaee9a805e710fde8e4605434d79a20c67f7e (diff) | |
| download | podman-7318b0e8c75f50d909f88b9878580fcc53998900.tar.gz podman-7318b0e8c75f50d909f88b9878580fcc53998900.tar.bz2 podman-7318b0e8c75f50d909f88b9878580fcc53998900.zip | |
Merge pull request #4369 from baude/golandautocodecorrections
goland autocorrections
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/adapter/containers_remote.go | 2 | ||||
| -rw-r--r-- | pkg/network/subnet.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkg/adapter/containers_remote.go b/pkg/adapter/containers_remote.go index f4e83a975..20471d895 100644 --- a/pkg/adapter/containers_remote.go +++ b/pkg/adapter/containers_remote.go @@ -1021,7 +1021,7 @@ func (r *LocalRuntime) Commit(ctx context.Context, c *cliconfig.CommitValues, co func (r *LocalRuntime) ExecContainer(ctx context.Context, cli *cliconfig.ExecValues) (int, error) { var ( oldTermState *term.State - ec int = define.ExecErrorCodeGeneric + ec = define.ExecErrorCodeGeneric ) // default invalid command exit code // Validate given environment variables diff --git a/pkg/network/subnet.go b/pkg/network/subnet.go index 82ab9a8c8..90f0cdfce 100644 --- a/pkg/network/subnet.go +++ b/pkg/network/subnet.go @@ -18,7 +18,7 @@ func incByte(subnet *net.IPNet, idx int, shift uint) error { subnet.IP[idx] = 0 return incByte(subnet, idx-1, 0) } - subnet.IP[idx] += (1 << shift) + subnet.IP[idx] += 1 << shift return nil } @@ -58,7 +58,7 @@ func LastIPInSubnet(addr *net.IPNet) (net.IP, error) { //nolint:interfacer } hostStart := ones / 8 // Handle the first host byte - cidr.IP[hostStart] |= (0xff & cidr.Mask[hostStart]) + cidr.IP[hostStart] |= 0xff & cidr.Mask[hostStart] // Fill the rest with ones for i := hostStart; i < len(cidr.IP); i++ { cidr.IP[i] = 0xff |