aboutsummaryrefslogtreecommitdiff
path: root/iconv
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-06-26 00:26:21 +0000
committerUlrich Drepper <drepper@redhat.com>2000-06-26 00:26:21 +0000
commit8b682b9907ad1d60bdd45431e0e3bbdf358837ec (patch)
tree6ec38a6f3aac595638af0fb14ec497a7a9c83b16 /iconv
parent45a9eda2f9b8245d1586ceb51bb3543fc2a2a9f6 (diff)
downloadglibc-8b682b9907ad1d60bdd45431e0e3bbdf358837ec.tar
glibc-8b682b9907ad1d60bdd45431e0e3bbdf358837ec.tar.gz
glibc-8b682b9907ad1d60bdd45431e0e3bbdf358837ec.tar.bz2
glibc-8b682b9907ad1d60bdd45431e0e3bbdf358837ec.zip
Update.
* iconvdata/gen-8bit-gap-1.sh: Update for new charmap format. * iconvdata/gen-8bit-gap.sh: Likewise. * iconvdata/gen-8bit.sh: Likewise. * iconv/gconv_open.c (__gconv_open): Move comment to correct position. * locale/programs/ld-collate.c (collate_read): Don't actually read the copy locale if we are ignoring the content. * sunrpc/xdr_rec.c (set_input_fragment): Fix PR libc/1549, patch from Jens Moeller <jens.moeller@waii.com>.
Diffstat (limited to 'iconv')
-rw-r--r--iconv/gconv_open.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/iconv/gconv_open.c b/iconv/gconv_open.c
index 2374703e21..c54054a3e5 100644
--- a/iconv/gconv_open.c
+++ b/iconv/gconv_open.c
@@ -188,12 +188,12 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
{
size_t size;
- /* Would have to be done if we would not clear the whole
- array above. */
/* If this is the last step we must not allocate an
output buffer. */
result->__data[cnt].__flags = conv_flags;
+ /* Would have to be done if we would not clear the whole
+ array above. */
#if 0
/* Reset the counter. */
result->__data[cnt].__invocation_counter = 0;