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.
(This used to be commit 6b189dabc562d86dcaa685419d0cb6ea276f100d)

1 files changed, 3 insertions, 2 deletions

diff --git a/source3/modules/vfs_catia.c b/source3/modules/vfs_catia.c
index 8b56be6cea..7ffb310975 100644
--- a/source3/modules/vfs_catia.c
+++ b/source3/modules/vfs_catia.c
@@ -36,12 +36,13 @@ static char *catia_string_replace(TALLOC_CTX *ctx,
 	smb_ucs2_t *ptr = NULL;
 	smb_ucs2_t old = oldc;
 	char *ret = NULL;
+	size_t converted_size;
 
 	if (!s) {
 		return NULL;
 	}
 
-	if (push_ucs2_talloc(ctx, &tmpbuf, s) == -1) {
+	if (!push_ucs2_talloc(ctx, &tmpbuf, s, &converted_size)) {
 		return NULL;
 	}
 
@@ -53,7 +54,7 @@ static char *catia_string_replace(TALLOC_CTX *ctx,
 		}
 	}
 
-	if (pull_ucs2_talloc(ctx, &ret, tmpbuf) == -1) {
+	if (!pull_ucs2_talloc(ctx, &ret, tmpbuf, &converted_size)) {
 		TALLOC_FREE(tmpbuf);
 		return NULL;
 	}