diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-03-01 19:55:46 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-03-01 19:55:46 +0100 |
| commit | 94069bd2747a8397308c0b0b384f7bb4edd8f68b (patch) | |
| tree | ace3c4fa9d0cb134d4e904354bd33b395c1e1289 /source4/libcli/raw/rawfileinfo.c | |
| parent | bbe2d30f66ebd8537203870b1225179f03d42744 (diff) | |
| download | samba-94069bd2747a8397308c0b0b384f7bb4edd8f68b.tar.gz samba-94069bd2747a8397308c0b0b384f7bb4edd8f68b.tar.bz2 samba-94069bd2747a8397308c0b0b384f7bb4edd8f68b.zip | |
s4: Use same function signature for convert_* as s3.
Diffstat (limited to 'source4/libcli/raw/rawfileinfo.c')
| -rw-r--r-- | source4/libcli/raw/rawfileinfo.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/libcli/raw/rawfileinfo.c b/source4/libcli/raw/rawfileinfo.c index b8f4e5116c..09ecb40002 100644 --- a/source4/libcli/raw/rawfileinfo.c +++ b/source4/libcli/raw/rawfileinfo.c @@ -49,7 +49,7 @@ NTSTATUS smbcli_parse_stream_info(DATA_BLOB blob, TALLOC_CTX *mem_ctx, while (blob.length - ofs >= 24) { uint_t n = io->num_streams; uint32_t nlen, len; - ssize_t size; + bool ret; void *vstr; io->streams = talloc_realloc(mem_ctx, io->streams, struct stream_struct, n+1); @@ -62,10 +62,10 @@ NTSTATUS smbcli_parse_stream_info(DATA_BLOB blob, TALLOC_CTX *mem_ctx, if (nlen > blob.length - (ofs + 24)) { return NT_STATUS_INFO_LENGTH_MISMATCH; } - size = convert_string_talloc(io->streams, + ret = convert_string_talloc(io->streams, CH_UTF16, CH_UNIX, - blob.data+ofs+24, nlen, &vstr, false); - if (size == -1) { + blob.data+ofs+24, nlen, &vstr, NULL, false); + if (!ret) { return NT_STATUS_ILLEGAL_CHARACTER; } io->streams[n].stream_name.s = (const char *)vstr; |