diff options
| author | Tim Prouty <tim.prouty@isilon.com> | 2008-03-03 13:32:54 -0800 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-04-11 11:33:33 +0200 |
| commit | bb869741ddc3d82da02c96bef592dab6074ff142 (patch) | |
| tree | 4b8d6ca57ebd747ff80d1ccf28212bb8f63e7b4d /source3/lib/util_reg.c | |
| parent | 245ebca937d1a98007ad8a85fbf7cdc812ba6316 (diff) | |
| download | samba-bb869741ddc3d82da02c96bef592dab6074ff142.tar.gz samba-bb869741ddc3d82da02c96bef592dab6074ff142.tar.bz2 samba-bb869741ddc3d82da02c96bef592dab6074ff142.zip | |
Cleanup size_t return values in convert_string_allocate
This patch is the first iteration of an inside-out conversion to cleanup
functions in charcnv.c returning size_t == -1 to indicate failure.
(This used to be commit 59124382d2894a1b194b48dd82bc5f956959eb48)
Diffstat (limited to 'source3/lib/util_reg.c')
| -rw-r--r-- | source3/lib/util_reg.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source3/lib/util_reg.c b/source3/lib/util_reg.c index 7366dcb2a7..7c0c42d7d8 100644 --- a/source3/lib/util_reg.c +++ b/source3/lib/util_reg.c @@ -93,10 +93,8 @@ WERROR reg_pull_multi_sz(TALLOC_CTX *mem_ctx, const void *buf, size_t len, size_t dstlen, thislen; thislen = strnlen_w(p, len) + 1; - dstlen = convert_string_allocate(*values, CH_UTF16LE, CH_UNIX, - p, thislen*2, (void *)&val, - true); - if (dstlen == (size_t)-1) { + if (!convert_string_allocate(*values, CH_UTF16LE, CH_UNIX, + p, thislen*2, (void *)&val, &dstlen, true)) { TALLOC_FREE(*values); return WERR_NOMEM; } |