git.samba.org
/
kai
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2b1fe2c
)
Fix two c++ warnings in vfs_gpfs.c
author
Volker Lendecke
<vl@samba.org>
Sun, 5 Apr 2009 05:31:30 +0000
(07:31 +0200)
committer
Volker Lendecke
<vl@samba.org>
Mon, 6 Apr 2009 11:29:59 +0000
(13:29 +0200)
source3/modules/vfs_gpfs.c
patch
|
blob
|
history
diff --git
a/source3/modules/vfs_gpfs.c
b/source3/modules/vfs_gpfs.c
index 3c061ece79ce965aeba93ce3c141c2d00f822f25..eaa186ce4f723e68c677d9d57c379591a269598c 100644
(file)
--- 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_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;
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);
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;
if (result == NULL) {
errno = ENOMEM;
return result;