From 8c0b7170956ed028472b4c1ef1d94608101da565 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 28 Nov 2000 07:10:56 +0000
Subject: 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.
---
 iconv/gconv_trans.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'iconv/gconv_trans.c')

diff --git a/iconv/gconv_trans.c b/iconv/gconv_trans.c
index 919d438abe..3d02b461d6 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;
 
-- 
cgit v1.2.3