mirror of
https://github.com/opencontainers/runc.git
synced 2025-10-05 23:46:57 +08:00
setupIO: simplify getting net.UnixConn
The typecast can't fail, so it doesn't make sense checking for errors here. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
@@ -121,12 +121,8 @@ func setupIO(process *libcontainer.Process, container *libcontainer.Container, c
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
uc, ok := conn.(*net.UnixConn)
|
t.postStart = append(t.postStart, conn)
|
||||||
if !ok {
|
socket, err := conn.(*net.UnixConn).File()
|
||||||
return nil, errors.New("casting to UnixConn failed")
|
|
||||||
}
|
|
||||||
t.postStart = append(t.postStart, uc)
|
|
||||||
socket, err := uc.File()
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -432,13 +428,7 @@ func setupPidfdSocket(process *libcontainer.Process, sockpath string) (_clean fu
|
|||||||
return nil, fmt.Errorf("failed to dail %s: %w", sockpath, err)
|
return nil, fmt.Errorf("failed to dail %s: %w", sockpath, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
uc, ok := conn.(*net.UnixConn)
|
socket, err := conn.(*net.UnixConn).File()
|
||||||
if !ok {
|
|
||||||
conn.Close()
|
|
||||||
return nil, errors.New("failed to cast to UnixConn")
|
|
||||||
}
|
|
||||||
|
|
||||||
socket, err := uc.File()
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
conn.Close()
|
conn.Close()
|
||||||
return nil, fmt.Errorf("failed to dup socket: %w", err)
|
return nil, fmt.Errorf("failed to dup socket: %w", err)
|
||||||
|
Reference in New Issue
Block a user