Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-03-31 14:57:35 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-03-31 14:57:35 (GMT) |
| commit | cfbdb43d2cadd40aa87338d41548e4bf89e146e6 (patch) | |
| tree | 18d94153a302445196fc0c18586abf44a1ce4a38 /Swiften/StreamStack/XMPPLayer.cpp | |
| parent | 1d545a4a7fb877f021508094b88c1f17b30d8b4e (diff) | |
| download | swift-cfbdb43d2cadd40aa87338d41548e4bf89e146e6.zip swift-cfbdb43d2cadd40aa87338d41548e4bf89e146e6.tar.bz2 | |
Convert tabs to 4 spaces for all source files
Removed trailing spaces and whitespace on empty lines
in the process.
Changed CheckTabs.py tool to disallow hard tabs in source
files.
Test-Information:
Manually checked 30 random files that the conversion worked
as expected.
Change-Id: I874f99d617bd3d2bb55f02d58f22f58f9b094480
Diffstat (limited to 'Swiften/StreamStack/XMPPLayer.cpp')
| -rw-r--r-- | Swiften/StreamStack/XMPPLayer.cpp | 92 |
1 files changed, 46 insertions, 46 deletions
diff --git a/Swiften/StreamStack/XMPPLayer.cpp b/Swiften/StreamStack/XMPPLayer.cpp index 2f7e578..e0d683c 100644 --- a/Swiften/StreamStack/XMPPLayer.cpp +++ b/Swiften/StreamStack/XMPPLayer.cpp @@ -13,88 +13,88 @@ namespace Swift { XMPPLayer::XMPPLayer( - PayloadParserFactoryCollection* payloadParserFactories, - PayloadSerializerCollection* payloadSerializers, - XMLParserFactory* xmlParserFactory, - StreamType streamType, - bool setExplictNSonTopLevelElements) : - payloadParserFactories_(payloadParserFactories), - payloadSerializers_(payloadSerializers), - xmlParserFactory_(xmlParserFactory), - setExplictNSonTopLevelElements_(setExplictNSonTopLevelElements), - resetParserAfterParse_(false), - inParser_(false) { - xmppParser_ = new XMPPParser(this, payloadParserFactories_, xmlParserFactory); - xmppSerializer_ = new XMPPSerializer(payloadSerializers_, streamType, setExplictNSonTopLevelElements); + PayloadParserFactoryCollection* payloadParserFactories, + PayloadSerializerCollection* payloadSerializers, + XMLParserFactory* xmlParserFactory, + StreamType streamType, + bool setExplictNSonTopLevelElements) : + payloadParserFactories_(payloadParserFactories), + payloadSerializers_(payloadSerializers), + xmlParserFactory_(xmlParserFactory), + setExplictNSonTopLevelElements_(setExplictNSonTopLevelElements), + resetParserAfterParse_(false), + inParser_(false) { + xmppParser_ = new XMPPParser(this, payloadParserFactories_, xmlParserFactory); + xmppSerializer_ = new XMPPSerializer(payloadSerializers_, streamType, setExplictNSonTopLevelElements); } XMPPLayer::~XMPPLayer() { - delete xmppSerializer_; - delete xmppParser_; + delete xmppSerializer_; + delete xmppParser_; } void XMPPLayer::writeHeader(const ProtocolHeader& header) { - writeDataInternal(createSafeByteArray(xmppSerializer_->serializeHeader(header))); + writeDataInternal(createSafeByteArray(xmppSerializer_->serializeHeader(header))); } void XMPPLayer::writeFooter() { - writeDataInternal(createSafeByteArray(xmppSerializer_->serializeFooter())); + writeDataInternal(createSafeByteArray(xmppSerializer_->serializeFooter())); } void XMPPLayer::writeElement(boost::shared_ptr<ToplevelElement> element) { - writeDataInternal(xmppSerializer_->serializeElement(element)); + writeDataInternal(xmppSerializer_->serializeElement(element)); } void XMPPLayer::writeData(const std::string& data) { - writeDataInternal(createSafeByteArray(data)); + writeDataInternal(createSafeByteArray(data)); } void XMPPLayer::writeDataInternal(const SafeByteArray& data) { - onWriteData(data); - writeDataToChildLayer(data); + onWriteData(data); + writeDataToChildLayer(data); } void XMPPLayer::handleDataRead(const SafeByteArray& data) { - onDataRead(data); - inParser_ = true; - // FIXME: Converting to unsafe string. Should be ok, since we don't take passwords - // from the stream in clients. If servers start using this, and require safe storage, - // we need to fix this. - if (!xmppParser_->parse(byteArrayToString(ByteArray(data.begin(), data.end())))) { - inParser_ = false; - onError(); - return; - } - inParser_ = false; - if (resetParserAfterParse_) { - doResetParser(); - } + onDataRead(data); + inParser_ = true; + // FIXME: Converting to unsafe string. Should be ok, since we don't take passwords + // from the stream in clients. If servers start using this, and require safe storage, + // we need to fix this. + if (!xmppParser_->parse(byteArrayToString(ByteArray(data.begin(), data.end())))) { + inParser_ = false; + onError(); + return; + } + inParser_ = false; + if (resetParserAfterParse_) { + doResetParser(); + } } void XMPPLayer::doResetParser() { - delete xmppParser_; - xmppParser_ = new XMPPParser(this, payloadParserFactories_, xmlParserFactory_); - resetParserAfterParse_ = false; + delete xmppParser_; + xmppParser_ = new XMPPParser(this, payloadParserFactories_, xmlParserFactory_); + resetParserAfterParse_ = false; } void XMPPLayer::handleStreamStart(const ProtocolHeader& header) { - onStreamStart(header); + onStreamStart(header); } void XMPPLayer::handleElement(boost::shared_ptr<ToplevelElement> stanza) { - onElement(stanza); + onElement(stanza); } void XMPPLayer::handleStreamEnd() { } void XMPPLayer::resetParser() { - if (inParser_) { - resetParserAfterParse_ = true; - } - else { - doResetParser(); - } + if (inParser_) { + resetParserAfterParse_ = true; + } + else { + doResetParser(); + } } } |