diff options
| author | Jeremy Allison <jra@samba.org> | 2007-11-20 15:31:37 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2007-11-20 15:31:37 -0800 |
| commit | c049b8157d0bb4b5cd57b66740a26813be4f9eba (patch) | |
| tree | 6f686883427361d8e8420a3725f33b8e9f4fb74d /source3/lib | |
| parent | 61b37c73eeff8548c63df76e7d650c27746ca720 (diff) | |
| download | samba-c049b8157d0bb4b5cd57b66740a26813be4f9eba.tar.gz samba-c049b8157d0bb4b5cd57b66740a26813be4f9eba.tar.bz2 samba-c049b8157d0bb4b5cd57b66740a26813be4f9eba.zip | |
More trivial pstring removal.
Jeremy.
(This used to be commit bac3bb2f6e9e15b3a9a6a6511c484f8509918ca1)
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/charcnv.c | 2 | ||||
| -rw-r--r-- | source3/lib/util_unistr.c | 19 |
2 files changed, 20 insertions, 1 deletions
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c index da972f550f..0dfa88e87e 100644 --- a/source3/lib/charcnv.c +++ b/source3/lib/charcnv.c @@ -932,7 +932,7 @@ char *strdup_lower(const char *s) return out_buffer; } -static size_t ucs2_align(const void *base_ptr, const void *p, int flags) +size_t ucs2_align(const void *base_ptr, const void *p, int flags) { if (flags & (STR_NOALIGN|STR_ASCII)) return 0; diff --git a/source3/lib/util_unistr.c b/source3/lib/util_unistr.c index 1fef6ab239..45f09da85b 100644 --- a/source3/lib/util_unistr.c +++ b/source3/lib/util_unistr.c @@ -319,6 +319,25 @@ int rpcstr_pull(char* dest, void *src, int dest_len, int src_len, int flags) return pull_ucs2(NULL, dest, src, dest_len, src_len, flags|STR_UNICODE|STR_NOALIGN); } +/* Copy a string from little-endian or big-endian unicode source (depending + * on flags) to internal samba format destination. Allocates on talloc ctx. + */ + +int rpcstr_pull_talloc(TALLOC_CTX *ctx, + char **dest, + void *src, + int src_len, + int flags) +{ + return pull_ucs2_base_talloc(ctx, + NULL, + dest, + src, + src_len, + flags|STR_UNICODE|STR_NOALIGN); + +} + /* Copy a string from a unistr2 source to internal samba format destination. Use this instead of direct calls to rpcstr_pull() to avoid having to determine whether the source string is null terminated. */ |