loplugin:constantparam

Change-Id: I966dcf87be021520e7cc394338b9c0574bb8afee
Reviewed-on: https://gerrit.libreoffice.org/53541
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 7 insertions, 7 deletions

diff --git a/sal/rtl/alloc_arena.cxx b/sal/rtl/alloc_arena.cxx
index c6e6a9a2ae93..721df266f442 100644
--- a/sal/rtl/alloc_arena.cxx
+++ b/sal/rtl/alloc_arena.cxx
@@ -1002,7 +1002,7 @@ void rtl_arena_foreach (rtl_arena_type *arena, ArenaForeachFn foreachFn)
         {
             if (arena->m_qcache_ptr[i - 1] != nullptr)
                 rtl_cache_foreach (arena->m_qcache_ptr[i - 1],
-                                   foreachFn, nullptr);
+                                   foreachFn);
         }
     }
 
@@ -1013,7 +1013,7 @@ void rtl_arena_foreach (rtl_arena_type *arena, ArenaForeachFn foreachFn)
              segment != nullptr; segment = segment->m_fnext)
         {
             foreachFn(reinterpret_cast<void *>(segment->m_addr),
-                      segment->m_size, nullptr);
+                      segment->m_size);
         }
     }
 }
diff --git a/sal/rtl/alloc_arena.hxx b/sal/rtl/alloc_arena.hxx
index e3d3d0e292fc..30eac16840a6 100644
--- a/sal/rtl/alloc_arena.hxx
+++ b/sal/rtl/alloc_arena.hxx
@@ -112,10 +112,10 @@ struct rtl_arena_st
  */
 extern rtl_arena_type * gp_default_arena;
 
-typedef void (*ArenaForeachFn)(void *addr, sal_Size size, void *user_data);
+typedef void (*ArenaForeachFn)(void *addr, sal_Size size);
 
 void rtl_arena_foreach(rtl_arena_type *arena, ArenaForeachFn fn);
-void rtl_cache_foreach(rtl_cache_type *arena, ArenaForeachFn foreachFn, void *user_data);
+void rtl_cache_foreach(rtl_cache_type *arena, ArenaForeachFn foreachFn);
 
 #endif // INCLUDED_SAL_RTL_ALLOC_ARENA_HXX
 
diff --git a/sal/rtl/alloc_cache.cxx b/sal/rtl/alloc_cache.cxx
index 56357d25ac38..a24f8661cb8f 100644
--- a/sal/rtl/alloc_cache.cxx
+++ b/sal/rtl/alloc_cache.cxx
@@ -1153,7 +1153,7 @@ void SAL_CALL rtl_cache_free(
 }
 
 // FIXME: foreachFn called for free'd blocks and will break free-chains.
-void rtl_cache_foreach(rtl_cache_type *cache, ArenaForeachFn foreachFn, void *user_data)
+void rtl_cache_foreach(rtl_cache_type *cache, ArenaForeachFn foreachFn)
 {
     for (rtl_cache_slab_type *cur = &(cache->m_used_head);
          cur && cur->m_slab_next != &(cache->m_used_head);
@@ -1163,7 +1163,7 @@ void rtl_cache_foreach(rtl_cache_type *cache, ArenaForeachFn foreachFn, void *us
              item < reinterpret_cast<char *>(cur->m_bp);
              item += cache->m_type_size)
         {
-            foreachFn(item, cache->m_type_size, user_data);
+            foreachFn(item, cache->m_type_size);
         }
     }
 
diff --git a/sal/rtl/strimp.cxx b/sal/rtl/strimp.cxx
index 63466a0a88f0..c590fbcc4d52 100644
--- a/sal/rtl/strimp.cxx
+++ b/sal/rtl/strimp.cxx
@@ -87,7 +87,7 @@ static void pre_freeStringFn(void *data)
 }
 } // extern "C"
 
-static void mark_static(void *addr, sal_Size /* size */, void *)
+static void mark_static(void *addr, sal_Size /* size */)
 {
     char *inner = static_cast<char*>(addr) + 4;
     rtl_uString *str = reinterpret_cast<rtl_uString *>(inner);