[Libreoffice-commits] online.git: wsd/LOOLWSD.cpp wsd/Storage.cpp

[Noel Grandin]

 wsd/LOOLWSD.cpp |   18 ++++++++----------
 wsd/Storage.cpp |    2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

New commits:
commit 98c236f9bb0e5c8eeaedfe3382d208890a46cf6a
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Fri Dec 23 08:47:04 2016 +0200

    loplugin:staticanonymous
    
    Change-Id: I2adf6be69967c163dd6dabbc35e9777589133956
    Reviewed-on: https://gerrit.libreoffice.org/32367
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index a5a9282..bb8d4e1 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -189,8 +189,7 @@ static int careerSpanSeconds = 0;
 namespace
 {
 
-static inline
-void shutdownLimitReached(LOOLWebSocket& ws)
+inline void shutdownLimitReached(LOOLWebSocket& ws)
 {
     const std::string error = Poco::format(PAYLOAD_UNAVAILABLE_LIMIT_REACHED, MAX_DOCUMENTS, MAX_CONNECTIONS);
 
@@ -1395,7 +1394,7 @@ public:
 namespace
 {
 
-static inline ServerSocket* getServerSocket(int nPortNumber, bool reuseDetails)
+inline ServerSocket* getServerSocket(int nPortNumber, bool reuseDetails)
 {
     try
     {
@@ -1415,7 +1414,7 @@ static inline ServerSocket* getServerSocket(int nPortNumber, bool reuseDetails)
     }
 }
 
-static inline ServerSocket* findFreeServerPort(int& nClientPortNumber)
+inline ServerSocket* findFreeServerPort(int& nClientPortNumber)
 {
     ServerSocket* socket = nullptr;
     while (!socket)
@@ -1430,7 +1429,7 @@ static inline ServerSocket* findFreeServerPort(int& nClientPortNumber)
     return socket;
 }
 
-static inline ServerSocket* getMasterSocket(int nMasterPortNumber)
+inline ServerSocket* getMasterSocket(int nMasterPortNumber)
 {
     try
     {
@@ -1444,8 +1443,7 @@ static inline ServerSocket* getMasterSocket(int nMasterPortNumber)
     }
 }
 
-static inline
-ServerSocket* findFreeMasterPort(int &nMasterPortNumber)
+inline ServerSocket* findFreeMasterPort(int &nMasterPortNumber)
 {
     ServerSocket* socket = nullptr;
     while (!socket)
@@ -1460,7 +1458,7 @@ ServerSocket* findFreeMasterPort(int &nMasterPortNumber)
     return socket;
 }
 
-static inline std::string getLaunchBase(const std::string &credentials)
+inline std::string getLaunchBase(const std::string &credentials)
 {
     std::ostringstream oss;
     oss << "    ";
@@ -1472,7 +1470,7 @@ static inline std::string getLaunchBase(const std::string &credentials)
     return oss.str();
 }
 
-static inline std::string getLaunchURI()
+inline std::string getLaunchURI()
 {
     const std::string aAbsTopSrcDir = Poco::Path(Application::instance().commandPath()).parent().toString();
 
@@ -1487,7 +1485,7 @@ static inline std::string getLaunchURI()
     return oss.str();
 }
 
-static inline std::string getAdminURI(const Poco::Util::LayeredConfiguration &config)
+inline std::string getAdminURI(const Poco::Util::LayeredConfiguration &config)
 {
     std::string user = config.getString("admin_console.username", "");
     std::string passwd = config.getString("admin_console.password", "");
diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index 33790b1..9c0f0ef 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -274,7 +274,7 @@ StorageBase::SaveResult LocalStorage::saveLocalFileToStorage(const Poco::URI& ur
 
 namespace {
 
-static inline
+inline
 Poco::Net::HTTPClientSession* getHTTPClientSession(const Poco::URI& uri)
 {
     return (LOOLWSD::isSSLEnabled() || LOOLWSD::isSSLTermination()) ? new Poco::Net::HTTPSClientSession(uri.getHost(), uri.getPort(), Poco::Net::SSLManager::instance().defaultClientContext())