commit d78e89bc8b0572e0f07540f0af42cae2313cd9b8
author sergeyu@chromium.org <sergeyu@chromium.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Fri Jul 25 17:37:12 2014 +0000
committer sergeyu@chromium.org <sergeyu@chromium.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Fri Jul 25 17:37:12 2014 +0000
tree cfd5f840e86e3a6c18dd56915fbcb24e7049dc3a
parent ac2555b73eafdca133f2b0104609d5424494cbae

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

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/talk@6780 4adac7df-926f-26a2-2b94-8c16560cd09d

base/httpcommon.cc

diff --git a/base/httpcommon.cc b/base/httpcommon.cc
index 05af9c2..ec7ffd2 100644
--- a/base/httpcommon.cc
+++ b/base/httpcommon.cc
@@ -60,9 +60,9 @@
 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 @@
       if (combine == HC_YES) {
         it->second.append(",");
         it->second.append(value);
-      }
+	  }
       return;
-    }
+	}
   }
   headers_.insert(HeaderMap::value_type(name, value));
 }
@@ -1007,9 +1007,7 @@
       }
 
       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: "

base/schanneladapter.cc

diff --git a/base/schanneladapter.cc b/base/schanneladapter.cc
index 1a71f5d..a376328 100644
--- a/base/schanneladapter.cc
+++ b/base/schanneladapter.cc
@@ -149,9 +149,8 @@
   //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);