summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2010-11-01 15:53:43 +0100
committerMichael Adam <obnox@samba.org>2010-11-03 22:45:20 +0000
commit7a2b03964cdd12733e7ae812d463351b968d16ac (patch)
tree92113afdce46dd213e7d13359ea32ffd04624f9e
parent5829cb0a984b6f3ee2ef114a4d2ff85f1a5a592b (diff)
downloadsamba-7a2b03964cdd12733e7ae812d463351b968d16ac.tar.gz
samba-7a2b03964cdd12733e7ae812d463351b968d16ac.tar.bz2
samba-7a2b03964cdd12733e7ae812d463351b968d16ac.zip
lib/charset/charcnv: rename a parameter of next_codepoint_convenience_ext() for clarity
-rw-r--r--lib/util/charset/charcnv.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/util/charset/charcnv.c b/lib/util/charset/charcnv.c
index 25a54cca13..6cced15a52 100644
--- a/lib/util/charset/charcnv.c
+++ b/lib/util/charset/charcnv.c
@@ -391,7 +391,7 @@ _PUBLIC_ bool convert_string_talloc_convenience(TALLOC_CTX *ctx,
_PUBLIC_ codepoint_t next_codepoint_convenience_ext(
struct smb_iconv_convenience *ic,
const char *str, charset_t src_charset,
- size_t *size)
+ size_t *bytes_consumed)
{
/* it cannot occupy more than 4 bytes in UTF16 format */
uint8_t buf[4];
@@ -402,7 +402,7 @@ _PUBLIC_ codepoint_t next_codepoint_convenience_ext(
char *outbuf;
if ((str[0] & 0x80) == 0) {
- *size = 1;
+ *bytes_consumed = 1;
return (codepoint_t)str[0];
}
@@ -414,7 +414,7 @@ _PUBLIC_ codepoint_t next_codepoint_convenience_ext(
descriptor = get_conv_handle(ic, src_charset, CH_UTF16);
if (descriptor == (smb_iconv_t)-1) {
- *size = 1;
+ *bytes_consumed = 1;
return INVALID_CODEPOINT;
}
@@ -429,7 +429,7 @@ _PUBLIC_ codepoint_t next_codepoint_convenience_ext(
smb_iconv(descriptor, &str, &ilen, &outbuf, &olen);
if (olen == 4) {
/* we didn't convert any bytes */
- *size = 1;
+ *bytes_consumed = 1;
return INVALID_CODEPOINT;
}
olen = 4 - olen;
@@ -437,7 +437,7 @@ _PUBLIC_ codepoint_t next_codepoint_convenience_ext(
olen = 2 - olen;
}
- *size = ilen_orig - ilen;
+ *bytes_consumed = ilen_orig - ilen;
if (olen == 2) {
return (codepoint_t)SVAL(buf, 0);