Update

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8090 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/filed/xattr.c b/bacula/src/filed/xattr.c
index acbf968d1b42935ac678103be5d4592a95cef95f..d8b51503bd04e63d38d84811253c92769ddd97e2 100644 (file)
--- a/bacula/src/filed/xattr.c
+++ b/bacula/src/filed/xattr.c
@@ -202,7 +202,7 @@ static uint32_t serialize_xattr_stream(JCR *jcr, uint32_t expected_serialize_len
 static bool generic_xattr_build_streams(JCR *jcr, FF_PKT *ff_pkt, int stream)
 {
    int count = 0;
-   ssize_t xattr_list_len,
+   int32_t xattr_list_len,
            xattr_value_len,
            expected_serialize_len = 0,
            serialize_len = 0;

diff --git a/bacula/src/lib/mem_pool.c b/bacula/src/lib/mem_pool.c
index e36f63df6a4b9c6e70b5043b3e5017bf2a5fb767..7e041c9a68c31dcf2c3d3d7aad1f7516bc636ec5 100644 (file)
--- a/bacula/src/lib/mem_pool.c
+++ b/bacula/src/lib/mem_pool.c
@@ -545,28 +545,28 @@ 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, size_t n)
+int pm_memcpy(POOLMEM **pm, const void *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, size_t n)
+int pm_memcpy(POOLMEM *&pm, const void *data, int32_t n)
 {
    pm = check_pool_memory_size(pm, n);
    memcpy(pm, data, n);
    return n;
 }
 
-int pm_memcpy(POOLMEM *&pm, POOL_MEM &data, size_t n)
+int pm_memcpy(POOLMEM *&pm, POOL_MEM &data, int32_t n)
 {
    pm = check_pool_memory_size(pm, n);
    memcpy(pm, data.c_str(), n);
    return n;
 }
 
-int pm_memcpy(POOL_MEM &pm, const void *data, size_t n)
+int pm_memcpy(POOL_MEM &pm, const void *data, int32_t n)
 {
    pm.check_size(n);
    memcpy(pm.c_str(), data, n);

diff --git a/bacula/src/lib/mem_pool.h b/bacula/src/lib/mem_pool.h
index 942e3cd45bff428e090c8e78586ada2d025d0042..bd39d7500967c2b1e43ebbea914a10486ada2a1a 100644 (file)
--- a/bacula/src/lib/mem_pool.h
+++ b/bacula/src/lib/mem_pool.h
@@ -113,9 +113,9 @@ int pm_strcpy(POOLMEM *&pm, const char *str);
 int pm_strcpy(POOL_MEM &pm, const char *str);
 int pm_strcpy(POOLMEM *&pm, POOL_MEM &str);
 
-int pm_memcpy(POOLMEM **pm, const char *data, size_t n);
-int pm_memcpy(POOLMEM *&pm, const char *data, size_t n);
-int pm_memcpy(POOL_MEM &pm, const char *data, size_t n);
-int pm_memcpy(POOLMEM *&pm, POOL_MEM &data, size_t n);
+int pm_memcpy(POOLMEM **pm, const char *data, int32_t n);
+int pm_memcpy(POOLMEM *&pm, const char *data, int32_t n);
+int pm_memcpy(POOL_MEM &pm, const char *data, int32_t n);
+int pm_memcpy(POOLMEM *&pm, POOL_MEM &data, int32_t n);
 
 #endif