summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTilde Engineering <engineering@tilde.io>2015-07-06 16:37:48 -0700
committerTilde Engineering <engineering@tilde.io>2015-07-06 16:44:56 -0700
commit27807473ae5d46f700551a05a2d606ab31d5c532 (patch)
tree71bce3626b7c6a6375933a5d5d86c31f0a341148 /src
parent2f4111b620e1d7589d967322f26681768f87a43b (diff)
downloadnix-27807473ae5d46f700551a05a2d606ab31d5c532.zip
Use c_long in ptrace fns for arch-independence
Diffstat (limited to 'src')
-rw-r--r--src/sys/ptrace.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/sys/ptrace.rs b/src/sys/ptrace.rs
index efda8c4e..5fd00907 100644
--- a/src/sys/ptrace.rs
+++ b/src/sys/ptrace.rs
@@ -1,6 +1,6 @@
use {Error, Result};
use errno::Errno;
-use libc::{pid_t, c_void};
+use libc::{pid_t, c_void, c_long};
#[cfg(all(target_os = "linux",
any(target_arch = "x86",
@@ -51,7 +51,7 @@ mod ffi {
}
}
-pub fn ptrace(request: ptrace::PtraceRequest, pid: pid_t, addr: *mut c_void, data: *mut c_void) -> Result<i64> {
+pub fn ptrace(request: ptrace::PtraceRequest, pid: pid_t, addr: *mut c_void, data: *mut c_void) -> Result<c_long> {
use self::ptrace::*;
match request {
@@ -60,7 +60,7 @@ pub fn ptrace(request: ptrace::PtraceRequest, pid: pid_t, addr: *mut c_void, dat
}
}
-fn ptrace_peek(request: ptrace::PtraceRequest, pid: pid_t, addr: *mut c_void, data: *mut c_void) -> Result<i64> {
+fn ptrace_peek(request: ptrace::PtraceRequest, pid: pid_t, addr: *mut c_void, data: *mut c_void) -> Result<c_long> {
let ret = unsafe {
Errno::clear();
ffi::ptrace(request, pid, addr, data)
@@ -68,10 +68,10 @@ fn ptrace_peek(request: ptrace::PtraceRequest, pid: pid_t, addr: *mut c_void, da
if ret == -1 && Errno::last() != Errno::UnknownErrno {
return Err(Error::Sys(Errno::last()));
}
- Ok::<i64, Error>(ret)
+ Ok::<c_long, Error>(ret)
}
-fn ptrace_other(request: ptrace::PtraceRequest, pid: pid_t, addr: *mut c_void, data: *mut c_void) -> Result<i64> {
+fn ptrace_other(request: ptrace::PtraceRequest, pid: pid_t, addr: *mut c_void, data: *mut c_void) -> Result<c_long> {
match unsafe { ffi::ptrace(request, pid, addr, data) } {
-1 => Err(Error::Sys(Errno::last())),
_ => Ok(0)