diff options
| author | Volker Lendecke <vl@sernet.de> | 2007-12-01 11:43:12 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2007-12-01 10:43:35 -0800 |
| commit | bbf2cb6da994ac73dd7ea26d81f724aa04b5a3cb (patch) | |
| tree | 8a228483c88f6bde5451414a0bf966eeb3fc856c | |
| parent | 4a3ee48de5a4aa4bacb547fa39138d66af6719c2 (diff) | |
| download | samba-bbf2cb6da994ac73dd7ea26d81f724aa04b5a3cb.tar.gz samba-bbf2cb6da994ac73dd7ea26d81f724aa04b5a3cb.tar.bz2 samba-bbf2cb6da994ac73dd7ea26d81f724aa04b5a3cb.zip | |
Fix some C++ warnings
(This used to be commit 156c7f10bb63a610f85b52242cfd1b67bfa73c29)
| -rw-r--r-- | source3/libsmb/clifile.c | 2 | ||||
| -rw-r--r-- | source3/rpc_server/srv_eventlog_nt.c | 25 |
2 files changed, 11 insertions, 16 deletions
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c index e438b6d926..cd50cfc03c 100644 --- a/source3/libsmb/clifile.c +++ b/source3/libsmb/clifile.c @@ -1478,7 +1478,7 @@ int cli_ctemp(struct cli_state *cli, const char *path, char **tmp_path) if (len <= 0 || len > PATH_MAX) return -1; if (tmp_path) { - char *path2 = SMB_MALLOC(len+1); + char *path2 = SMB_MALLOC_ARRAY(char, len+1); if (!path2) { return -1; } diff --git a/source3/rpc_server/srv_eventlog_nt.c b/source3/rpc_server/srv_eventlog_nt.c index cd06be1984..3c9c835bad 100644 --- a/source3/rpc_server/srv_eventlog_nt.c +++ b/source3/rpc_server/srv_eventlog_nt.c @@ -355,18 +355,16 @@ static Eventlog_entry *get_eventlog_record(prs_struct *ps, into it's 2nd argment for 'B' */ if (wpcomputer) { - ee->data_record.computer_name = TALLOC_MEMDUP(ee, - wpcomputer, - ee->data_record.computer_name_len); + ee->data_record.computer_name = (smb_ucs2_t *)TALLOC_MEMDUP( + ee, wpcomputer, ee->data_record.computer_name_len); if (!ee->data_record.computer_name) { TALLOC_FREE(ee); goto out; } } if (wpsource) { - ee->data_record.source_name = TALLOC_MEMDUP(ee, - wpsource, - ee->data_record.source_name_len); + ee->data_record.source_name = (smb_ucs2_t *)TALLOC_MEMDUP( + ee, wpsource, ee->data_record.source_name_len); if (!ee->data_record.source_name) { TALLOC_FREE(ee); goto out; @@ -374,18 +372,16 @@ static Eventlog_entry *get_eventlog_record(prs_struct *ps, } if (wpsid) { - ee->data_record.sid = TALLOC_MEMDUP(ee, - wpsid, - ee->record.user_sid_length); + ee->data_record.sid = (smb_ucs2_t *)TALLOC_MEMDUP( + ee, wpsid, ee->record.user_sid_length); if (!ee->data_record.sid) { TALLOC_FREE(ee); goto out; } } if (wpstrs) { - ee->data_record.strings = TALLOC_MEMDUP(ee, - wpstrs, - ee->data_record.strings_len); + ee->data_record.strings = (smb_ucs2_t *)TALLOC_MEMDUP( + ee, wpstrs, ee->data_record.strings_len); if (!ee->data_record.strings) { TALLOC_FREE(ee); goto out; @@ -393,9 +389,8 @@ static Eventlog_entry *get_eventlog_record(prs_struct *ps, } if (puserdata) { - ee->data_record.user_data = TALLOC_MEMDUP(ee, - puserdata, - ee->data_record.user_data_len); + ee->data_record.user_data = (char *)TALLOC_MEMDUP( + ee, puserdata, ee->data_record.user_data_len); if (!ee->data_record.user_data) { TALLOC_FREE(ee); goto out; |