avm2: small cleanup
This commit is contained in:
parent
df4ee7fe05
commit
e1a82570fe
|
@ -126,7 +126,9 @@ pub fn flush<'gc>(
|
|||
.ok_or(invalid_socket_error(activation))?;
|
||||
let UpdateContext { sockets, .. } = &mut activation.context;
|
||||
|
||||
let data = socket.drain_write_buf();
|
||||
let mut buffer = socket.write_buffer();
|
||||
let len = buffer.len();
|
||||
let data = buffer.drain(..len).collect::<Vec<_>>();
|
||||
|
||||
sockets.send(handle, data)
|
||||
}
|
||||
|
|
|
@ -82,6 +82,10 @@ impl<'gc> SocketObject<'gc> {
|
|||
self.0.read_buffer.borrow_mut()
|
||||
}
|
||||
|
||||
pub fn write_buffer(&self) -> RefMut<'_, Vec<u8>> {
|
||||
self.0.write_buffer.borrow_mut()
|
||||
}
|
||||
|
||||
pub fn read_bytes(&self, amnt: usize) -> Result<Vec<u8>, EofError> {
|
||||
let mut buf = self.read_buffer();
|
||||
|
||||
|
@ -99,12 +103,6 @@ impl<'gc> SocketObject<'gc> {
|
|||
self.0.write_buffer.borrow_mut().extend_from_slice(bytes)
|
||||
}
|
||||
|
||||
pub fn drain_write_buf(&self) -> Vec<u8> {
|
||||
let mut buf = self.0.write_buffer.borrow_mut();
|
||||
let len = buf.len();
|
||||
buf.drain(..len).collect::<Vec<u8>>()
|
||||
}
|
||||
|
||||
pub fn read_boolean(&self) -> Result<bool, EofError> {
|
||||
Ok(self.read_bytes(1)? != [0])
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue