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/printing | |
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/printing')
-rw-r--r-- | source/printing/nt_printing.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/printing/nt_printing.c b/source/printing/nt_printing.c index a66b1e5c5f6..3a7f1174bd9 100644 --- a/source/printing/nt_printing.c +++ b/source/printing/nt_printing.c @@ -3242,6 +3242,7 @@ static WERROR nt_printer_publish_ads(ADS_STRUCT *ads, const char *attrs[] = {"objectGUID", NULL}; struct GUID guid; WERROR win_rc = WERR_OK; + size_t converted_size; DEBUG(5, ("publishing printer %s\n", printer->info_2->printername)); @@ -3264,13 +3265,13 @@ static WERROR nt_printer_publish_ads(ADS_STRUCT *ads, return WERR_SERVER_UNAVAILABLE; } /* Now convert to CH_UNIX. */ - if (pull_utf8_allocate(&srv_dn, srv_dn_utf8) == (size_t)-1) { + if (!pull_utf8_allocate(&srv_dn, srv_dn_utf8, &converted_size)) { ldap_memfree(srv_dn_utf8); ldap_memfree(srv_cn_utf8); ads_destroy(&ads); return WERR_SERVER_UNAVAILABLE; } - if (pull_utf8_allocate(&srv_cn_0, srv_cn_utf8[0]) == (size_t)-1) { + if (!pull_utf8_allocate(&srv_cn_0, srv_cn_utf8[0], &converted_size)) { ldap_memfree(srv_dn_utf8); ldap_memfree(srv_cn_utf8); ads_destroy(&ads); |