aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-12-20 15:54:40 +0000
committerUlrich Drepper <drepper@redhat.com>2005-12-20 15:54:40 +0000
commitb7cc4503da2eaa9aebb6d5a2fec33c3fdb0cf79e (patch)
treeffc4bf1a64035d6c4258f4102c43ee4b2cc73ebf
parentd9038ff837089bcef3623b362cbe8ea5e96b2d87 (diff)
downloadglibc-b7cc4503da2eaa9aebb6d5a2fec33c3fdb0cf79e.tar
glibc-b7cc4503da2eaa9aebb6d5a2fec33c3fdb0cf79e.tar.gz
glibc-b7cc4503da2eaa9aebb6d5a2fec33c3fdb0cf79e.tar.bz2
glibc-b7cc4503da2eaa9aebb6d5a2fec33c3fdb0cf79e.zip
* iconv/gconv_open.c (internal_trans_names): Mark as const.
-rw-r--r--ChangeLog4
-rw-r--r--iconv/gconv_open.c5
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b86507a8d1..43795692d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-20 Ulrich Drepper <drepper@redhat.com>
+
+ * iconv/gconv_open.c (internal_trans_names): Mark as const.
+
2005-12-19 Kaz Kojima <kkojima@rr.iij4u.or.jp>
* sysdeps/unix/sysv/linux/sh/sysdep.h: Include tls.h.
diff --git a/iconv/gconv_open.c b/iconv/gconv_open.c
index b23ab44e4e..95f3203394 100644
--- a/iconv/gconv_open.c
+++ b/iconv/gconv_open.c
@@ -71,7 +71,8 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
{
/* It's the builtin transliteration handling. We only
support it for working on the internal encoding. */
- static const char *internal_trans_names[1] = { "INTERNAL" };
+ static const char *const internal_trans_names[1]
+ = { "INTERNAL" };
struct trans_struct *lastp = NULL;
struct trans_struct *runp;
@@ -90,7 +91,7 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
/* We leave the `name' field zero to signal that
this is an internal transliteration step. */
- newp->csnames = internal_trans_names;
+ newp->csnames = (const char **) internal_trans_names;
newp->ncsnames = 1;
newp->trans_fct = __gconv_transliterate;