Skip to content

Commit c12994e

Browse files
pylaligandraggi
authored andcommitted
Fixed casing issues.
1 parent fe4a8a7 commit c12994e

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

src/libstd/sys/unix/process/process_fuchsia.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ impl Command {
6767
}
6868

6969
// Duplicate the job handle
70-
let mut job_copy: zx_handle_t = zx_HANDLE_INVALID;
71-
zx_cvt(zx_handle_duplicate(job_handle, zx_RIGHT_SAME_RIGHTS, &mut job_copy))?;
70+
let mut job_copy: zx_handle_t = ZX_HANDLE_INVALID;
71+
zx_cvt(zx_handle_duplicate(job_handle, ZX_RIGHT_SAME_RIGHTS, &mut job_copy))?;
7272
// Create a launchpad
7373
let mut launchpad: *mut launchpad_t = ptr::null_mut();
7474
zx_cvt(launchpad_create(job_copy, self.get_argv()[0], &mut launchpad))?;
@@ -82,7 +82,7 @@ impl Command {
8282
zx_cvt(launchpad_add_vdso_vmo(launchpad))?;
8383
// Load the executable
8484
zx_cvt(launchpad_elf_load(launchpad, launchpad_vmo_from_file(self.get_argv()[0])))?;
85-
zx_cvt(launchpad_load_vdso(launchpad, zx_HANDLE_INVALID))?;
85+
zx_cvt(launchpad_load_vdso(launchpad, ZX_HANDLE_INVALID))?;
8686
zx_cvt(launchpad_clone(launchpad, LP_CLONE_FDIO_ROOT | LP_CLONE_FDIO_CWD))?;
8787

8888
// Clone stdin, stdout, and stderr
@@ -152,9 +152,9 @@ impl Process {
152152
let mut avail: zx_size_t = 0;
153153

154154
unsafe {
155-
zx_cvt(zx_object_wait_one(self.handle.raw(), zx_TASK_TERMINATED,
156-
zx_TIME_INFINITE, ptr::null_mut()))?;
157-
zx_cvt(zx_object_get_info(self.handle.raw(), zx_INFO_PROCESS,
155+
zx_cvt(zx_object_wait_one(self.handle.raw(), ZX_TASK_TERMINATED,
156+
ZX_TIME_INFINITE, ptr::null_mut()))?;
157+
zx_cvt(zx_object_get_info(self.handle.raw(), ZX_INFO_PROCESS,
158158
&mut proc_info as *mut _ as *mut libc::c_void,
159159
mem::size_of::<zx_info_process_t>(), &mut actual,
160160
&mut avail))?;
@@ -175,7 +175,7 @@ impl Process {
175175
let mut avail: zx_size_t = 0;
176176

177177
unsafe {
178-
let status = zx_object_wait_one(self.handle.raw(), zx_TASK_TERMINATED,
178+
let status = zx_object_wait_one(self.handle.raw(), ZX_TASK_TERMINATED,
179179
0, ptr::null_mut());
180180
match status {
181181
0 => { }, // Success
@@ -184,7 +184,7 @@ impl Process {
184184
},
185185
_ => { panic!("Failed to wait on process handle: {}", status); },
186186
}
187-
zx_cvt(zx_object_get_info(self.handle.raw(), zx_INFO_PROCESS,
187+
zx_cvt(zx_object_get_info(self.handle.raw(), ZX_INFO_PROCESS,
188188
&mut proc_info as *mut _ as *mut libc::c_void,
189189
mem::size_of::<zx_info_process_t>(), &mut actual,
190190
&mut avail))?;

src/libstd/sys/unix/process/zircon.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,22 @@ pub type zx_status_t = i32;
2424

2525
pub type zx_size_t = usize;
2626

27-
pub const zx_HANDLE_INVALID: zx_handle_t = 0;
27+
pub const ZX_HANDLE_INVALID: zx_handle_t = 0;
2828

2929
pub type zx_time_t = u64;
30-
pub const zx_TIME_INFINITE : zx_time_t = u64::MAX;
30+
pub const ZX_TIME_INFINITE : zx_time_t = u64::MAX;
3131

3232
pub type zx_signals_t = u32;
3333

34-
pub const zx_OBJECT_SIGNAL_3 : zx_signals_t = 1 << 3;
34+
pub const ZX_OBJECT_SIGNAL_3 : zx_signals_t = 1 << 3;
3535

36-
pub const zx_TASK_TERMINATED : zx_signals_t = zx_OBJECT_SIGNAL_3;
36+
pub const ZX_TASK_TERMINATED : zx_signals_t = ZX_OBJECT_SIGNAL_3;
3737

38-
pub const zx_RIGHT_SAME_RIGHTS : zx_rights_t = 1 << 31;
38+
pub const ZX_RIGHT_SAME_RIGHTS : zx_rights_t = 1 << 31;
3939

4040
pub type zx_object_info_topic_t = u32;
4141

42-
pub const zx_INFO_PROCESS : zx_object_info_topic_t = 3;
42+
pub const ZX_INFO_PROCESS : zx_object_info_topic_t = 3;
4343

4444
pub fn zx_cvt<T>(t: T) -> io::Result<T> where T: TryInto<zx_status_t>+Copy {
4545
if let Ok(status) = TryInto::try_into(t) {
@@ -76,7 +76,7 @@ impl Drop for Handle {
7676
}
7777
}
7878

79-
// Common zx_INFO header
79+
// Common ZX_INFO header
8080
#[derive(Default)]
8181
#[repr(C)]
8282
pub struct zx_info_header_t {
@@ -93,7 +93,7 @@ pub struct zx_record_process_t {
9393
pub return_code: c_int,
9494
}
9595

96-
// Returned for topic zx_INFO_PROCESS
96+
// Returned for topic ZX_INFO_PROCESS
9797
#[derive(Default)]
9898
#[repr(C)]
9999
pub struct zx_info_process_t {

0 commit comments

Comments
 (0)