github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1152 from ijc/drop-unused-variable

Browse Source 
linux: Drop unused variable `c` by discarding unused assignment
This commit is contained in:
Derek McGowan 2017-07-11 09:40:15 -07:00 committed by GitHub
commit 54e2b9db57
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
linux/runtime.go
View File

@ -14,7 +14,6 @@ import (
"github.com/boltdb/bolt" "github.com/boltdb/bolt"
eventsapi "github.com/containerd/containerd/api/services/events/v1" eventsapi "github.com/containerd/containerd/api/services/events/v1"
"github.com/containerd/containerd/api/types" "github.com/containerd/containerd/api/types"
"github.com/containerd/containerd/containers"
"github.com/containerd/containerd/events" "github.com/containerd/containerd/events"
client "github.com/containerd/containerd/linux/shim" client "github.com/containerd/containerd/linux/shim"
shim "github.com/containerd/containerd/linux/shim/v1" shim "github.com/containerd/containerd/linux/shim/v1"
@ -336,11 +335,10 @@ func (r *Runtime) terminate(ctx context.Context, bundle *bundle, ns, id string)
} }
func (r *Runtime) getRuntime(ctx context.Context, ns, id string) (*runc.Runc, error) { func (r *Runtime) getRuntime(ctx context.Context, ns, id string) (*runc.Runc, error) {
var c containers.Container
if err := r.db.View(func(tx *bolt.Tx) error { if err := r.db.View(func(tx *bolt.Tx) error {
store := metadata.NewContainerStore(tx) store := metadata.NewContainerStore(tx)
var err error var err error
c, err = store.Get(ctx, id) _, err = store.Get(ctx, id)
return err return err
}); err != nil { }); err != nil {
return nil, err return nil, err