This was just a 1:1 wrapper around pull_string_talloc()
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
- clistr_pull_talloc(mem_ctx,
- (const char *)outbuf.data,
- 0,
- &volume_name,
- outbuf.data + 18,
- nlen,
- STR_UNICODE);
+ pull_string_talloc(mem_ctx,
+ (const char *)outbuf.data,
+ 0,
+ &volume_name,
+ outbuf.data + 18,
+ nlen,
+ STR_UNICODE);
if (volume_name == NULL) {
status = map_nt_error_from_unix(errno);
goto fail;
if (volume_name == NULL) {
status = map_nt_error_from_unix(errno);
goto fail;
size_t srclen,
ssize_t *destlen)
{
size_t srclen,
ssize_t *destlen)
{
- *destlen = clistr_pull_talloc(mem_ctx,
- (const char *)hdr,
- SVAL(hdr, HDR_FLG2),
- dest,
- (char *)src,
- srclen,
- STR_TERMINATE);
+ *destlen = pull_string_talloc(mem_ctx,
+ (const char *)hdr,
+ SVAL(hdr, HDR_FLG2),
+ dest,
+ (char *)src,
+ srclen,
+ STR_TERMINATE);
if (*destlen == -1) {
return NT_STATUS_NO_MEMORY;
}
if (*destlen == -1) {
return NT_STATUS_NO_MEMORY;
}
inhdr = in + NBT_HDR_SIZE;
if (num_bytes) {
inhdr = in + NBT_HDR_SIZE;
if (num_bytes) {
- if (clistr_pull_talloc(cli,
- (const char *)inhdr,
- SVAL(inhdr, HDR_FLG2),
- &cli->dev,
- bytes,
- num_bytes,
- STR_TERMINATE|STR_ASCII) == -1) {
+ if (pull_string_talloc(cli,
+ (const char *)inhdr,
+ SVAL(inhdr, HDR_FLG2),
+ &cli->dev,
+ bytes,
+ num_bytes,
+ STR_TERMINATE|STR_ASCII) == -1) {
tevent_req_nterror(req, NT_STATUS_NO_MEMORY);
return;
}
tevent_req_nterror(req, NT_STATUS_NO_MEMORY);
return;
}
status = NT_STATUS_INVALID_NETWORK_RESPONSE;
goto out;
}
status = NT_STATUS_INVALID_NETWORK_RESPONSE;
goto out;
}
- clistr_pull_talloc(referrals,
+ pull_string_talloc(referrals,
(const char *)rdata,
recv_flags2,
&referrals[i].dfspath,
(const char *)rdata,
recv_flags2,
&referrals[i].dfspath,
}
state->changes[i].action = IVAL(params, ofs+4);
}
state->changes[i].action = IVAL(params, ofs+4);
- ret = clistr_pull_talloc(state->changes, (char *)params, flags2,
- &name, params+ofs+12, len,
+ ret = pull_string_talloc(state->changes,
+ (char *)params,
+ flags2,
+ &name,
+ params+ofs+12,
+ len,
STR_TERMINATE|STR_UNICODE);
if (ret == -1) {
TALLOC_FREE(params);
STR_TERMINATE|STR_UNICODE);
if (ret == -1) {
TALLOC_FREE(params);
return NT_STATUS_INVALID_NETWORK_RESPONSE;
}
return NT_STATUS_INVALID_NETWORK_RESPONSE;
}
- clistr_pull_talloc(mem_ctx,
+ pull_string_talloc(mem_ctx,
(const char *)rdata,
recv_flags2,
&volume_name,
(const char *)rdata,
recv_flags2,
&volume_name,
important to cope with the differences
between win2000 and win9x for this call
(tridge) */
important to cope with the differences
between win2000 and win9x for this call
(tridge) */
- ret = clistr_pull_talloc(ctx,
- base_ptr,
- recv_flags2,
- &finfo->name,
- p,
- len+2,
- STR_TERMINATE);
+ ret = pull_string_talloc(ctx,
+ base_ptr,
+ recv_flags2,
+ &finfo->name,
+ p,
+ len+2,
+ STR_TERMINATE);
if (ret == (size_t)-1) {
return pdata_end - base;
}
if (ret == (size_t)-1) {
return pdata_end - base;
}
if (p + len + 1 > pdata_end) {
return pdata_end - base;
}
if (p + len + 1 > pdata_end) {
return pdata_end - base;
}
- ret = clistr_pull_talloc(ctx,
- base_ptr,
- recv_flags2,
- &finfo->name,
- p,
- len,
- STR_NOALIGN);
+ ret = pull_string_talloc(ctx,
+ base_ptr,
+ recv_flags2,
+ &finfo->name,
+ p,
+ len,
+ STR_NOALIGN);
if (ret == (size_t)-1) {
return pdata_end - base;
}
if (ret == (size_t)-1) {
return pdata_end - base;
}
return pdata_end - base;
}
p += 2;
return pdata_end - base;
}
p += 2;
- ret = clistr_pull_talloc(ctx,
- base_ptr,
- recv_flags2,
- &finfo->short_name,
- p,
- slen,
- STR_UNICODE);
+ ret = pull_string_talloc(ctx,
+ base_ptr,
+ recv_flags2,
+ &finfo->short_name,
+ p,
+ slen,
+ STR_UNICODE);
if (ret == (size_t)-1) {
return pdata_end - base;
}
if (ret == (size_t)-1) {
return pdata_end - base;
}
if (p + namelen < p || p + namelen > pdata_end) {
return pdata_end - base;
}
if (p + namelen < p || p + namelen > pdata_end) {
return pdata_end - base;
}
- ret = clistr_pull_talloc(ctx,
- base_ptr,
- recv_flags2,
- &finfo->name,
- p,
- namelen,
- 0);
+ ret = pull_string_talloc(ctx,
+ base_ptr,
+ recv_flags2,
+ &finfo->name,
+ p,
+ namelen,
+ 0);
if (ret == (size_t)-1) {
return pdata_end - base;
}
if (ret == (size_t)-1) {
return pdata_end - base;
}
finfo->mtime_ts.tv_sec = finfo->atime_ts.tv_sec = finfo->ctime_ts.tv_sec;
finfo->mtime_ts.tv_nsec = finfo->atime_ts.tv_nsec = 0;
finfo->size = IVAL(p,26);
finfo->mtime_ts.tv_sec = finfo->atime_ts.tv_sec = finfo->ctime_ts.tv_sec;
finfo->mtime_ts.tv_nsec = finfo->atime_ts.tv_nsec = 0;
finfo->size = IVAL(p,26);
- ret = clistr_pull_talloc(ctx,
- NULL,
- 0,
- &finfo->name,
- p+30,
- 12,
- STR_ASCII);
+ ret = pull_string_talloc(ctx,
+ NULL,
+ 0,
+ &finfo->name,
+ p+30,
+ 12,
+ STR_ASCII);
if (ret == (size_t)-1) {
return false;
}
if (ret == (size_t)-1) {
return false;
}
return NT_STATUS_INVALID_NETWORK_RESPONSE;
}
return NT_STATUS_INVALID_NETWORK_RESPONSE;
}
- clistr_pull_talloc(mem_ctx,
+ pull_string_talloc(mem_ctx,
(const char *)rdata,
recv_flags2,
&name,
(const char *)rdata,
recv_flags2,
&name,
#include "includes.h"
#include "libsmb/proto.h"
#include "includes.h"
#include "libsmb/proto.h"
-size_t clistr_pull_talloc(TALLOC_CTX *ctx,
- const char *base,
- uint16_t flags2,
- char **pp_dest,
- const void *src,
- int src_len,
- int flags)
-{
- return pull_string_talloc(ctx,
- base,
- flags2,
- pp_dest,
- src,
- src_len,
- flags);
-}
-
bool clistr_is_previous_version_path(const char *path,
const char **startp,
const char **endp,
bool clistr_is_previous_version_path(const char *path,
const char **startp,
const char **endp,
/* The following definitions come from libsmb/clistr.c */
/* The following definitions come from libsmb/clistr.c */
-size_t clistr_pull_talloc(TALLOC_CTX *ctx,
- const char *base,
- uint16_t flags2,
- char **pp_dest,
- const void *src,
- int src_len,
- int flags);
bool clistr_is_previous_version_path(const char *path,
const char **startp,
const char **endp,
bool clistr_is_previous_version_path(const char *path,
const char **startp,
const char **endp,