Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1799
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/99/1799/1
Tabs to spaces
Change-Id: Ib0d64c9d93f7ae73a160ad242a6731b781edaf0f
---
M curl/curl-7.26.0_win-proxy.patch
1 file 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 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];
--
To view, visit https://gerrit.libreoffice.org/1799
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0d64c9d93f7ae73a160ad242a6731b781edaf0f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric <[email protected]>
Gerrit-Reviewer: Stephan Bergmann <[email protected]>
_______________________________________________
LibreOffice mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
