From b13ee9447f75f63a9504ddeeded468fde712d734 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Wed, 26 Nov 2008 23:19:28 +0000 Subject: [PATCH] Make pm_memcpy prototype agree with definition git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8093 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/lib/mem_pool.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bacula/src/lib/mem_pool.c b/bacula/src/lib/mem_pool.c index 7e041c9a68..5c406bc80e 100644 --- a/bacula/src/lib/mem_pool.c +++ b/bacula/src/lib/mem_pool.c @@ -545,14 +545,14 @@ int pm_strcpy(POOL_MEM &pm, const char *str) * Copy data into a pool memory buffer pm * Returns: length of data copied */ -int pm_memcpy(POOLMEM **pm, const void *data, int32_t n) +int pm_memcpy(POOLMEM **pm, const char *data, int32_t n) { *pm = check_pool_memory_size(*pm, n); memcpy(*pm, data, n); return n; } -int pm_memcpy(POOLMEM *&pm, const void *data, int32_t n) +int pm_memcpy(POOLMEM *&pm, const char *data, int32_t n) { pm = check_pool_memory_size(pm, n); memcpy(pm, data, n); @@ -566,7 +566,7 @@ int pm_memcpy(POOLMEM *&pm, POOL_MEM &data, int32_t n) return n; } -int pm_memcpy(POOL_MEM &pm, const void *data, int32_t n) +int pm_memcpy(POOL_MEM &pm, const char *data, int32_t n) { pm.check_size(n); memcpy(pm.c_str(), data, n); -- 2.39.5