1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #28749 from runcom/remove-notneeded-unmarshal

daemon: remove not needed unmarshal
This commit is contained in:
Vincent Demeester 2016-11-23 17:22:23 +01:00 committed by GitHub
commit bbe1a7f84f

View file

@ -4,7 +4,6 @@ package daemon
import ( import (
"bytes" "bytes"
"encoding/json"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"net" "net"
@ -1281,12 +1280,6 @@ func (daemon *Daemon) setupSeccompProfile() error {
return fmt.Errorf("opening seccomp profile (%s) failed: %v", daemon.configStore.SeccompProfile, err) return fmt.Errorf("opening seccomp profile (%s) failed: %v", daemon.configStore.SeccompProfile, err)
} }
daemon.seccompProfile = b daemon.seccompProfile = b
p := struct {
DefaultAction string `json:"defaultAction"`
}{}
if err := json.Unmarshal(daemon.seccompProfile, &p); err != nil {
return err
}
} }
return nil return nil
} }