From e9d5bd62eebd83770fac562eaac12fbc0ba5aa64 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 16 May 2021 21:41:19 +0100 Subject: [PATCH] cmdlistener: Break out write_error Signed-off-by: Ian Jackson --- daemon/cmdlistener.rs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/daemon/cmdlistener.rs b/daemon/cmdlistener.rs index 0aa83bd4..64ad89d1 100644 --- a/daemon/cmdlistener.rs +++ b/daemon/cmdlistener.rs @@ -1356,13 +1356,16 @@ impl CommandStream<'_> { }, Err(EOF) => break, Err(IO(e)) => Err(e).context("read command stream")?, - Err(Parse(s)) => { - let resp = MgmtResponse::Error { error: ME::CommandParseFailed(s) }; - self.chan.write.write(&resp).context("swrite command stream")?; - } + Err(Parse(s)) => self.write_error(ME::CommandParseFailed(s))?, } } } + + #[throws(CSE)] + pub fn write_error(&mut self, error: MgmtError) { + let resp = MgmtResponse::Error { error }; + self.chan.write.write(&resp).context("swrite error to command stream")?; + } } impl CommandStreamData<'_> { -- 2.30.2