From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 15 Mar 1999 23:57:45 +0000 (+0000)
Subject: Update.
X-Git-Tag: upstream/2.30~27465
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=97e94e491a3d0ec2bd2c2788e191e749684571ad;p=external%2Fglibc.git

Update.

1999-03-15  Ulrich Drepper  <drepper@cygnus.com>

	* iconv/iconv.c (iconv): Correctly cast parameters for __gconv.

	* iconvdata/iso-2022-kr.c (EMIT_SHIFT_TO_INIT): Change type of
	outbuf to unsigned char to avoid warning.
---

diff --git a/ChangeLog b/ChangeLog
index b1c8381..d8ed3b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1999-03-15  Ulrich Drepper  <drepper@cygnus.com>
+
+	* iconv/iconv.c (iconv): Correctly cast parameters for __gconv.
+
+	* iconvdata/iso-2022-kr.c (EMIT_SHIFT_TO_INIT): Change type of
+	outbuf to unsigned char to avoid warning.
+
 1999-03-11  David S. Miller  <davem@redhat.com>
 
 	* sysdeps/sparc/sparc32/fpu/fpu_control.h: Add missing trap enable
diff --git a/iconv/iconv.c b/iconv/iconv.c
index 26fb417..a6c8436 100644
--- a/iconv/iconv.c
+++ b/iconv/iconv.c
@@ -1,6 +1,6 @@
 /* Convert characters in input buffer using conversion descriptor to
    output buffer.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -46,8 +46,8 @@ iconv (iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf,
     {
       const char *instart = *inbuf;
 
-      result = __gconv (gcd, (unsigned char **) inbuf,
-			(unsigned char *)  (*inbuf + *inbytesleft),
+      result = __gconv (gcd, (const unsigned char **) inbuf,
+			(const unsigned char *)  (*inbuf + *inbytesleft),
 			(unsigned char **) outbuf,
 			(unsigned char *) (*outbuf + *outbytesleft),
 			&converted);
diff --git a/iconvdata/iso-2022-kr.c b/iconvdata/iso-2022-kr.c
index b6aee4d..a0c213c 100644
--- a/iconvdata/iso-2022-kr.c
+++ b/iconvdata/iso-2022-kr.c
@@ -1,5 +1,5 @@
 /* Conversion module for ISO-2022-KR.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
@@ -80,7 +80,7 @@ enum
 	data->statep->count = ASCII_set;				      \
       else								      \
 	{								      \
-	  char *outbuf = data->outbuf;					      \
+	  unsigned char *outbuf = data->outbuf;				      \
 	  								      \
 	  /* We are not in the initial state.  To switch back we have	      \
 	     to emit `SI'.  */						      \