X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Ftools%2Fmiri%2Fsrc%2Fshims%2Funix%2Fthread.rs;h=4f7b028d35dbfaf6705c8b05f78933d40f300dd0;hb=f0bb7c726412b3187a9ba94b97240474a096ee4a;hp=5b9dc90f0f0060c63524e4297e83aec4d8301532;hpb=2b988588ce8f87ed2b7341014bd785ddb8babcd1;p=rust.git diff --git a/src/tools/miri/src/shims/unix/thread.rs b/src/tools/miri/src/shims/unix/thread.rs index 5b9dc90f0f0..4f7b028d35d 100644 --- a/src/tools/miri/src/shims/unix/thread.rs +++ b/src/tools/miri/src/shims/unix/thread.rs @@ -84,7 +84,7 @@ fn pthread_setname_np( // Comparing with `>=` to account for null terminator. if name.len() >= max_name_len { - return this.eval_libc("ERANGE"); + return Ok(this.eval_libc("ERANGE")); } this.set_thread_name(thread, name); @@ -107,7 +107,7 @@ fn pthread_getname_np( let name = this.get_thread_name(thread).to_owned(); let (success, _written) = this.write_c_str(&name, name_out, len)?; - if success { Ok(Scalar::from_u32(0)) } else { this.eval_libc("ERANGE") } + Ok(if success { Scalar::from_u32(0) } else { this.eval_libc("ERANGE") }) } fn sched_yield(&mut self) -> InterpResult<'tcx, i32> {