Swift
summaryrefslogtreecommitdiffstats
path: root/Swiften
diff options
context:
space:
mode:
authorTobias Markmann <tobias.markmann@isode.com>2019-11-14 13:45:27 (GMT)
committerTobias Markmann <tobias.markmann@isode.com>2019-11-14 13:45:45 (GMT)
commitcaca46ceedddd43c707e7eda9b4c765d61730ccb (patch)
tree0f6f61935d79d0a0931e50ef0c21828e8b3c9a48 /Swiften
parent7a4d44dbc444b68b665535bb38847cfa48bfee3f (diff)
downloadswift-caca46ceedddd43c707e7eda9b4c765d61730ccb.zip
swift-caca46ceedddd43c707e7eda9b4c765d61730ccb.tar.bz2
Remove extra semicolons
clang-trunk complained about them and ideally Swift would build without warnings. Test-Information: Builds find and tests pass. Change-Id: I1896befef0e65a980cc22f402e126aec8b56e71f
Diffstat (limited to 'Swiften')
-rw-r--r--Swiften/Chat/ChatStateTracker.cpp2
-rw-r--r--Swiften/Client/ClientSession.cpp14
-rw-r--r--Swiften/Elements/JingleFileTransferFileInfo.h2
-rw-r--r--Swiften/Elements/StreamInitiationFileInfo.h2
-rw-r--r--Swiften/Examples/ConnectivityTest/ConnectivityTest.cpp2
-rw-r--r--Swiften/FileTransfer/IncrementalBytestreamHashCalculator.cpp4
-rw-r--r--Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.cpp6
-rw-r--r--Swiften/TLS/SecureTransport/SecureTransportContext.mm2
8 files changed, 17 insertions, 17 deletions
diff --git a/Swiften/Chat/ChatStateTracker.cpp b/Swiften/Chat/ChatStateTracker.cpp
index 25ecd1c..839f47d 100644
--- a/Swiften/Chat/ChatStateTracker.cpp
+++ b/Swiften/Chat/ChatStateTracker.cpp
@@ -17,7 +17,7 @@ void ChatStateTracker::handleMessageReceived(std::shared_ptr<Message> message) {
17 } 17 }
18 std::shared_ptr<ChatState> statePayload = message->getPayload<ChatState>(); 18 std::shared_ptr<ChatState> statePayload = message->getPayload<ChatState>();
19 if (statePayload) { 19 if (statePayload) {
20 changeState(statePayload->getChatState());; 20 changeState(statePayload->getChatState());
21 } 21 }
22} 22}
23 23
diff --git a/Swiften/Client/ClientSession.cpp b/Swiften/Client/ClientSession.cpp
index bb9be58..4e34417 100644
--- a/Swiften/Client/ClientSession.cpp
+++ b/Swiften/Client/ClientSession.cpp
@@ -122,7 +122,7 @@ void ClientSession::sendStanza(std::shared_ptr<Stanza> stanza) {
122} 122}
123 123
124void ClientSession::handleStreamStart(const ProtocolHeader&) { 124void ClientSession::handleStreamStart(const ProtocolHeader&) {
125 CHECK_STATE_OR_RETURN(State::WaitingForStreamStart); 125 CHECK_STATE_OR_RETURN(State::WaitingForStreamStart)
126 state = State::Negotiating; 126 state = State::Negotiating;
127} 127}
128 128
@@ -214,7 +214,7 @@ void ClientSession::handleElement(std::shared_ptr<ToplevelElement> element) {
214 } 214 }
215 } 215 }
216 else if (StreamFeatures* streamFeatures = dynamic_cast<StreamFeatures*>(element.get())) { 216 else if (StreamFeatures* streamFeatures = dynamic_cast<StreamFeatures*>(element.get())) {
217 CHECK_STATE_OR_RETURN(State::Negotiating); 217 CHECK_STATE_OR_RETURN(State::Negotiating)
218 218
219 if (streamFeatures->hasStartTLS() && stream->supportsTLSEncryption() && useTLS != NeverUseTLS) { 219 if (streamFeatures->hasStartTLS() && stream->supportsTLSEncryption() && useTLS != NeverUseTLS) {
220 state = State::WaitingForEncrypt; 220 state = State::WaitingForEncrypt;
@@ -320,7 +320,7 @@ void ClientSession::handleElement(std::shared_ptr<ToplevelElement> element) {
320 } 320 }
321 } 321 }
322 else if (std::dynamic_pointer_cast<Compressed>(element)) { 322 else if (std::dynamic_pointer_cast<Compressed>(element)) {
323 CHECK_STATE_OR_RETURN(State::Compressing); 323 CHECK_STATE_OR_RETURN(State::Compressing)
324 state = State::WaitingForStreamStart; 324 state = State::WaitingForStreamStart;
325 stream->addZLibCompression(); 325 stream->addZLibCompression();
326 stream->resetXMPPParser(); 326 stream->resetXMPPParser();
@@ -343,7 +343,7 @@ void ClientSession::handleElement(std::shared_ptr<ToplevelElement> element) {
343 continueSessionInitialization(); 343 continueSessionInitialization();
344 } 344 }
345 else if (AuthChallenge* challenge = dynamic_cast<AuthChallenge*>(element.get())) { 345 else if (AuthChallenge* challenge = dynamic_cast<AuthChallenge*>(element.get())) {
346 CHECK_STATE_OR_RETURN(State::Authenticating); 346 CHECK_STATE_OR_RETURN(State::Authenticating)
347 assert(authenticator); 347 assert(authenticator);
348 if (authenticator->setChallenge(challenge->getValue())) { 348 if (authenticator->setChallenge(challenge->getValue())) {
349 stream->writeElement(std::make_shared<AuthResponse>(authenticator->getResponse())); 349 stream->writeElement(std::make_shared<AuthResponse>(authenticator->getResponse()));
@@ -361,7 +361,7 @@ void ClientSession::handleElement(std::shared_ptr<ToplevelElement> element) {
361 } 361 }
362 } 362 }
363 else if (AuthSuccess* authSuccess = dynamic_cast<AuthSuccess*>(element.get())) { 363 else if (AuthSuccess* authSuccess = dynamic_cast<AuthSuccess*>(element.get())) {
364 CHECK_STATE_OR_RETURN(State::Authenticating); 364 CHECK_STATE_OR_RETURN(State::Authenticating)
365 assert(authenticator); 365 assert(authenticator);
366 if (!authenticator->setChallenge(authSuccess->getValue())) { 366 if (!authenticator->setChallenge(authSuccess->getValue())) {
367 finishSession(Error::ServerVerificationFailedError); 367 finishSession(Error::ServerVerificationFailedError);
@@ -378,7 +378,7 @@ void ClientSession::handleElement(std::shared_ptr<ToplevelElement> element) {
378 finishSession(Error::AuthenticationFailedError); 378 finishSession(Error::AuthenticationFailedError);
379 } 379 }
380 else if (dynamic_cast<TLSProceed*>(element.get())) { 380 else if (dynamic_cast<TLSProceed*>(element.get())) {
381 CHECK_STATE_OR_RETURN(State::WaitingForEncrypt); 381 CHECK_STATE_OR_RETURN(State::WaitingForEncrypt)
382 state = State::Encrypting; 382 state = State::Encrypting;
383 stream->addTLSEncryption(); 383 stream->addTLSEncryption();
384 } 384 }
@@ -433,7 +433,7 @@ void ClientSession::sendCredentials(const SafeByteArray& password) {
433 433
434void ClientSession::handleTLSEncrypted() { 434void ClientSession::handleTLSEncrypted() {
435 if (!std::dynamic_pointer_cast<BOSHSessionStream>(stream)) { 435 if (!std::dynamic_pointer_cast<BOSHSessionStream>(stream)) {
436 CHECK_STATE_OR_RETURN(State::Encrypting); 436 CHECK_STATE_OR_RETURN(State::Encrypting)
437 } 437 }
438 438
439 std::vector<Certificate::ref> certificateChain = stream->getPeerCertificateChain(); 439 std::vector<Certificate::ref> certificateChain = stream->getPeerCertificateChain();
diff --git a/Swiften/Elements/JingleFileTransferFileInfo.h b/Swiften/Elements/JingleFileTransferFileInfo.h
index 9fd8756..0e8ccd4 100644
--- a/Swiften/Elements/JingleFileTransferFileInfo.h
+++ b/Swiften/Elements/JingleFileTransferFileInfo.h
@@ -36,7 +36,7 @@ namespace Swift {
36 36
37 public: 37 public:
38 void setName(const std::string& name) { 38 void setName(const std::string& name) {
39 name_ = name;; 39 name_ = name;
40 } 40 }
41 41
42 const std::string& getName() const { 42 const std::string& getName() const {
diff --git a/Swiften/Elements/StreamInitiationFileInfo.h b/Swiften/Elements/StreamInitiationFileInfo.h
index f2dc5b9..773814f 100644
--- a/Swiften/Elements/StreamInitiationFileInfo.h
+++ b/Swiften/Elements/StreamInitiationFileInfo.h
@@ -26,7 +26,7 @@ public:
26 name(name), description(description), size(size), hash(hash), date(date), algo(algo), supportsRangeRequests(false), rangeOffset(0) {} 26 name(name), description(description), size(size), hash(hash), date(date), algo(algo), supportsRangeRequests(false), rangeOffset(0) {}
27 27
28 void setName(const std::string& name) { 28 void setName(const std::string& name) {
29 this->name = name;; 29 this->name = name;
30 } 30 }
31 31
32 const std::string& getName() const { 32 const std::string& getName() const {
diff --git a/Swiften/Examples/ConnectivityTest/ConnectivityTest.cpp b/Swiften/Examples/ConnectivityTest/ConnectivityTest.cpp
index 607038f..cc783c6 100644
--- a/Swiften/Examples/ConnectivityTest/ConnectivityTest.cpp
+++ b/Swiften/Examples/ConnectivityTest/ConnectivityTest.cpp
@@ -77,7 +77,7 @@ int main(int argc, char* argv[]) {
77 ClientXMLTracer* tracer = new ClientXMLTracer(client); 77 ClientXMLTracer* tracer = new ClientXMLTracer(client);
78 client->onConnected.connect(&handleConnected); 78 client->onConnected.connect(&handleConnected);
79 errorConnection = client->onDisconnected.connect(&handleDisconnected); 79 errorConnection = client->onDisconnected.connect(&handleDisconnected);
80 std::cout << "Connecting to JID " << jid << " with timeout " << timeout << "ms on host: "; ; 80 std::cout << "Connecting to JID " << jid << " with timeout " << timeout << "ms on host: ";
81 if (!connectHost.empty()) { 81 if (!connectHost.empty()) {
82 std::cout << connectHost << std::endl; 82 std::cout << connectHost << std::endl;
83 ClientOptions options; 83 ClientOptions options;
diff --git a/Swiften/FileTransfer/IncrementalBytestreamHashCalculator.cpp b/Swiften/FileTransfer/IncrementalBytestreamHashCalculator.cpp
index f177304..faddcb9 100644
--- a/Swiften/FileTransfer/IncrementalBytestreamHashCalculator.cpp
+++ b/Swiften/FileTransfer/IncrementalBytestreamHashCalculator.cpp
@@ -64,12 +64,12 @@ ByteArray IncrementalBytestreamHashCalculator::getMD5Hash() {
64 64
65std::string IncrementalBytestreamHashCalculator::getSHA1String() { 65std::string IncrementalBytestreamHashCalculator::getSHA1String() {
66 assert(sha1Hasher); 66 assert(sha1Hasher);
67 return Hexify::hexify(getSHA1Hash());; 67 return Hexify::hexify(getSHA1Hash());
68} 68}
69 69
70std::string IncrementalBytestreamHashCalculator::getMD5String() { 70std::string IncrementalBytestreamHashCalculator::getMD5String() {
71 assert(md5Hasher); 71 assert(md5Hasher);
72 return Hexify::hexify(getMD5Hash());; 72 return Hexify::hexify(getMD5Hash());
73} 73}
74 74
75} 75}
diff --git a/Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.cpp b/Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.cpp
index 4743089..8c05c6f 100644
--- a/Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.cpp
@@ -67,7 +67,7 @@ namespace Swift {
67 element->setAttribute("height", std::to_string(rect.getHeight())); 67 element->setAttribute("height", std::to_string(rect.getHeight()));
68 element->setAttribute("id", rect.getID()); 68 element->setAttribute("id", rect.getID());
69 element->setAttribute("stroke", rect.getPenColor().toHex()); 69 element->setAttribute("stroke", rect.getPenColor().toHex());
70 element->setAttribute("fill", rect.getBrushColor().toHex());; 70 element->setAttribute("fill", rect.getBrushColor().toHex());
71 element->setAttribute("stroke-width", std::to_string(rect.getPenWidth())); 71 element->setAttribute("stroke-width", std::to_string(rect.getPenWidth()));
72 element->setAttribute("opacity", alphaToOpacity(rect.getPenColor().getAlpha())); 72 element->setAttribute("opacity", alphaToOpacity(rect.getPenColor().getAlpha()));
73 element->setAttribute("fill-opacity", alphaToOpacity(rect.getBrushColor().getAlpha())); 73 element->setAttribute("fill-opacity", alphaToOpacity(rect.getBrushColor().getAlpha()));
@@ -80,7 +80,7 @@ namespace Swift {
80 try { 80 try {
81 element->setAttribute("id", polygon.getID()); 81 element->setAttribute("id", polygon.getID());
82 element->setAttribute("stroke", polygon.getPenColor().toHex()); 82 element->setAttribute("stroke", polygon.getPenColor().toHex());
83 element->setAttribute("fill", polygon.getBrushColor().toHex());; 83 element->setAttribute("fill", polygon.getBrushColor().toHex());
84 element->setAttribute("stroke-width", std::to_string(polygon.getPenWidth())); 84 element->setAttribute("stroke-width", std::to_string(polygon.getPenWidth()));
85 element->setAttribute("opacity", alphaToOpacity(polygon.getPenColor().getAlpha())); 85 element->setAttribute("opacity", alphaToOpacity(polygon.getPenColor().getAlpha()));
86 element->setAttribute("fill-opacity", alphaToOpacity(polygon.getBrushColor().getAlpha())); 86 element->setAttribute("fill-opacity", alphaToOpacity(polygon.getBrushColor().getAlpha()));
@@ -117,7 +117,7 @@ namespace Swift {
117 element->setAttribute("ry", std::to_string(ellipse.getRY())); 117 element->setAttribute("ry", std::to_string(ellipse.getRY()));
118 element->setAttribute("id", ellipse.getID()); 118 element->setAttribute("id", ellipse.getID());
119 element->setAttribute("stroke", ellipse.getPenColor().toHex()); 119 element->setAttribute("stroke", ellipse.getPenColor().toHex());
120 element->setAttribute("fill", ellipse.getBrushColor().toHex());; 120 element->setAttribute("fill", ellipse.getBrushColor().toHex());
121 element->setAttribute("stroke-width", std::to_string(ellipse.getPenWidth())); 121 element->setAttribute("stroke-width", std::to_string(ellipse.getPenWidth()));
122 element->setAttribute("opacity", alphaToOpacity(ellipse.getPenColor().getAlpha())); 122 element->setAttribute("opacity", alphaToOpacity(ellipse.getPenColor().getAlpha()));
123 element->setAttribute("fill-opacity", alphaToOpacity(ellipse.getBrushColor().getAlpha())); 123 element->setAttribute("fill-opacity", alphaToOpacity(ellipse.getBrushColor().getAlpha()));
diff --git a/Swiften/TLS/SecureTransport/SecureTransportContext.mm b/Swiften/TLS/SecureTransport/SecureTransportContext.mm
index 1ed636b..25f476f 100644
--- a/Swiften/TLS/SecureTransport/SecureTransportContext.mm
+++ b/Swiften/TLS/SecureTransport/SecureTransportContext.mm
@@ -376,7 +376,7 @@ std::vector<Certificate::ref> SecureTransportContext::getPeerCertificateChain()
376 typedef boost::remove_pointer<SecTrustRef>::type SecTrust; 376 typedef boost::remove_pointer<SecTrustRef>::type SecTrust;
377 std::shared_ptr<SecTrust> securityTrust; 377 std::shared_ptr<SecTrust> securityTrust;
378 378
379 SecTrustRef secTrust = nullptr;; 379 SecTrustRef secTrust = nullptr;
380 OSStatus error = SSLCopyPeerTrust(sslContext_.get(), &secTrust); 380 OSStatus error = SSLCopyPeerTrust(sslContext_.get(), &secTrust);
381 if (error == noErr) { 381 if (error == noErr) {
382 securityTrust = std::shared_ptr<SecTrust>(secTrust, CFRelease); 382 securityTrust = std::shared_ptr<SecTrust>(secTrust, CFRelease);