[Libreoffice-commits] .: Branch 'libreoffice-4-0' - curl/curl-7.26.0_win-proxy.patch

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Jan 21 09:59:58 PST 2013


 curl/curl-7.26.0_win-proxy.patch |   28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 001d09af5aca0f8baf9fc142308d129d776cf92e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jan 21 17:30:55 2013 +0100

    Tabs to spaces
    
    Change-Id: Ib0d64c9d93f7ae73a160ad242a6731b781edaf0f
    Reviewed-on: https://gerrit.libreoffice.org/1799
    Reviewed-by: Petr Mladek <pmladek at suse.cz>
    Tested-by: Petr Mladek <pmladek at suse.cz>

diff --git a/curl/curl-7.26.0_win-proxy.patch b/curl/curl-7.26.0_win-proxy.patch
index 766ef16..cf6a277 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];


More information about the Libreoffice-commits mailing list