diff options
| author | Tim Prouty <tim.prouty@isilon.com> | 2008-04-29 14:36:24 -0700 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-05-20 22:40:13 +0200 |
| commit | 6b189dabc562d86dcaa685419d0cb6ea276f100d (patch) | |
| tree | 4db914671846d04e2249b50e770932da31408e22 /source/libsmb/clirap.c | |
| parent | 80e700e3bd73f2ffa38046bdcba7f532e25198ef (diff) | |
| download | samba-6b189dabc562d86dcaa685419d0cb6ea276f100d.tar.gz samba-6b189dabc562d86dcaa685419d0cb6ea276f100d.tar.xz samba-6b189dabc562d86dcaa685419d0cb6ea276f100d.zip | |
Cleanup size_t return values in callers of convert_string_allocate
This patch is the second iteration of an inside-out conversion to cleanup
functions in charcnv.c returning size_t == -1 to indicate failure.
Diffstat (limited to 'source/libsmb/clirap.c')
| -rw-r--r-- | source/libsmb/clirap.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/libsmb/clirap.c b/source/libsmb/clirap.c index 8c167e1257d..cf4f4987cfb 100644 --- a/source/libsmb/clirap.c +++ b/source/libsmb/clirap.c @@ -904,14 +904,14 @@ bool cli_qpathinfo_streams(struct cli_state *cli, const char *fname, tmp_buf[nlen] = 0; tmp_buf[nlen+1] = 0; - size = convert_string_talloc(streams, CH_UTF16, CH_UNIX, - tmp_buf, nlen+2, &vstr, - false); - TALLOC_FREE(tmp_buf); - - if (size == -1) { + if (!convert_string_talloc(streams, CH_UTF16, CH_UNIX, tmp_buf, + nlen+2, &vstr, &size, false)) + { + TALLOC_FREE(tmp_buf); goto fail; } + + TALLOC_FREE(tmp_buf); streams[num_streams].name = (char *)vstr; num_streams++; |