Swiftdiff options
| author | Tobias Markmann <tobias.markmann@isode.com> | 2019-11-14 13:45:27 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tobias.markmann@isode.com> | 2019-11-14 13:45:45 (GMT) |
| commit | caca46ceedddd43c707e7eda9b4c765d61730ccb (patch) | |
| tree | 0f6f61935d79d0a0931e50ef0c21828e8b3c9a48 /Swift/Controllers | |
| parent | 7a4d44dbc444b68b665535bb38847cfa48bfee3f (diff) | |
| download | swift-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 'Swift/Controllers')
| -rw-r--r-- | Swift/Controllers/AccountController.cpp | 28 | ||||
| -rw-r--r-- | Swift/Controllers/Settings/XMLSettingsProvider.cpp | 6 |
2 files changed, 15 insertions, 19 deletions
diff --git a/Swift/Controllers/AccountController.cpp b/Swift/Controllers/AccountController.cpp index 27655c0..b877ce9 100644 --- a/Swift/Controllers/AccountController.cpp +++ b/Swift/Controllers/AccountController.cpp | |||
| @@ -840,18 +840,18 @@ void AccountController::handleQuitRequest() { | |||
| 840 | 840 | ||
| 841 | std::string AccountController::serializeClientOptions(const ClientOptions& options) { | 841 | std::string AccountController::serializeClientOptions(const ClientOptions& options) { |
| 842 | std::string result; | 842 | std::string result; |
| 843 | SERIALIZE_BOOL(useStreamCompression); | 843 | SERIALIZE_BOOL(useStreamCompression) |
| 844 | switch (options.useTLS) { | 844 | switch (options.useTLS) { |
| 845 | case ClientOptions::NeverUseTLS: result += "1";break; | 845 | case ClientOptions::NeverUseTLS: result += "1";break; |
| 846 | case ClientOptions::UseTLSWhenAvailable: result += "2";break; | 846 | case ClientOptions::UseTLSWhenAvailable: result += "2";break; |
| 847 | case ClientOptions::RequireTLS: result += "3";break; | 847 | case ClientOptions::RequireTLS: result += "3";break; |
| 848 | } | 848 | } |
| 849 | result += ","; | 849 | result += ","; |
| 850 | SERIALIZE_BOOL(allowPLAINWithoutTLS); | 850 | SERIALIZE_BOOL(allowPLAINWithoutTLS) |
| 851 | SERIALIZE_BOOL(useStreamResumption); | 851 | SERIALIZE_BOOL(useStreamResumption) |
| 852 | SERIALIZE_BOOL(useAcks); | 852 | SERIALIZE_BOOL(useAcks) |
| 853 | SERIALIZE_STRING(manualHostname); | 853 | SERIALIZE_STRING(manualHostname) |
| 854 | SERIALIZE_INT(manualPort); | 854 | SERIALIZE_INT(manualPort) |
| 855 | switch (options.proxyType) { | 855 | switch (options.proxyType) { |
| 856 | case ClientOptions::NoProxy: result += "1";break; | 856 | case ClientOptions::NoProxy: result += "1";break; |
| 857 | case ClientOptions::SystemConfiguredProxy: result += "2";break; | 857 | case ClientOptions::SystemConfiguredProxy: result += "2";break; |
| @@ -859,14 +859,14 @@ std::string AccountController::serializeClientOptions(const ClientOptions& optio | |||
| 859 | case ClientOptions::HTTPConnectProxy: result += "4";break; | 859 | case ClientOptions::HTTPConnectProxy: result += "4";break; |
| 860 | } | 860 | } |
| 861 | result += ","; | 861 | result += ","; |
| 862 | SERIALIZE_STRING(manualProxyHostname); | 862 | SERIALIZE_STRING(manualProxyHostname) |
| 863 | SERIALIZE_INT(manualProxyPort); | 863 | SERIALIZE_INT(manualProxyPort) |
| 864 | SERIALIZE_URL(boshURL); | 864 | SERIALIZE_URL(boshURL) |
| 865 | SERIALIZE_URL(boshHTTPConnectProxyURL); | 865 | SERIALIZE_URL(boshHTTPConnectProxyURL) |
| 866 | SERIALIZE_SAFE_STRING(boshHTTPConnectProxyAuthID); | 866 | SERIALIZE_SAFE_STRING(boshHTTPConnectProxyAuthID) |
| 867 | SERIALIZE_SAFE_STRING(boshHTTPConnectProxyAuthPassword); | 867 | SERIALIZE_SAFE_STRING(boshHTTPConnectProxyAuthPassword) |
| 868 | SERIALIZE_BOOL(tlsOptions.schannelTLS1_0Workaround); | 868 | SERIALIZE_BOOL(tlsOptions.schannelTLS1_0Workaround) |
| 869 | SERIALIZE_BOOL(singleSignOn); | 869 | SERIALIZE_BOOL(singleSignOn) |
| 870 | return result; | 870 | return result; |
| 871 | } | 871 | } |
| 872 | 872 | ||
diff --git a/Swift/Controllers/Settings/XMLSettingsProvider.cpp b/Swift/Controllers/Settings/XMLSettingsProvider.cpp index 8415209..f1049f1 100644 --- a/Swift/Controllers/Settings/XMLSettingsProvider.cpp +++ b/Swift/Controllers/Settings/XMLSettingsProvider.cpp | |||
| @@ -68,7 +68,7 @@ int XMLSettingsProvider::getSetting(const Setting<int>& setting) { | |||
| 68 | if (values_.find(setting.getKey()) != values_.end()) { | 68 | if (values_.find(setting.getKey()) != values_.end()) { |
| 69 | std::string value = values_[setting.getKey()]; | 69 | std::string value = values_[setting.getKey()]; |
| 70 | try { | 70 | try { |
| 71 | return value.empty() ? setting.getDefaultValue() : boost::lexical_cast<int>(value);; | 71 | return value.empty() ? setting.getDefaultValue() : boost::lexical_cast<int>(value); |
| 72 | } | 72 | } |
| 73 | catch(boost::bad_lexical_cast &) {} | 73 | catch(boost::bad_lexical_cast &) {} |
| 74 | } | 74 | } |
| @@ -123,7 +123,3 @@ void XMLSettingsProvider::handleCharacterData(const std::string& data) { | |||
| 123 | 123 | ||
| 124 | 124 | ||
| 125 | } | 125 | } |
| 126 | |||
| 127 | |||
| 128 | |||
| 129 | |||