github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-03 18:04:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #820 from Tim-Zhang/mark-unreachable

Browse Source 
Indicates never return function and remove unreachable code
This commit is contained in:
Bin Liu
2020-09-30 13:59:30 +08:00
committed by GitHub
parent c32af06fc6 7019e72c7b
commit ad7b1ff5ad
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/agent/rustjail/src/container.rs
View File

@@ -340,8 +340,6 @@ pub fn init_child() {
return; return;
} }
} }
std::process::exit(-1);
} }
fn do_init_child(cwfd: RawFd) -> Result<()> { fn do_init_child(cwfd: RawFd) -> Result<()> {
@@ -647,8 +645,6 @@ fn do_init_child(cwfd: RawFd) -> Result<()> {
} }
do_exec(&args); do_exec(&args);
Err(anyhow!("fail to create container"))
} }
impl BaseContainer for LinuxContainer { impl BaseContainer for LinuxContainer {
@@ -1022,7 +1018,7 @@ where
}) })
} }
fn do_exec(args: &[String]) -> Result<()> { fn do_exec(args: &[String]) -> ! {
let path = &args[0]; let path = &args[0];
let p = CString::new(path.to_string()).unwrap(); let p = CString::new(path.to_string()).unwrap();
let sa: Vec<CString> = args let sa: Vec<CString> = args
@@ -1041,8 +1037,8 @@ fn do_exec(args: &[String]) -> Result<()> {
_ => std::process::exit(-2), _ => std::process::exit(-2),
} }
} }
// should never reach here
Ok(()) unreachable!()
} }
fn update_namespaces(logger: &Logger, spec: &mut Spec, init_pid: RawFd) -> Result<()> { fn update_namespaces(logger: &Logger, spec: &mut Spec, init_pid: RawFd) -> Result<()> {