[Libreoffice-commits] .: 2 commits - idl/source ucb/source

[Caolán McNamara]

 idl/source/cmptools/hash.cxx                  |    2 +-
 ucb/source/ucp/webdav/NeonPropFindRequest.cxx |   18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

New commits:
commit 177e8bb078617aeb799cf28b20157f245baa0c78
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 9 20:32:23 2010 +0000

    Resolves: rhbz#668109 ne_simple_propfind can touch gcrypt as well

diff --git a/ucb/source/ucp/webdav/NeonPropFindRequest.cxx b/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
index a1ddfb2..17d42cc 100644
--- a/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
+++ b/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
@@ -260,6 +260,8 @@ extern "C" void NPFR_propnames_results( void* userdata,
     theResources->push_back( theResource );
 }
 
+extern osl::Mutex aGlobalNeonMutex;
+
 // -------------------------------------------------------------------
 // Constructor
 // -------------------------------------------------------------------
@@ -287,12 +289,15 @@ NeonPropFindRequest::NeonPropFindRequest( HttpSession* inSession,
         thePropNames[ theIndex ].nspace = NULL;
         thePropNames[ theIndex ].name   = NULL;
 
-        nError = ne_simple_propfind( inSession,
-                                     inPath,
-                                     inDepth,
-                                     thePropNames,
-                                     NPFR_propfind_results,
-                                     &ioResources );
+        {
+            osl::Guard< osl::Mutex > theGlobalGuard( aGlobalNeonMutex );
+            nError = ne_simple_propfind( inSession,
+                                         inPath,
+                                         inDepth,
+                                         thePropNames,
+                                         NPFR_propfind_results,
+                                         &ioResources );
+        }
 
         for ( theIndex = 0; theIndex < thePropCount; theIndex ++ )
             free( (void *)thePropNames[ theIndex ].name );
@@ -302,6 +307,7 @@ NeonPropFindRequest::NeonPropFindRequest( HttpSession* inSession,
     else
     {
         // ALLPROP
+        osl::Guard< osl::Mutex > theGlobalGuard( aGlobalNeonMutex );
         nError = ne_simple_propfind( inSession,
                                      inPath,
                                      inDepth,
commit 807bcb2e2657006c1d90e96bf6f6a8f0cb8906e9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 9 17:19:14 2010 +0000

    cppcheck: unused variables

diff --git a/idl/source/cmptools/hash.cxx b/idl/source/cmptools/hash.cxx
index ef71d5a..325050a 100644
--- a/idl/source/cmptools/hash.cxx
+++ b/idl/source/cmptools/hash.cxx
@@ -168,11 +168,11 @@ SvStringHashTable::SvStringHashTable( UINT32 nMaxEntries )
 *************************************************************************/
 SvStringHashTable::~SvStringHashTable()
 {
+#ifdef DBG_UTIL
     // RefCount auf eins setzen
     SvStringHashEntry * pPos, *pEnd;
     pPos    = pEntries;
     pEnd    = pEntries + GetMax();
-#ifdef DBG_UTIL
     while( pPos != pEnd )
     {
         DBG_ASSERT( pPos->GetRefCount() == 1, "Reference count != 1" );