Fix compilation with latest redox-scheme

This commit is contained in:
Jeremy Soller
2024-10-09 11:51:05 -06:00
parent 4b5a784237
commit 790539f962
2 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -113,7 +113,7 @@ fn scan_requests(
}
}
RequestKind::Call(request) => {
if let Ok(response) = request.handle_scheme_block_mut(scheme) {
if let Some(response) = request.handle_scheme_block_mut(scheme) {
let _ = socket
.write_response(response, SignalBehavior::Restart)
.expect("pty: failed to write responses to pty scheme");
@@ -130,7 +130,7 @@ fn scan_requests(
fn do_todos(socket: &Socket, scheme: &mut PtyScheme, todo: &mut Vec<Todo>) {
let mut i = 0;
while i < todo.len() {
if let Ok(response) = todo[i].request.handle_scheme_block_mut(scheme) {
if let Some(response) = todo[i].request.handle_scheme_block_mut(scheme) {
todo.remove(i);
socket
.write_response(response, SignalBehavior::Restart)
+2 -2
View File
@@ -84,12 +84,12 @@ impl SchemeBlockMut for PtyScheme {
Ok(Some(id))
}
fn read(&mut self, id: usize, buf: &mut [u8]) -> Result<Option<usize>> {
fn read(&mut self, id: usize, buf: &mut [u8], _offset: u64, _fcntl_flags: u32) -> Result<Option<usize>> {
let handle = self.handles.get_mut(&id).ok_or(Error::new(EBADF))?;
handle.read(buf)
}
fn write(&mut self, id: usize, buf: &[u8]) -> Result<Option<usize>> {
fn write(&mut self, id: usize, buf: &[u8], _offset: u64, _fcntl_flags: u32) -> Result<Option<usize>> {
let handle = self.handles.get_mut(&id).ok_or(Error::new(EBADF))?;
handle.write(buf)
}