generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Fix compilation on windows with clang, indentation cleanups"

Browse Source 
This reverts commit f628eaedfeea97e13c63c78dd42f2b1c76723619.

TBR=sergeyu@chromium.org

Review URL: https://webrtc-codereview.appspot.com/13069004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6780 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
sergeyu@chromium.org 2014-07-25 17:37:12 +00:00
parent a44fce5920
commit 2386882266
4 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
talk/base/httpcommon.cc
View File

@ -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; index<max_index; ++index) {
if (_stricmp(needle.c_str(), haystack[index]) == 0) {
return true;
}
if (_stricmp(needle.c_str(), haystack[index]) == 0) {
return true;
}
}
return false;
}
@ -451,9 +451,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));
}
@ -1007,9 +1007,7 @@ HttpAuthResult HttpAuthenticate(
}
CredHandle cred;
ret = AcquireCredentialsHandleA(
0, const_cast<char*>(want_negotiate ? NEGOSSP_NAME_A : NTLMSP_NAME_A),
SECPKG_CRED_OUTBOUND, 0, pauth_id, 0, 0, &cred, &lifetime);
ret = AcquireCredentialsHandleA(0, 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: "

5
talk/base/schanneladapter.cc
View File

@ -149,9 +149,8 @@ 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, const_cast<char*>(UNISP_NAME),
SECPKG_CRED_OUTBOUND, NULL, &sc_cred, NULL,
NULL, &impl_->cred, NULL);
ret = AcquireCredentialsHandle(NULL, 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);

28
webrtc/base/httpcommon.cc
View File

@ -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<max_index; ++index) {
if (_stricmp(needle.c_str(), haystack[index]) == 0) {
return true;
}
if (_stricmp(needle.c_str(), haystack[index]) == 0) {
return true;
}
}
return false;
}
@ -57,11 +57,11 @@ struct Enum {
static inline const char* Name(E val) { return Names[val]; }
static inline bool Parse(E& val, const std::string& name) {
size_t index;
if (!find_string(index, name, Names, Size))
return false;
val = static_cast<E>(index);
return true;
size_t index;
if (!find_string(index, name, Names, Size))
return false;
val = static_cast<E>(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,9 +990,7 @@ HttpAuthResult HttpAuthenticate(
}
CredHandle cred;
ret = AcquireCredentialsHandleA(
0, const_cast<char*>(want_negotiate ? NEGOSSP_NAME_A : NTLMSP_NAME_A),
SECPKG_CRED_OUTBOUND, 0, pauth_id, 0, 0, &cred, &lifetime);
ret = AcquireCredentialsHandleA(0, 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: "
@ -1037,7 +1035,7 @@ HttpAuthResult HttpAuthenticate(
return HAR_RESPONSE;
}
#endif
#endif // WEBRTC_WIN
#endif // WEBRTC_WIN
return HAR_IGNORE;
}

5
webrtc/base/schanneladapter.cc
View File

@ -132,9 +132,8 @@ 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, const_cast<char*>(UNISP_NAME),
SECPKG_CRED_OUTBOUND, NULL, &sc_cred, NULL,
NULL, &impl_->cred, NULL);
ret = AcquireCredentialsHandle(NULL, 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);