[Libreoffice-commits] core.git: external/libcmis

[Thomas Arnhold]

 external/libcmis/UnpackedTarball_cmis.mk                         |    4 
 external/libcmis/libcmis-0.4.1-unreferenced-local-variable.patch |   96 ++++++++++
 2 files changed, 99 insertions(+), 1 deletion(-)

New commits:
commit 778056c509cbf065b19556ab9332d4dfba436d70
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Sun May 11 16:11:11 2014 +0200

    libcmis: WaE: warning C4101: 'e' : unreferenced local variable
    
    Change-Id: I37456029e766340450988f3d6c768bf2fd7aa973
    Reviewed-on: https://gerrit.libreoffice.org/9313
    Tested-by: LibreOffice gerrit bot <gerrit at libreoffice.org>
    Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
    Tested-by: Thomas Arnhold <thomas at arnhold.org>

diff --git a/external/libcmis/UnpackedTarball_cmis.mk b/external/libcmis/UnpackedTarball_cmis.mk
index 8744951..1ee253d 100644
--- a/external/libcmis/UnpackedTarball_cmis.mk
+++ b/external/libcmis/UnpackedTarball_cmis.mk
@@ -17,7 +17,9 @@ $(eval $(call gb_UnpackedTarball_add_patches,cmis, \
 						external/libcmis/libcmis-0.4.1.patch \
 						external/libcmis/libcmis-0.4.1-empty-path.patch \
 						external/libcmis/libcmis-0.4.1-properties-fix.patch \
-						external/libcmis/libcmis-libxml2_compatibility.patch))
+						external/libcmis/libcmis-libxml2_compatibility.patch \
+						external/libcmis/libcmis-0.4.1-unreferenced-local-variable.patch \
+))
 
 ifeq ($(OS)$(COM),WNTMSC)
 $(eval $(call gb_UnpackedTarball_add_patches,cmis,external/libcmis/boost-win.patch))
diff --git a/external/libcmis/libcmis-0.4.1-unreferenced-local-variable.patch b/external/libcmis/libcmis-0.4.1-unreferenced-local-variable.patch
new file mode 100644
index 0000000..453d1b7
--- /dev/null
+++ b/external/libcmis/libcmis-0.4.1-unreferenced-local-variable.patch
@@ -0,0 +1,96 @@
+--- src/libcmis/base-session.cxx
++++ src/libcmis/base-session.cxx
+@@ -281,7 +281,7 @@
+         httpRunRequest( url );
+         response->getData( )->finish( );
+     }
+-    catch ( const CurlException& e )
++    catch ( const CurlException& )
+     {
+         // If the access token is expired, we get 401 error,
+         // Need to use the refresh token to get a new one.
+@@ -351,7 +351,7 @@
+         httpRunRequest( url, headers );
+         response->getData( )->finish();
+     }
+-    catch ( const CurlException& e )
++    catch ( const CurlException& )
+     {
+         long status = getHttpStatus( );
+         /** If we had a HTTP 417 response, this is likely to be due to some 
+@@ -438,7 +438,7 @@
+         httpRunRequest( url, headers, redirect );
+         response->getData( )->finish();    
+     }
+-    catch ( const CurlException& e )
++    catch ( const CurlException& )
+     {
+         
+         long status = getHttpStatus( );
+@@ -495,7 +495,7 @@
+     {
+         httpRunRequest( url );
+     }
+-    catch ( const CurlException& e )
++    catch ( const CurlException& )
+     {
+         // If the access token is expired, we get 401 error,
+         // Need to use the refresh token to get a new one.
+--- src/libcmis/oauth2-handler.cxx
++++ src/libcmis/oauth2-handler.cxx
+@@ -104,7 +104,7 @@
+         resp = m_session->httpPostRequest ( m_data->getTokenUrl(), is, 
+                                         "application/x-www-form-urlencoded" );
+     }
+-    catch ( const CurlException& e )
++    catch ( const CurlException& )
+     {
+         throw libcmis::Exception(
+                 "Couldn't get tokens from the authorization code ");
+@@ -131,7 +131,7 @@
+         resp = m_session->httpPostRequest( m_data->getTokenUrl( ), is,
+                                            "application/x-www-form-urlencoded" );
+     }
+-    catch (const CurlException& e )
++    catch (const CurlException& )
+     {
+         throw libcmis::Exception( "Couldn't refresh token ");
+     }
+--- src/libcmis/oauth2-providers.cxx
++++ src/libcmis/oauth2-providers.cxx
+@@ -44,7 +44,7 @@
+     {
+         res = session->httpGetRequest( authUrl )->getStream( )->str( );
+     }
+-    catch ( const CurlException& e )
++    catch ( const CurlException& )
+     {
+         return string( );
+     }
+@@ -65,7 +65,7 @@
+         loginRes = session->httpPostRequest ( loginLink, loginIs, CONTENT_TYPE )
+                         ->getStream( )->str( );
+     }
+-    catch ( const CurlException& e )
++    catch ( const CurlException& )
+     {
+         return string( );
+     }
+@@ -105,7 +105,7 @@
+     {
+         res = session->httpGetRequest( authUrl )->getStream( )->str( );
+     }
+-    catch ( const CurlException& e )
++    catch ( const CurlException& )
+     {
+         return string( );
+     }
+@@ -131,7 +131,7 @@
+         // Alfresco code is in the redirect link
+         resp = session->httpPostRequest( loginLink, loginIs, CONTENT_TYPE, false ); 
+     }
+-    catch ( const CurlException& e )
++    catch ( const CurlException& )
+     {
+         return string( );
+     }