From af9e7943d1b3e38b1d92d77fd91eeaf50148c3b9 Mon Sep 17 00:00:00 2001 From: "sergeyu@chromium.org" Date: Fri, 25 Jul 2014 19:42:19 +0000 Subject: [PATCH] Fix compilation on windows with clang, indentation cleanups R=henrike@webrtc.org, thakis@chromium.org TBR=hellner@chromium.org Committed: https://code.google.com/p/webrtc/source/detail?r=6779 Review URL: https://webrtc-codereview.appspot.com/18849004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6786 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/base/httpcommon.cc | 14 ++++++++------ talk/base/schanneladapter.cc | 5 +++-- webrtc/base/httpcommon.cc | 28 +++++++++++++++------------- webrtc/base/schanneladapter.cc | 5 +++-- 4 files changed, 29 insertions(+), 23 deletions(-) diff --git a/talk/base/httpcommon.cc b/talk/base/httpcommon.cc index ec7ffd2883..05af9c2a42 100644 --- a/talk/base/httpcommon.cc +++ b/talk/base/httpcommon.cc @@ -60,9 +60,9 @@ extern const ConstantLabel SECURITY_ERRORS[]; bool find_string(size_t& index, const std::string& needle, const char* const haystack[], size_t max_index) { for (index=0; indexsecond.append(","); it->second.append(value); - } + } return; - } + } } headers_.insert(HeaderMap::value_type(name, value)); } @@ -1007,7 +1007,9 @@ HttpAuthResult HttpAuthenticate( } CredHandle cred; - ret = AcquireCredentialsHandleA(0, want_negotiate ? NEGOSSP_NAME_A : NTLMSP_NAME_A, SECPKG_CRED_OUTBOUND, 0, pauth_id, 0, 0, &cred, &lifetime); + ret = AcquireCredentialsHandleA( + 0, const_cast(want_negotiate ? NEGOSSP_NAME_A : NTLMSP_NAME_A), + SECPKG_CRED_OUTBOUND, 0, pauth_id, 0, 0, &cred, &lifetime); //LOG(INFO) << "$$$ AcquireCredentialsHandle @ " << TimeSince(now); if (ret != SEC_E_OK) { LOG(LS_ERROR) << "AcquireCredentialsHandle error: " diff --git a/talk/base/schanneladapter.cc b/talk/base/schanneladapter.cc index a376328e27..3d24b6430c 100644 --- a/talk/base/schanneladapter.cc +++ b/talk/base/schanneladapter.cc @@ -149,8 +149,9 @@ SChannelAdapter::BeginSSL() { //sc_cred.dwMinimumCipherStrength = 128; // Note: use system default sc_cred.dwFlags = SCH_CRED_NO_DEFAULT_CREDS | SCH_CRED_AUTO_CRED_VALIDATION; - ret = AcquireCredentialsHandle(NULL, UNISP_NAME, SECPKG_CRED_OUTBOUND, NULL, - &sc_cred, NULL, NULL, &impl_->cred, NULL); + ret = AcquireCredentialsHandle(NULL, const_cast(UNISP_NAME), + SECPKG_CRED_OUTBOUND, NULL, &sc_cred, NULL, + NULL, &impl_->cred, NULL); if (ret != SEC_E_OK) { LOG(LS_ERROR) << "AcquireCredentialsHandle error: " << ErrorName(ret, SECURITY_ERRORS); diff --git a/webrtc/base/httpcommon.cc b/webrtc/base/httpcommon.cc index 095cdafef9..569b7b3ac3 100644 --- a/webrtc/base/httpcommon.cc +++ b/webrtc/base/httpcommon.cc @@ -43,9 +43,9 @@ extern const ConstantLabel SECURITY_ERRORS[]; bool find_string(size_t& index, const std::string& needle, const char* const haystack[], size_t max_index) { for (index=0; index(index); - return true; + size_t index; + if (!find_string(index, name, Names, Size)) + return false; + val = static_cast(index); + return true; } E val; @@ -434,9 +434,9 @@ HttpData::changeHeader(const std::string& name, const std::string& value, if (combine == HC_YES) { it->second.append(","); it->second.append(value); - } + } return; - } + } } headers_.insert(HeaderMap::value_type(name, value)); } @@ -731,7 +731,7 @@ struct NegotiateAuthContext : public HttpAuthContext { FreeCredentialsHandle(&cred); } }; -#endif // WEBRTC_WIN +#endif // WEBRTC_WIN HttpAuthResult HttpAuthenticate( const char * challenge, size_t len, @@ -990,7 +990,9 @@ HttpAuthResult HttpAuthenticate( } CredHandle cred; - ret = AcquireCredentialsHandleA(0, want_negotiate ? NEGOSSP_NAME_A : NTLMSP_NAME_A, SECPKG_CRED_OUTBOUND, 0, pauth_id, 0, 0, &cred, &lifetime); + ret = AcquireCredentialsHandleA( + 0, const_cast(want_negotiate ? NEGOSSP_NAME_A : NTLMSP_NAME_A), + SECPKG_CRED_OUTBOUND, 0, pauth_id, 0, 0, &cred, &lifetime); //LOG(INFO) << "$$$ AcquireCredentialsHandle @ " << TimeSince(now); if (ret != SEC_E_OK) { LOG(LS_ERROR) << "AcquireCredentialsHandle error: " @@ -1035,7 +1037,7 @@ HttpAuthResult HttpAuthenticate( return HAR_RESPONSE; } #endif -#endif // WEBRTC_WIN +#endif // WEBRTC_WIN return HAR_IGNORE; } diff --git a/webrtc/base/schanneladapter.cc b/webrtc/base/schanneladapter.cc index 50c0638fd4..9af15a7284 100644 --- a/webrtc/base/schanneladapter.cc +++ b/webrtc/base/schanneladapter.cc @@ -132,8 +132,9 @@ SChannelAdapter::BeginSSL() { //sc_cred.dwMinimumCipherStrength = 128; // Note: use system default sc_cred.dwFlags = SCH_CRED_NO_DEFAULT_CREDS | SCH_CRED_AUTO_CRED_VALIDATION; - ret = AcquireCredentialsHandle(NULL, UNISP_NAME, SECPKG_CRED_OUTBOUND, NULL, - &sc_cred, NULL, NULL, &impl_->cred, NULL); + ret = AcquireCredentialsHandle(NULL, const_cast(UNISP_NAME), + SECPKG_CRED_OUTBOUND, NULL, &sc_cred, NULL, + NULL, &impl_->cred, NULL); if (ret != SEC_E_OK) { LOG(LS_ERROR) << "AcquireCredentialsHandle error: " << ErrorName(ret, SECURITY_ERRORS);