loolwsd/AdminModel.cpp | 10 ----------
loolwsd/Auth.cpp | 8 --------
loolwsd/Makefile.am | 1 +
loolwsd/Storage.cpp | 12 ------------
loolwsd/test/Makefile.am | 2 +-
loolwsd/test/helpers.hpp | 2 +-
6 files changed, 3 insertions(+), 32 deletions(-)
New commits:
commit d170a0c7744f6a52f9ab4f77e853706104c8b192
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Sep 15 21:13:05 2016 +0300
Remove some ASCII art
diff --git a/loolwsd/AdminModel.cpp b/loolwsd/AdminModel.cpp
index aed2ebc..a025400 100644
--- a/loolwsd/AdminModel.cpp
+++ b/loolwsd/AdminModel.cpp
@@ -26,9 +26,6 @@
using Poco::StringTokenizer;
-/////////////////
-// Document Impl
-////////////////
void Document::addView(const std::string& sessionId)
{
const auto ret = _views.emplace(sessionId, View(sessionId));
@@ -57,9 +54,6 @@ int Document::expireView(const std::string& sessionId)
return _activeViews;
}
-///////////////////
-// Subscriber Impl
-//////////////////
bool Subscriber::notify(const std::string& message)
{
StringTokenizer tokens(message, " ", StringTokenizer::TOK_IGNORE_EMPTY |
StringTokenizer::TOK_TRIM);
@@ -91,10 +85,6 @@ void Subscriber::unsubscribe(const std::string& command)
_subscriptions.erase(command);
}
-///////////////////
-// AdminModel Impl
-//////////////////
-
std::string AdminModel::query(const std::string& command)
{
StringTokenizer tokens(command, " ", StringTokenizer::TOK_IGNORE_EMPTY |
StringTokenizer::TOK_TRIM);
diff --git a/loolwsd/Auth.cpp b/loolwsd/Auth.cpp
index a978d56..39b1d7a 100644
--- a/loolwsd/Auth.cpp
+++ b/loolwsd/Auth.cpp
@@ -36,9 +36,6 @@ using Poco::Base64Decoder;
using Poco::Base64Encoder;
using Poco::OutputLineEndingConverter;
-//////////////
-// JWTAuth Impl
-//////////////
const std::string JWTAuth::getAccessToken()
{
std::string encodedHeader = createHeader();
@@ -186,11 +183,6 @@ const std::string JWTAuth::createPayload()
return ostr.str();
}
-
-//////////////
-// OAuth Impl
-//////////////
-
//TODO: This MUST be done over TLS to protect the token.
const std::string OAuth::getAccessToken()
{
diff --git a/loolwsd/Storage.cpp b/loolwsd/Storage.cpp
index 3b71f16..c0e1c4c 100644
--- a/loolwsd/Storage.cpp
+++ b/loolwsd/Storage.cpp
@@ -33,9 +33,6 @@
#include "Unit.hpp"
#include "Util.hpp"
-///////////////////
-// StorageBase Impl
-///////////////////
bool StorageBase::FilesystemEnabled;
bool StorageBase::WopiEnabled;
Util::RegexListMatcher StorageBase::WopiHosts;
@@ -166,9 +163,6 @@ std::unique_ptr<StorageBase> StorageBase::create(const
std::string& jailRoot, co
throw BadRequestException("No Storage configured or invalid URI.");
}
-////////////////////
-// LocalStorage Impl
-/////////////////////
StorageBase::FileInfo LocalStorage::getFileInfo(const Poco::URI& uri)
{
const auto path = Poco::Path(uri.getPath());
@@ -250,9 +244,6 @@ Poco::Net::HTTPClientSession*
lcl_getHTTPClientSession(const Poco::URI& uri)
} // anonymous namespace
-///////////////////
-// WopiStorage Impl
-///////////////////
StorageBase::FileInfo WopiStorage::getFileInfo(const Poco::URI& uri)
{
Log::debug("Getting info for wopi uri [" + uri.toString() + "].");
@@ -387,9 +378,6 @@ bool WopiStorage::saveLocalFileToStorage()
return success;
}
-//////////////////////
-// WebDAVStorage Impl
-///////////////////////
StorageBase::FileInfo WebDAVStorage::getFileInfo(const Poco::URI& uri)
{
Log::debug("Getting info for webdav uri [" + uri.toString() + "].");
commit 4197bc5881db8ec3578b90a262249d6616fdcfe8
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Sep 15 21:02:32 2016 +0300
Don't hide errors behind a bogus default
If TDOC is not defined, this is broken. Defining it as "" in that case
won't fix anything. Use abs_top_srcdir to be less dependent on what
the cwd is when the code runs.
diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am
index 4a3ee81..b9c935c 100644
--- a/loolwsd/Makefile.am
+++ b/loolwsd/Makefile.am
@@ -79,6 +79,7 @@ loolmap_SOURCES = loolmap.c
looltool_SOURCES = LOOLTool.cpp
+loolstress_CPPFLAGS = -DTDOC=\"$(abs_top_srcdir)/test/data\"
loolstress_SOURCES = LOOLStress.cpp \
LOOLProtocol.cpp
diff --git a/loolwsd/test/Makefile.am b/loolwsd/test/Makefile.am
index 91401dc..843bdff 100644
--- a/loolwsd/test/Makefile.am
+++ b/loolwsd/test/Makefile.am
@@ -26,7 +26,7 @@ wsd_sources = \
../Unit.cpp \
../Util.cpp
-test_CPPFLAGS = -DTDOC=\"$(top_srcdir)/test/data\" -I$(top_srcdir)
+test_CPPFLAGS = -DTDOC=\"$(abs_top_srcdir)/test/data\" -I$(top_srcdir)
test_SOURCES = TileCacheTests.cpp WhiteBoxTests.cpp
integration-http-server.cpp \
httpwstest.cpp httpcrashtest.cpp test.cpp $(wsd_sources)
test_LDADD = $(CPPUNIT_LIBS)
diff --git a/loolwsd/test/helpers.hpp b/loolwsd/test/helpers.hpp
index d76fc96..4e60850 100644
--- a/loolwsd/test/helpers.hpp
+++ b/loolwsd/test/helpers.hpp
@@ -44,7 +44,7 @@
#include <LOOLProtocol.hpp>
#ifndef TDOC
-# define TDOC ""
+#error TDOC must be defined (see Makefile.am)
#endif
/// Common helper testing functions.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
