aboutsummaryrefslogtreecommitdiff
path: root/iconv/iconv.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-06-10 22:54:47 +0000
committerUlrich Drepper <drepper@redhat.com>2000-06-10 22:54:47 +0000
commit38677aced0c16cd290b8250e07c174ae8c5c7292 (patch)
tree0fe9e77d9da392e83d794922bc015f33aada39b8 /iconv/iconv.c
parente52211654153ff16d8f1140195e46ac8da847b33 (diff)
downloadglibc-38677aced0c16cd290b8250e07c174ae8c5c7292.tar
glibc-38677aced0c16cd290b8250e07c174ae8c5c7292.tar.gz
glibc-38677aced0c16cd290b8250e07c174ae8c5c7292.tar.bz2
glibc-38677aced0c16cd290b8250e07c174ae8c5c7292.zip
Update.
* iconv/skeleton.c: Rename converted written to correcter name irreversible. * iconv/gconv.c: Rename converted variable to correcter name irreversible. * iconv/gconv_int.h: Likewise. * iconv/gconv_simple.c: Likewise. * iconv/iconv.c: Likewise. * iconv/loop.c: Likewise. * iconvdata/8bit-gap.c: Likewise. * iconvdata/8bit-generic.c: Likewise. * iconvdata/ansi_x3.110.c: Likewise. * iconvdata/big5.c: Likewise. * iconvdata/big5hkscs.c: Likewise. * iconvdata/euc-cn.c: Likewise. * iconvdata/euc-jp.c: Likewise. * iconvdata/euc-kr.c: Likewise. * iconvdata/gbgbk.c: Likewise. * iconvdata/gbk.c: Likewise. * iconvdata/iso-2022-cn.c: Likewise. * iconvdata/iso-2022-jp.c: Likewise. * iconvdata/iso-2022-kr.c: Likewise. * iconvdata/iso646.c: Likewise. * iconvdata/iso8859-1.c: Likewise. * iconvdata/iso_6937-2.c: Likewise. * iconvdata/iso_6937.c: Likewise. * iconvdata/johab.c: Likewise. * iconvdata/sjis.c: Likewise. * iconvdata/t.61.c: Likewise. * iconvdata/uhc.c: Likewise. * iconvdata/unicode.c: Likewise. * iconvdata/utf-16.c: Likewise.
Diffstat (limited to 'iconv/iconv.c')
-rw-r--r--iconv/iconv.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/iconv/iconv.c b/iconv/iconv.c
index 58d977e949..53c1f97e3b 100644
--- a/iconv/iconv.c
+++ b/iconv/iconv.c
@@ -34,17 +34,17 @@ iconv (iconv_t cd, char **inbuf, size_t *inbytesleft, char **outbuf,
{
__gconv_t gcd = (__gconv_t) cd;
char *outstart = outbuf ? *outbuf : NULL;
- size_t converted;
+ size_t irreversible;
int result;
if (__builtin_expect (inbuf == NULL || *inbuf == NULL, 0))
{
if (outbuf == NULL || *outbuf == NULL)
- result = __gconv (gcd, NULL, NULL, NULL, NULL, &converted);
+ result = __gconv (gcd, NULL, NULL, NULL, NULL, &irreversible);
else
result = __gconv (gcd, NULL, NULL, (unsigned char **) outbuf,
(unsigned char *) (outstart + *outbytesleft),
- &converted);
+ &irreversible);
}
else
{
@@ -54,7 +54,7 @@ iconv (iconv_t cd, char **inbuf, size_t *inbytesleft, char **outbuf,
(const unsigned char *) (*inbuf + *inbytesleft),
(unsigned char **) outbuf,
(unsigned char *) (*outbuf + *outbytesleft),
- &converted);
+ &irreversible);
*inbytesleft -= *inbuf - instart;
}
@@ -65,22 +65,22 @@ iconv (iconv_t cd, char **inbuf, size_t *inbytesleft, char **outbuf,
{
case __GCONV_ILLEGAL_DESCRIPTOR:
__set_errno (EBADF);
- converted = (size_t) -1L;
+ irreversible = (size_t) -1L;
break;
case __GCONV_ILLEGAL_INPUT:
__set_errno (EILSEQ);
- converted = (size_t) -1L;
+ irreversible = (size_t) -1L;
break;
case __GCONV_FULL_OUTPUT:
__set_errno (E2BIG);
- converted = (size_t) -1L;
+ irreversible = (size_t) -1L;
break;
case __GCONV_INCOMPLETE_INPUT:
__set_errno (EINVAL);
- converted = (size_t) -1L;
+ irreversible = (size_t) -1L;
break;
case __GCONV_EMPTY_INPUT:
@@ -92,5 +92,5 @@ iconv (iconv_t cd, char **inbuf, size_t *inbytesleft, char **outbuf,
assert (!"Nothing like this should happen");
}
- return converted;
+ return irreversible;
}