diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-07 11:10:15 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-09 12:40:08 +0200 |
| commit | 73b377432c5efb8451f09f6d25d8aa1b28c239c9 (patch) | |
| tree | 54b158384a1312337a966ab7e2a9fe697163b75d /source3/libsmb/clilist.c | |
| parent | 8459391e31079066745a65c5f3c07f3899afdc0c (diff) | |
| download | samba-73b377432c5efb8451f09f6d25d8aa1b28c239c9.tar.gz samba-73b377432c5efb8451f09f6d25d8aa1b28c239c9.tar.bz2 samba-73b377432c5efb8451f09f6d25d8aa1b28c239c9.zip | |
s3-talloc Change TALLOC_REALLOC_ARRAY() to talloc_realloc()
Using the standard macro makes it easier to move code into common, as
TALLOC_REALLOC_ARRAY isn't standard talloc.
Andrew Bartlett
Diffstat (limited to 'source3/libsmb/clilist.c')
| -rw-r--r-- | source3/libsmb/clilist.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c index 49354e66bd..83cc81549a 100644 --- a/source3/libsmb/clilist.c +++ b/source3/libsmb/clilist.c @@ -387,7 +387,7 @@ static void cli_list_old_done(struct tevent_req *subreq) dirlist_len = talloc_get_size(state->dirlist); - tmp = TALLOC_REALLOC_ARRAY( + tmp = talloc_realloc( state, state->dirlist, uint8_t, dirlist_len + received * DIR_STRUCT_SIZE); if (tevent_req_nomem(tmp, req)) { @@ -654,7 +654,7 @@ static void cli_list_trans_done(struct tevent_req *subreq) old_num_finfo = talloc_array_length(state->finfo); - tmp = TALLOC_REALLOC_ARRAY(state, state->finfo, struct file_info, + tmp = talloc_realloc(state, state->finfo, struct file_info, old_num_finfo + ff_searchcount); if (tevent_req_nomem(tmp, req)) { return; @@ -711,7 +711,7 @@ static void cli_list_trans_done(struct tevent_req *subreq) /* * Shrink state->finfo to the real length we received */ - tmp = TALLOC_REALLOC_ARRAY(state, state->finfo, struct file_info, + tmp = talloc_realloc(state, state->finfo, struct file_info, old_num_finfo + i); if (tevent_req_nomem(tmp, req)) { return; @@ -736,7 +736,7 @@ static void cli_list_trans_done(struct tevent_req *subreq) nlen = 2*(strlen(state->mask) + 1); - param = TALLOC_REALLOC_ARRAY(state, state->param, uint8_t, + param = talloc_realloc(state, state->param, uint8_t, 12 + nlen + last_name_raw.length + 2); if (tevent_req_nomem(param, req)) { return; |