aboutsummaryrefslogtreecommitdiff
path: root/iconv
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-11-28 07:10:56 +0000
committerUlrich Drepper <drepper@redhat.com>2000-11-28 07:10:56 +0000
commit8c0b7170956ed028472b4c1ef1d94608101da565 (patch)
treedf9e044b765e246efbce04f0af6ff7d1e82956fa /iconv
parentd6b544fe2361df88d93e68b86ddaea5a49b4094d (diff)
downloadglibc-8c0b7170956ed028472b4c1ef1d94608101da565.zip
glibc-8c0b7170956ed028472b4c1ef1d94608101da565.tar.gz
glibc-8c0b7170956ed028472b4c1ef1d94608101da565.tar.bz2
Update.
* test-skeleton.c: Mark timeout_handler with noreturn. * iconv/skeleton.c (get16u): Add const to cast. (get32u): Likewise. * iconvdata/gb18030.c: Likewise. * iconvdata/iso-2022-cn-ext.c: Likewise. * iconvdata/ansi_x3.110.c: Add cast to avoid warning. * iconvdata/big5.c: Likewise. * iconvdata/big5hkscs.c: Likewise. * iconvdata/iso_6937.c: Likewise. * iconvdata/iso_6937-2.c: Likewise. * iconvdata/t.61.c: Likewise. * iconvdata/iso646.c: Add prototypes for gconv_init and gconv_env. * iconvdata/unicode.c: Likewise. * iconvdata/utf-16.c: Likewise. * iconvdata/cns11643.h (ucs4_to_cns11643): Define needed as size_t. * iconv/gconv_trans.c (__gconv_translit_find): Avoid one warning with little code shuffling.
Diffstat (limited to 'iconv')
-rw-r--r--iconv/gconv_trans.c4
-rw-r--r--iconv/skeleton.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/iconv/gconv_trans.c b/iconv/gconv_trans.c
index 919d438..3d02b46 100644
--- a/iconv/gconv_trans.c
+++ b/iconv/gconv_trans.c
@@ -366,8 +366,8 @@ __gconv_translit_find (struct trans_struct *trans)
memset (newp, '\0', sizeof (struct known_trans));
/* Store a copy of the module name. */
- newp->info.name = (char *) (newp + 1);
- cp = __mempcpy ((char *) newp->info.name, trans->name, name_len);
+ newp->info.name = cp = (char *) (newp + 1);
+ cp = __mempcpy (cp, trans->name, name_len);
newp->fname = cp;
diff --git a/iconv/skeleton.c b/iconv/skeleton.c
index 06e3730..2b080ba 100644
--- a/iconv/skeleton.c
+++ b/iconv/skeleton.c
@@ -127,8 +127,8 @@ static int to_object;
loops we have other definitions which allow optimized access. */
#ifdef _STRING_ARCH_unaligned
/* We can handle unaligned memory access. */
-# define get16u(addr) *((uint16_t *) (addr))
-# define get32u(addr) *((uint32_t *) (addr))
+# define get16u(addr) *((__const uint16_t *) (addr))
+# define get32u(addr) *((__const uint32_t *) (addr))
/* We need no special support for writing values either. */
# define put16u(addr, val) *((uint16_t *) (addr)) = (val)