Merge branch 'master' into basejobv3

[bacula/bacula] / bacula / src / filed / xattr.c

diff --git a/bacula/src/filed/xattr.c b/bacula/src/filed/xattr.c
index f66b829958487402521d1f999c2ad0f5ff1a2b97..c444d62093acbc9348067dcfbbd2b55aa0a22f21 100644 (file)
--- a/bacula/src/filed/xattr.c
+++ b/bacula/src/filed/xattr.c
@@ -663,7 +663,7 @@ static int toplevel_hidden_dir_xattr_data_len;
  */
 static alist *xattr_link_cache = NULL;
 
-static xattr_link_cache_entry *find_xattr_link_cache_entry(ino_t inum)
+static xattr_link_cache_entry_t *find_xattr_link_cache_entry(ino_t inum)
 {
    xattr_link_cache_entry_t *ptr;
 
@@ -679,8 +679,8 @@ static void add_xattr_link_cache_entry(ino_t inum, char *target)
 {
    xattr_link_cache_entry_t *ptr;
 
-   ptr = (xattr_link_cache_entry_t *)malloc(sizeof(xattr_link_cache_entry));
-   memset((caddr_t)ptr, 0, sizeof(xattr_link_cache_entry));
+   ptr = (xattr_link_cache_entry_t *)malloc(sizeof(xattr_link_cache_entry_t));
+   memset((caddr_t)ptr, 0, sizeof(xattr_link_cache_entry_t));
    ptr->inum = inum;
    bstrncpy(ptr->target, target, sizeof(ptr->target));
    xattr_link_cache->append(ptr);
@@ -916,7 +916,7 @@ static bxattr_exit_code solaris_save_xattr(JCR *jcr, int fd, const char *xattr_n
    int cnt;
    int attrfd = -1;
    struct stat st;
-   xattr_link_cache_entry *xlce;
+   xattr_link_cache_entry_t *xlce;
    char target_attrname[PATH_MAX];
    char link_source[PATH_MAX];
    char *acl_text = NULL;
@@ -1868,7 +1868,7 @@ bxattr_exit_code build_xattr_streams(JCR *jcr, FF_PKT *ff_pkt)
 
 bxattr_exit_code parse_xattr_streams(JCR *jcr, int stream)
 {
-   int cnt;
+   unsigned int cnt;
 
    if (os_parse_xattr_streams) {
       /*