diff options
Diffstat (limited to 'src/libnative')
| -rw-r--r-- | src/libnative/io/file_unix.rs | 6 | ||||
| -rw-r--r-- | src/libnative/io/mod.rs | 10 | ||||
| -rw-r--r-- | src/libnative/io/timer_timerfd.rs | 2 | ||||
| -rw-r--r-- | src/libnative/task.rs | 3 |
4 files changed, 5 insertions, 16 deletions
diff --git a/src/libnative/io/file_unix.rs b/src/libnative/io/file_unix.rs index ff1ff9a569d..1d7938be226 100644 --- a/src/libnative/io/file_unix.rs +++ b/src/libnative/io/file_unix.rs @@ -209,7 +209,8 @@ impl Drop for Inner { if self.close_on_drop && self.fd > libc::STDERR_FILENO { let n = unsafe { libc::close(self.fd) }; if n != 0 { - warn!("error {} when closing file descriptor {}", n, self.fd); + println!("error {} when closing file descriptor {}", n, + self.fd); } } } @@ -362,13 +363,10 @@ pub fn readdir(p: &CString) -> IoResult<~[Path]> { let mut buf = Vec::<u8>::with_capacity(size as uint); let ptr = buf.as_mut_slice().as_mut_ptr() as *mut dirent_t; - debug!("os::list_dir -- BEFORE OPENDIR"); - let dir_ptr = p.with_ref(|buf| unsafe { opendir(buf) }); if dir_ptr as uint != 0 { let mut paths = ~[]; - debug!("os::list_dir -- opendir() SUCCESS"); let mut entry_ptr = 0 as *mut dirent_t; while unsafe { readdir_r(dir_ptr, ptr, &mut entry_ptr) == 0 } { if entry_ptr.is_null() { break } diff --git a/src/libnative/io/mod.rs b/src/libnative/io/mod.rs index a054ee66391..615ed80a648 100644 --- a/src/libnative/io/mod.rs +++ b/src/libnative/io/mod.rs @@ -112,10 +112,7 @@ fn translate_error(errno: i32, detail: bool) -> IoError { libc::ERROR_INVALID_FUNCTION => (io::InvalidInput, "illegal operation on a directory"), - x => { - debug!("ignoring {}: {}", x, os::last_os_error()); - (io::OtherIoError, "unknown error") - } + _ => (io::OtherIoError, "unknown error") } } @@ -141,10 +138,7 @@ fn translate_error(errno: i32, detail: bool) -> IoError { x if x == libc::EAGAIN || x == libc::EWOULDBLOCK => (io::ResourceUnavailable, "resource temporarily unavailable"), - x => { - debug!("ignoring {}: {}", x, os::last_os_error()); - (io::OtherIoError, "unknown error") - } + _ => (io::OtherIoError, "unknown error") } } diff --git a/src/libnative/io/timer_timerfd.rs b/src/libnative/io/timer_timerfd.rs index 1b0e08ca6fb..a8018bec0a6 100644 --- a/src/libnative/io/timer_timerfd.rs +++ b/src/libnative/io/timer_timerfd.rs @@ -89,10 +89,8 @@ fn helper(input: libc::c_int, messages: Receiver<Req>) { }; let mut incoming = false; - debug!("{} events to process", n); for event in events.slice_to(n as uint).iter() { let fd = event.data as libc::c_int; - debug!("data on fd {} (input = {})", fd, input); if fd == input { let mut buf = [0, ..1]; // drain the input file descriptor of its input diff --git a/src/libnative/task.rs b/src/libnative/task.rs index 8510b50777a..7a42d1bfee3 100644 --- a/src/libnative/task.rs +++ b/src/libnative/task.rs @@ -59,12 +59,11 @@ pub fn spawn(f: proc()) { pub fn spawn_opts(opts: TaskOpts, f: proc()) { let TaskOpts { notify_chan, name, stack_size, - logger, stderr, stdout, + stderr, stdout, } = opts; let mut task = ~Task::new(); task.name = name; - task.logger = logger; task.stderr = stderr; task.stdout = stdout; match notify_chan { |
