Remove iconv_convenience argument from convert_string{,talloc}() but

make them wrappers around convert_string{,talloc}_convenience().

1 files changed, 10 insertions, 10 deletions

diff --git a/source4/librpc/ndr/ndr_string.c b/source4/librpc/ndr/ndr_string.c
index a143284f17..265fa68b48 100644
--- a/source4/librpc/ndr/ndr_string.c
+++ b/source4/librpc/ndr/ndr_string.c
@@ -81,7 +81,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_string(struct ndr_pull *ndr, int ndr_flags,
 		if (len2 == 0) {
 			as = talloc_strdup(ndr->current_mem_ctx, "");
 		} else {
-			ret = convert_string_talloc(ndr->current_mem_ctx,
+			ret = convert_string_talloc_convenience(ndr->current_mem_ctx,
 						    ndr->iconv_convenience, chset, CH_UNIX, 
 						    ndr->data+ndr->offset, 
 						    (len2 + c_len_term)*byte_mul,
@@ -118,7 +118,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_string(struct ndr_pull *ndr, int ndr_flags,
 		if (len1 == 0) {
 			as = talloc_strdup(ndr->current_mem_ctx, "");
 		} else {
-			ret = convert_string_talloc(ndr->current_mem_ctx,
+			ret = convert_string_talloc_convenience(ndr->current_mem_ctx,
 						    ndr->iconv_convenience, 
 						    chset, CH_UNIX, 
 						    ndr->data+ndr->offset, 
@@ -157,7 +157,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_string(struct ndr_pull *ndr, int ndr_flags,
 		if (len1 == 0) {
 			as = talloc_strdup(ndr->current_mem_ctx, "");
 		} else {
-			ret = convert_string_talloc(ndr->current_mem_ctx,
+			ret = convert_string_talloc_convenience(ndr->current_mem_ctx,
 						    ndr->iconv_convenience, 
 						    chset, CH_UNIX, 
 						    ndr->data+ndr->offset, 
@@ -192,7 +192,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_string(struct ndr_pull *ndr, int ndr_flags,
 		if (len3 == 0) {
 			as = talloc_strdup(ndr->current_mem_ctx, "");
 		} else {
-			ret = convert_string_talloc(ndr->current_mem_ctx,
+			ret = convert_string_talloc_convenience(ndr->current_mem_ctx,
 						    ndr->iconv_convenience,
 						    chset, CH_UNIX, 
 						    ndr->data+ndr->offset, 
@@ -225,7 +225,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_string(struct ndr_pull *ndr, int ndr_flags,
 		if (len3 == 0) {
 			as = talloc_strdup(ndr->current_mem_ctx, "");
 		} else {
-			ret = convert_string_talloc(ndr->current_mem_ctx,
+			ret = convert_string_talloc_convenience(ndr->current_mem_ctx,
 						    ndr->iconv_convenience, 
 						    chset, CH_UNIX, 
 						    ndr->data+ndr->offset, 
@@ -246,7 +246,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_string(struct ndr_pull *ndr, int ndr_flags,
 		} else {
 			len1 = utf16_len_n(ndr->data+ndr->offset, ndr->data_size - ndr->offset);
 		}
-		ret = convert_string_talloc(ndr->current_mem_ctx,
+		ret = convert_string_talloc_convenience(ndr->current_mem_ctx,
 					    ndr->iconv_convenience, chset, CH_UNIX, 
 					    ndr->data+ndr->offset, 
 					    len1,
@@ -271,7 +271,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_string(struct ndr_pull *ndr, int ndr_flags,
 		if (len1 == 0) {
 			as = talloc_strdup(ndr->current_mem_ctx, "");
 		} else {
-			ret = convert_string_talloc(ndr->current_mem_ctx,
+			ret = convert_string_talloc_convenience(ndr->current_mem_ctx,
 						    ndr->iconv_convenience,
 						    chset, CH_UNIX, 
 						    ndr->data+ndr->offset, 
@@ -334,7 +334,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_string(struct ndr_push *ndr, int ndr_flags,
 	if (!(flags & LIBNDR_FLAG_STR_NOTERM)) {
 		s_len++;
 	}
-	d_len = convert_string_talloc(ndr, ndr->iconv_convenience, CH_UNIX, chset, s, s_len, (void **)&dest);
+	d_len = convert_string_talloc_convenience(ndr, ndr->iconv_convenience, CH_UNIX, chset, s, s_len, (void **)&dest);
 	if (d_len == -1) {
 		return ndr_push_error(ndr, NDR_ERR_CHARCNV, 
 				      "Bad character conversion");
@@ -645,7 +645,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_charset(struct ndr_pull *ndr, int ndr_flags,
 
 	NDR_PULL_NEED_BYTES(ndr, length*byte_mul);
 
-	ret = convert_string_talloc(ndr->current_mem_ctx, 
+	ret = convert_string_talloc_convenience(ndr->current_mem_ctx, 
 				    ndr->iconv_convenience,
 				    chset, CH_UNIX, 
 				    ndr->data+ndr->offset, 
@@ -671,7 +671,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_charset(struct ndr_push *ndr, int ndr_flags,
 	required = byte_mul * length;
 	
 	NDR_PUSH_NEED_BYTES(ndr, required);
-	ret = convert_string(ndr->iconv_convenience, CH_UNIX, chset, 
+	ret = convert_string_convenience(ndr->iconv_convenience, CH_UNIX, chset, 
 			     var, strlen(var),
 			     ndr->data+ndr->offset, required);
 	if (ret == -1) {