diff options
| author | Volker Lendecke <vlendec@samba.org> | 2006-07-30 16:36:56 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:38:25 -0500 |
| commit | e23781b3b304d1e69ad80af5ae9c0ed8d02cf996 (patch) | |
| tree | d3a6eb0774d9ce907152e886c4c920d24ac2d715 /source3/smbd/trans2.c | |
| parent | 5a5deade6e4634aad561139f39337c9a960c0b80 (diff) | |
| download | samba-e23781b3b304d1e69ad80af5ae9c0ed8d02cf996.tar.gz samba-e23781b3b304d1e69ad80af5ae9c0ed8d02cf996.tar.bz2 samba-e23781b3b304d1e69ad80af5ae9c0ed8d02cf996.zip | |
r17316: More C++ warnings -- 456 left
(This used to be commit 1e4ee728df7eeafc1b4d533240acb032f73b4f5c)
Diffstat (limited to 'source3/smbd/trans2.c')
| -rw-r--r-- | source3/smbd/trans2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 5acce13e52..8eb8790975 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -170,8 +170,8 @@ static struct ea_list *get_ea_list_from_file(TALLOC_CTX *mem_ctx, connection_str return NULL; } - for (i = 0, ea_namelist = TALLOC(mem_ctx, ea_namelist_size); i < 6; - ea_namelist = TALLOC_REALLOC_ARRAY(mem_ctx, ea_namelist, char, ea_namelist_size), i++) { + for (i = 0, ea_namelist = TALLOC_ARRAY(mem_ctx, char, ea_namelist_size); i < 6; + ea_namelist = TALLOC_REALLOC_ARRAY(mem_ctx, ea_namelist, char, ea_namelist_size), i++) { if (!ea_namelist) { return NULL; @@ -899,7 +899,7 @@ static int call_trans2open(connection_struct *conn, char *inbuf, char *outbuf, i } /* Realloc the size of parameters and data we will return */ - *pparams = SMB_REALLOC(*pparams, 30); + *pparams = (char *)SMB_REALLOC(*pparams, 30); if(*pparams == NULL ) { return ERROR_NT(NT_STATUS_NO_MEMORY); } |