[Libreoffice-commits] online.git: loolwsd/LOOLWSD.cpp loolwsd/Util.cpp

Tor Lillqvist tml at collabora.com
Thu Oct 13 09:02:09 UTC 2016


 loolwsd/LOOLWSD.cpp |    2 +-
 loolwsd/Util.cpp    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 213c7c6d09f46e786d9fa68cfefbd1019168e738
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Oct 13 11:58:15 2016 +0300

    Catch by const ref
    
    That's what we do everywhere else, not reason to do differently in
    these two places.

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 01b7b2a..cf22bfd 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -210,7 +210,7 @@ void shutdownLimitReached(WebSocket& ws)
         }
         while (retries > 0 && (flags & WebSocket::FRAME_OP_BITMASK) != WebSocket::FRAME_OP_CLOSE);
     }
-    catch (Exception&)
+    catch (const Exception&)
     {
         ws.sendFrame(error.data(), error.size());
         ws.shutdown(WebSocket::WS_POLICY_VIOLATION);
diff --git a/loolwsd/Util.cpp b/loolwsd/Util.cpp
index 548698a..c367630 100644
--- a/loolwsd/Util.cpp
+++ b/loolwsd/Util.cpp
@@ -505,7 +505,7 @@ namespace Util
         {
             nMem = std::stoi(sResponse);
         }
-        catch(std::exception& e)
+        catch(const std::exception&)
         {
             Log::warn() << "Trying to find memory of invalid/dead PID" << Log::end;
         }


More information about the Libreoffice-commits mailing list