[Libreoffice-commits] .: sal/rtl

[Stephan Bergmann]

 sal/rtl/source/alloc_arena.c |    2 +-
 sal/rtl/source/alloc_cache.c |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 041b54fef20668abaab5bcc7b52dfc31695c25d2
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Oct 24 23:41:21 2011 +0200

    Avoid Clang -Wunused-value with trunk rev. 12226 Valgrind.

diff --git a/sal/rtl/source/alloc_arena.c b/sal/rtl/source/alloc_arena.c
index 5984f75..3936481 100644
--- a/sal/rtl/source/alloc_arena.c
+++ b/sal/rtl/source/alloc_arena.c
@@ -1100,7 +1100,7 @@ SAL_CALL rtl_arena_free (
 
                 /* DEBUG ONLY: mark unallocated, undefined */
                 VALGRIND_MEMPOOL_FREE(arena, segment->m_addr);
-                /* OSL_DEBUG_ONLY() */ VALGRIND_MAKE_MEM_UNDEFINED(segment->m_addr, segment->m_size);
+                /* OSL_DEBUG_ONLY() */ (void) VALGRIND_MAKE_MEM_UNDEFINED(segment->m_addr, segment->m_size);
                 OSL_DEBUG_ONLY(memset((void*)(segment->m_addr), 0x33333333, segment->m_size));
 
                 /* coalesce w/ adjacent free segment(s) */
diff --git a/sal/rtl/source/alloc_cache.c b/sal/rtl/source/alloc_cache.c
index 4fa16f4..e4cbc74 100644
--- a/sal/rtl/source/alloc_cache.c
+++ b/sal/rtl/source/alloc_cache.c
@@ -500,7 +500,7 @@ rtl_cache_slab_alloc (
             addr = bufctl;
 
         /* DEBUG ONLY: mark allocated, undefined */
-        /* OSL_DEBUG_ONLY() */ VALGRIND_MAKE_MEM_UNDEFINED(addr, cache->m_type_size);
+        /* OSL_DEBUG_ONLY() */ (void) VALGRIND_MAKE_MEM_UNDEFINED(addr, cache->m_type_size);
         OSL_DEBUG_ONLY(memset(addr, 0x77777777, cache->m_type_size));
         VALGRIND_MEMPOOL_ALLOC(cache, addr, cache->m_type_size);
     }
@@ -527,7 +527,7 @@ rtl_cache_slab_free (
 
     /* DEBUG ONLY: mark unallocated, undefined */
     VALGRIND_MEMPOOL_FREE(cache, addr);
-    /* OSL_DEBUG_ONLY() */ VALGRIND_MAKE_MEM_UNDEFINED(addr, cache->m_type_size);
+    /* OSL_DEBUG_ONLY() */ (void) VALGRIND_MAKE_MEM_UNDEFINED(addr, cache->m_type_size);
     OSL_DEBUG_ONLY(memset(addr, 0x33333333, cache->m_type_size));
 
     /* determine slab from addr */
@@ -641,7 +641,7 @@ rtl_cache_magazine_clear (
         if (cache->m_destructor != 0)
         {
             /* DEBUG ONLY: keep constructed object defined */
-            VALGRIND_MAKE_MEM_DEFINED(obj, cache->m_type_size);
+            (void) VALGRIND_MAKE_MEM_DEFINED(obj, cache->m_type_size);
 
             /* destruct object */
             (cache->m_destructor)(obj, cache->m_userarg);
@@ -1237,7 +1237,7 @@ SAL_CALL rtl_cache_alloc (
                 if (cache->m_constructor != 0)
                 {
                     /* keep constructed object defined */
-                    VALGRIND_MAKE_MEM_DEFINED(obj, cache->m_type_size);
+                    (void) VALGRIND_MAKE_MEM_DEFINED(obj, cache->m_type_size);
                 }
 #endif /* HAVE_VALGRIND_MEMCHECK_H */
                 cache->m_cpu_stats.m_alloc += 1;