summaryrefslogtreecommitdiff
path: root/curl/curl-7.26.0_win-proxy.patch
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-01-21 17:30:55 +0100
committerPetr Mladek <pmladek@suse.cz>2013-01-21 17:59:39 +0000
commit001d09af5aca0f8baf9fc142308d129d776cf92e (patch)
tree28a5a5d9067bcecbb3d0fbc281d03ba35d4b85e9 /curl/curl-7.26.0_win-proxy.patch
parent2883078230239b935e750e5f5b3ce7e174a4fabb (diff)
Tabs to spaces
Change-Id: Ib0d64c9d93f7ae73a160ad242a6731b781edaf0f Reviewed-on: https://gerrit.libreoffice.org/1799 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
Diffstat (limited to 'curl/curl-7.26.0_win-proxy.patch')
-rw-r--r--curl/curl-7.26.0_win-proxy.patch28
1 files changed, 14 insertions, 14 deletions
diff --git a/curl/curl-7.26.0_win-proxy.patch b/curl/curl-7.26.0_win-proxy.patch
index 766ef16d5228..cf6a2772e4c2 100644
--- a/curl/curl-7.26.0_win-proxy.patch
+++ b/curl/curl-7.26.0_win-proxy.patch
@@ -29,15 +29,15 @@
+#ifdef WIN32
+static char* wstrToCstr( LPWSTR wStr )
+{
-+ int bufSize;
-+ char* out = NULL;
-+ if ( wStr != NULL )
-+ {
-+ bufSize = WideCharToMultiByte( CP_ACP, 0, wStr, -1, NULL, 0, NULL, NULL );
-+ out = ( char* )malloc( bufSize * sizeof(char));
-+ WideCharToMultiByte( CP_ACP, 0, wStr, -1, out, bufSize, NULL, NULL );
-+ }
-+ return out;
++ int bufSize;
++ char* out = NULL;
++ if ( wStr != NULL )
++ {
++ bufSize = WideCharToMultiByte( CP_ACP, 0, wStr, -1, NULL, 0, NULL, NULL );
++ out = ( char* )malloc( bufSize * sizeof(char));
++ WideCharToMultiByte( CP_ACP, 0, wStr, -1, out, bufSize, NULL, NULL );
++ }
++ return out;
+}
+#endif
+
@@ -64,12 +64,12 @@
+ if(!ieProxyConfig->fAutoDetect) {
+ char *ieProxy;
+ char *ieNoProxy;
-+ char* pos;
++ char* pos;
+
+ ieProxy = wstrToCstr(ieProxyConfig->lpszProxy);
+ ieNoProxy = wstrToCstr(ieProxyConfig->lpszProxyBypass);
+
-+ /* Convert the ieNoProxy into a proper no_proxy value */
++ /* Convert the ieNoProxy into a proper no_proxy value */
+ no_proxy = strdup(ieNoProxy);
+ pos = strpbrk(no_proxy, "; ");
+ while (NULL != pos) {
@@ -102,10 +102,10 @@
+ else {
+ /* TODO Handle the Proxy config Auto Detection case */
+ }
-+
++
+ GlobalFree( ieProxyConfig->lpszAutoConfigUrl );
-+ GlobalFree( ieProxyConfig->lpszProxy );
-+ GlobalFree( ieProxyConfig->lpszProxyBypass );
++ GlobalFree( ieProxyConfig->lpszProxy );
++ GlobalFree( ieProxyConfig->lpszProxyBypass );
+ }
+#else /* !WIN32 */
char proxy_env[128];