mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-11 06:03:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

libct/factory: make some methods functions

Browse Source 
These do not have to be methods.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin
2022-02-10 19:27:17 -08:00
parent 8358a0ecbb
commit 6a29787bc9
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libcontainer/factory_linux.go
+5 -5
View File
@@ -58,7 +58,7 @@ func (l *LinuxFactory) Create(id string, config *configs.Config) (Container, err
if l.Root == "" { if l.Root == "" {
return nil, errors.New("root not set") return nil, errors.New("root not set")
} }
if err := l.validateID(id); err != nil { if err := validateID(id); err != nil {
return nil, err return nil, err
} }
if err := validate.Validate(config); err != nil { if err := validate.Validate(config); err != nil {
@@ -130,14 +130,14 @@ func (l *LinuxFactory) Load(id string) (Container, error) {
return nil, errors.New("root not set") return nil, errors.New("root not set")
} }
// when load, we need to check id is valid or not. // when load, we need to check id is valid or not.
if err := l.validateID(id); err != nil { if err := validateID(id); err != nil {
return nil, err return nil, err
} }
containerRoot, err := securejoin.SecureJoin(l.Root, id) containerRoot, err := securejoin.SecureJoin(l.Root, id)
if err != nil { if err != nil {
return nil, err return nil, err
} }
state, err := l.loadState(containerRoot) state, err := loadState(containerRoot)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -252,7 +252,7 @@ func StartInitialization() (err error) {
return i.Init() return i.Init()
} }
func (l *LinuxFactory) loadState(root string) (*State, error) { func loadState(root string) (*State, error) {
stateFilePath, err := securejoin.SecureJoin(root, stateFilename) stateFilePath, err := securejoin.SecureJoin(root, stateFilename)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -272,7 +272,7 @@ func (l *LinuxFactory) loadState(root string) (*State, error) {
return state, nil return state, nil
} }
func (l *LinuxFactory) validateID(id string) error { func validateID(id string) error {
if !idRegex.MatchString(id) || string(os.PathSeparator)+id != utils.CleanPath(string(os.PathSeparator)+id) { if !idRegex.MatchString(id) || string(os.PathSeparator)+id != utils.CleanPath(string(os.PathSeparator)+id) {
return ErrInvalidID return ErrInvalidID
} }