nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-28 02:57:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed casing issues.

Browse Source
This commit is contained in:
P.Y. Laligand 2017-09-15 14:11:04 -07:00 committed by James Tucker
parent de3bb916d8
commit cc4e82fe7a
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/libstd/sys/unix/process/process_fuchsia.rs
View File

@ -67,8 +67,8 @@ impl Command {
}
// Duplicate the job handle
let mut job_copy: zx_handle_t = zx_HANDLE_INVALID;
zx_cvt(zx_handle_duplicate(job_handle, zx_RIGHT_SAME_RIGHTS, &mut job_copy))?;
let mut job_copy: zx_handle_t = ZX_HANDLE_INVALID;
zx_cvt(zx_handle_duplicate(job_handle, ZX_RIGHT_SAME_RIGHTS, &mut job_copy))?;
// Create a launchpad
let mut launchpad: *mut launchpad_t = ptr::null_mut();
zx_cvt(launchpad_create(job_copy, self.get_argv()[0], &mut launchpad))?;
@ -82,7 +82,7 @@ impl Command {
zx_cvt(launchpad_add_vdso_vmo(launchpad))?;
// Load the executable
zx_cvt(launchpad_elf_load(launchpad, launchpad_vmo_from_file(self.get_argv()[0])))?;
zx_cvt(launchpad_load_vdso(launchpad, zx_HANDLE_INVALID))?;
zx_cvt(launchpad_load_vdso(launchpad, ZX_HANDLE_INVALID))?;
zx_cvt(launchpad_clone(launchpad, LP_CLONE_FDIO_ROOT | LP_CLONE_FDIO_CWD))?;
// Clone stdin, stdout, and stderr
@ -152,9 +152,9 @@ impl Process {
let mut avail: zx_size_t = 0;
unsafe {
zx_cvt(zx_object_wait_one(self.handle.raw(), zx_TASK_TERMINATED,
zx_TIME_INFINITE, ptr::null_mut()))?;
zx_cvt(zx_object_get_info(self.handle.raw(), zx_INFO_PROCESS,
zx_cvt(zx_object_wait_one(self.handle.raw(), ZX_TASK_TERMINATED,
ZX_TIME_INFINITE, ptr::null_mut()))?;
zx_cvt(zx_object_get_info(self.handle.raw(), ZX_INFO_PROCESS,
&mut proc_info as *mut _ as *mut libc::c_void,
mem::size_of::<zx_info_process_t>(), &mut actual,
&mut avail))?;
@ -175,7 +175,7 @@ impl Process {
let mut avail: zx_size_t = 0;
unsafe {
let status = zx_object_wait_one(self.handle.raw(), zx_TASK_TERMINATED,
let status = zx_object_wait_one(self.handle.raw(), ZX_TASK_TERMINATED,
0, ptr::null_mut());
match status {
0 => { }, // Success
@ -184,7 +184,7 @@ impl Process {
},
_ => { panic!("Failed to wait on process handle: {}", status); },
}
zx_cvt(zx_object_get_info(self.handle.raw(), zx_INFO_PROCESS,
zx_cvt(zx_object_get_info(self.handle.raw(), ZX_INFO_PROCESS,
&mut proc_info as *mut _ as *mut libc::c_void,
mem::size_of::<zx_info_process_t>(), &mut actual,
&mut avail))?;

16
src/libstd/sys/unix/process/zircon.rs
View File

@ -24,22 +24,22 @@ pub type zx_status_t = i32;
pub type zx_size_t = usize;
pub const zx_HANDLE_INVALID: zx_handle_t = 0;
pub const ZX_HANDLE_INVALID: zx_handle_t = 0;
pub type zx_time_t = u64;
pub const zx_TIME_INFINITE : zx_time_t = u64::MAX;
pub const ZX_TIME_INFINITE : zx_time_t = u64::MAX;
pub type zx_signals_t = u32;
pub const zx_OBJECT_SIGNAL_3 : zx_signals_t = 1 << 3;
pub const ZX_OBJECT_SIGNAL_3 : zx_signals_t = 1 << 3;
pub const zx_TASK_TERMINATED : zx_signals_t = zx_OBJECT_SIGNAL_3;
pub const ZX_TASK_TERMINATED : zx_signals_t = ZX_OBJECT_SIGNAL_3;
pub const zx_RIGHT_SAME_RIGHTS : zx_rights_t = 1 << 31;
pub const ZX_RIGHT_SAME_RIGHTS : zx_rights_t = 1 << 31;
pub type zx_object_info_topic_t = u32;
pub const zx_INFO_PROCESS : zx_object_info_topic_t = 3;
pub const ZX_INFO_PROCESS : zx_object_info_topic_t = 3;
pub fn zx_cvt<T>(t: T) -> io::Result<T> where T: TryInto<zx_status_t>+Copy {
if let Ok(status) = TryInto::try_into(t) {
@ -76,7 +76,7 @@ impl Drop for Handle {
}
}
// Common zx_INFO header
// Common ZX_INFO header
#[derive(Default)]
#[repr(C)]
pub struct zx_info_header_t {
@ -93,7 +93,7 @@ pub struct zx_record_process_t {
pub return_code: c_int,
}
// Returned for topic zx_INFO_PROCESS
// Returned for topic ZX_INFO_PROCESS
#[derive(Default)]
#[repr(C)]
pub struct zx_info_process_t {