otter cli: Break out connect_chan

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/src/bin/otter.rs b/src/bin/otter.rs
index 7e3cf2fa35e7034a1b8603df034bff070ee9973e..8a98a3492c83332e31368f0bc556c8ff1e19cff0 100644 (file)
--- a/src/bin/otter.rs
+++ b/src/bin/otter.rs
@@ -598,8 +598,8 @@ impl Conn {
 }
 
 #[throws(E)]
-fn connect(ma: &MainOpts) -> Conn {
-  let chan = match &ma.server {
+fn connect_chan(ma: &MainOpts) -> MgmtChannel {
+  match &ma.server {
 
     SL::Socket(socket) => {
       MgmtChannel::connect(socket)?
@@ -632,8 +632,12 @@ fn connect(ma: &MainOpts) -> Conn {
       MgmtChannel::new_boxed(r,w)
     },
 
-  };
+  }
+}
 
+#[throws(E)]
+fn connect(ma: &MainOpts) -> Conn {
+  let chan = connect_chan(ma)?;
   let mut chan = Conn { chan };
   if ma.superuser {
     chan.cmd(&MC::SetSuperuser(true))?;