diff options
| author | Volker Lendecke <vlendec@samba.org> | 2006-07-31 04:30:55 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:38:26 -0500 |
| commit | 1cf1e648feed823244731eef5f56bd34e15cb045 (patch) | |
| tree | 63f7d989ccf7c05004f3fe7793f3c77d2053c20b /source3/lib/sysacls.c | |
| parent | 02eea79624c85fb5ce6c3ffefe2d27e40c5ff97f (diff) | |
| download | samba-1cf1e648feed823244731eef5f56bd34e15cb045.tar.gz samba-1cf1e648feed823244731eef5f56bd34e15cb045.tar.bz2 samba-1cf1e648feed823244731eef5f56bd34e15cb045.zip | |
r17334: Some C++ warnings
(This used to be commit 8ae7ed1f3cecbb5285313d17b5f9511e2e622f0b)
Diffstat (limited to 'source3/lib/sysacls.c')
| -rw-r--r-- | source3/lib/sysacls.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/lib/sysacls.c b/source3/lib/sysacls.c index e8c33c2c95..eba5fc44b6 100644 --- a/source3/lib/sysacls.c +++ b/source3/lib/sysacls.c @@ -141,7 +141,7 @@ char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p) */ len = 0; maxlen = 20 * acl_d->count; - if ((text = SMB_MALLOC(maxlen)) == NULL) { + if ((text = (char *)SMB_MALLOC(maxlen)) == NULL) { errno = ENOMEM; return NULL; } @@ -212,7 +212,7 @@ char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p) */ if ((len + nbytes) > maxlen) { maxlen += nbytes + 20 * (acl_d->count - i); - if ((text = SMB_REALLOC(text, maxlen)) == NULL) { + if ((text = (char *)SMB_REALLOC(text, maxlen)) == NULL) { errno = ENOMEM; return NULL; } @@ -243,8 +243,9 @@ SMB_ACL_T sys_acl_init(int count) * acl[] array, this actually allocates an ACL with room * for (count+1) entries */ - if ((a = SMB_MALLOC(sizeof(struct smb_acl_t) + - count * sizeof(struct smb_acl_entry))) == NULL) { + if ((a = (struct smb_acl_t *)SMB_MALLOC( + sizeof(struct smb_acl_t) + + count * sizeof(struct smb_acl_entry))) == NULL) { errno = ENOMEM; return NULL; } |