From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 11 Jul 2021 22:49:36 +0000 (+0100)
Subject: sse: Remove a now-redundant loop
X-Git-Tag: otter-1.0.0~136
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6f943dc17288b59584aa01d68b8be56311464c16;p=otter.git

sse: Remove a now-redundant loop

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

diff --git a/daemon/sse.rs b/daemon/sse.rs
index 31dceaf9..d58537d2 100644
--- a/daemon/sse.rs
+++ b/daemon/sse.rs
@@ -184,37 +184,33 @@ impl Read for UpdateReader {
 
     let cv = pu.get_cv();
 
-    loop {
-      let generated = buf.generated();
-      if generated > 0 {
-        self.need_flush = true;
-        return Ok(generated)
-      }
-
-      if self.need_flush {
-        self.need_flush = false;
-        return Err(io::Error::new(io::ErrorKind::WouldBlock,
-                                  FlushWouldBlockError{}));
-      }
-
-      if (||{
-        (*ig).gs.players.get(self.player)?;
-        let client = ig.clients.get_mut(self.client)?;
-        client.lastseen = Instant::now();
-        Some(())
-      })() == None { return Ok(0) }
-
-      cv.wait_for(&mut ig.c, UPDATE_KEEPALIVE);
-
-      write!(buf, "event: commsworking\n\
-                   data: online {} {} G{}\n\n",
-             self.player, self.client, ig.gs.gen)?;
-      self.keepalives += Wrapping(1);
+    let generated = buf.generated();
+    if generated > 0 {
       self.need_flush = true;
-      return Ok(buf.generated());
-/*
-      write!(buf,": keepalive\n\n")?; */
+      return Ok(generated)
     }
+
+    if self.need_flush {
+      self.need_flush = false;
+      return Err(io::Error::new(io::ErrorKind::WouldBlock,
+                                FlushWouldBlockError{}));
+    }
+
+    if (||{
+      (*ig).gs.players.get(self.player)?;
+      let client = ig.clients.get_mut(self.client)?;
+      client.lastseen = Instant::now();
+      Some(())
+    })() == None { return Ok(0) }
+
+    cv.wait_for(&mut ig.c, UPDATE_KEEPALIVE);
+
+    write!(buf, "event: commsworking\n\
+                 data: online {} {} G{}\n\n",
+           self.player, self.client, ig.gs.gen)?;
+    self.keepalives += Wrapping(1);
+    self.need_flush = true;
+    return Ok(buf.generated());
   }
 }