Skip to content

Commit

Permalink
Merge pull request #11 from waynr/maint
Browse files Browse the repository at this point in the history
Eliminate compiler warning.
  • Loading branch information
withoutboats committed Feb 16, 2016
2 parents f1cbbec + f1baf78 commit 00bed32
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion scaffolding/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ fn main() {

// Set the TERM variable and establish a TTY connection
env::set_var("TERM", "notty");
let (tty_r, tty_w, handle) = tty::pty("sh", COLS as u16, ROWS as u16);
let (tty_r, tty_w) = tty::pty("sh", COLS as u16, ROWS as u16);

// Handler program output (tty -> screen) on separate thread.
let (tx_out, rx) = mpsc::channel();
Expand Down
4 changes: 2 additions & 2 deletions scaffolding/tty/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ struct Winsize {
ws_ypixel: libc::c_ushort,
}

pub fn pty(name: &str, width: u16, height: u16) -> (Reader, Writer, Arc<Handle>) {
pub fn pty(name: &str, width: u16, height: u16) -> (Reader, Writer) {
let mut amaster = 0;
let winsize = Winsize {
ws_row: height as libc::c_ushort,
Expand All @@ -57,7 +57,7 @@ pub fn pty(name: &str, width: u16, height: u16) -> (Reader, Writer, Arc<Handle>)
}
n if n > 0 => {
let handle = Arc::new(Handle(amaster));
(Reader(handle.clone()), Writer(handle.clone()), handle)
(Reader(handle.clone()), Writer(handle.clone()))
}
_ => panic!("Fork failed.")
}
Expand Down

0 comments on commit 00bed32

Please sign in to comment.