summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-04-20 10:20:00 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-04-20 13:39:08 +0200
commit56775815a39c2ee4a0f711738947d2fb234c4923 (patch)
treee11780c6736e32518950102ceb73103fabaeb576 /sal
parentfe851316be45b891468fdab4d8b8f23fdf869e5e (diff)
loplugin:constantparam
Change-Id: Ia58d8950b3b9e48bbe9f075b9fe1eed62d9abf0d Reviewed-on: https://gerrit.libreoffice.org/53188 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sal')
-rw-r--r--sal/rtl/alloc_arena.cxx6
-rw-r--r--sal/rtl/alloc_arena.hxx2
-rw-r--r--sal/rtl/strimp.cxx2
3 files changed, 5 insertions, 5 deletions
diff --git a/sal/rtl/alloc_arena.cxx b/sal/rtl/alloc_arena.cxx
index 0ea1a39167ea..c6e6a9a2ae93 100644
--- a/sal/rtl/alloc_arena.cxx
+++ b/sal/rtl/alloc_arena.cxx
@@ -992,7 +992,7 @@ void SAL_CALL rtl_arena_free (
}
}
-void rtl_arena_foreach (rtl_arena_type *arena, ArenaForeachFn foreachFn, void *user_data)
+void rtl_arena_foreach (rtl_arena_type *arena, ArenaForeachFn foreachFn)
{
// quantum caches
if ((arena->m_qcache_max > 0) && (arena->m_qcache_ptr != nullptr))
@@ -1002,7 +1002,7 @@ void rtl_arena_foreach (rtl_arena_type *arena, ArenaForeachFn foreachFn, void *u
{
if (arena->m_qcache_ptr[i - 1] != nullptr)
rtl_cache_foreach (arena->m_qcache_ptr[i - 1],
- foreachFn, user_data);
+ foreachFn, nullptr);
}
}
@@ -1013,7 +1013,7 @@ void rtl_arena_foreach (rtl_arena_type *arena, ArenaForeachFn foreachFn, void *u
segment != nullptr; segment = segment->m_fnext)
{
foreachFn(reinterpret_cast<void *>(segment->m_addr),
- segment->m_size, user_data);
+ segment->m_size, nullptr);
}
}
}
diff --git a/sal/rtl/alloc_arena.hxx b/sal/rtl/alloc_arena.hxx
index 3c04173b4ab0..e3d3d0e292fc 100644
--- a/sal/rtl/alloc_arena.hxx
+++ b/sal/rtl/alloc_arena.hxx
@@ -114,7 +114,7 @@ extern rtl_arena_type * gp_default_arena;
typedef void (*ArenaForeachFn)(void *addr, sal_Size size, void *user_data);
-void rtl_arena_foreach(rtl_arena_type *arena, ArenaForeachFn fn, void *user_data);
+void rtl_arena_foreach(rtl_arena_type *arena, ArenaForeachFn fn);
void rtl_cache_foreach(rtl_cache_type *arena, ArenaForeachFn foreachFn, void *user_data);
#endif // INCLUDED_SAL_RTL_ALLOC_ARENA_HXX
diff --git a/sal/rtl/strimp.cxx b/sal/rtl/strimp.cxx
index e760de186417..63466a0a88f0 100644
--- a/sal/rtl/strimp.cxx
+++ b/sal/rtl/strimp.cxx
@@ -114,7 +114,7 @@ void SAL_CALL rtl_alloc_preInit (rtl_alloc_preInit_phase_t phase) SAL_THROW_EXTE
case rtlAllocPreInitEnd:
// back to normal
{
- rtl_arena_foreach(pre_arena, mark_static, nullptr);
+ rtl_arena_foreach(pre_arena, mark_static);
rtl_allocateString = rtl_allocateMemory;
rtl_freeString = rtl_freeMemory;