summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-04-05 07:31:30 +0200
committerVolker Lendecke <vl@samba.org>2009-04-06 13:29:59 +0200
commit54c2fe65837bb35f1632af112eaccbbd916a6456 (patch)
treed285f8060208f2f3a8c0af1f8f8959daa0c68d88
parent2b1fe2c98f4e0013dee4cbae62dc36cdd4085c7d (diff)
downloadsamba-54c2fe65837bb35f1632af112eaccbbd916a6456.tar.gz
samba-54c2fe65837bb35f1632af112eaccbbd916a6456.tar.bz2
samba-54c2fe65837bb35f1632af112eaccbbd916a6456.zip
Fix two c++ warnings in vfs_gpfs.c
-rw-r--r--source3/modules/vfs_gpfs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index 3c061ece79..eaa186ce4f 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -341,7 +341,7 @@ static bool gpfsacl_process_smbacl(files_struct *fsp, SMB4ACL_T *smbacl)
gacl_len = sizeof(struct gpfs_acl) +
(smb_get_naces(smbacl)-1)*sizeof(gpfs_ace_v4_t);
- gacl = TALLOC_SIZE(mem_ctx, gacl_len);
+ gacl = (struct gpfs_acl *)TALLOC_SIZE(mem_ctx, gacl_len);
if (gacl == NULL) {
DEBUG(0, ("talloc failed\n"));
errno = ENOMEM;
@@ -600,7 +600,7 @@ static struct gpfs_acl *smb2gpfs_acl(const SMB_ACL_T pacl,
len = sizeof(struct gpfs_acl) - sizeof(union gpfs_ace_union) +
(pacl->count)*sizeof(gpfs_ace_v1_t);
- result = SMB_MALLOC(len);
+ result = (struct gpfs_acl *)SMB_MALLOC(len);
if (result == NULL) {
errno = ENOMEM;
return result;