[BZ #2078, BZ #2079]

Update
2006-01-15  Andreas Jaeger  <aj@suse.de>

	[BZ #2079]
	* libio/fputwc_u.c (fputwc_unlocked): Fix return value.
	* libio/getwc_u.c (__getwc_unlocked): Likewise.
	* libio/wfileops.c (_IO_wdo_write): Likewise.

	[BZ #2078]
	* libio/fputwc.c (fputwc): Use proper type for result.
	* libio/ioungetwc.c (ungetwc): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 399b096545da04a398469e7188cd2065f8c17bb6..85e3554eeff0487d20b6dc679f7e55cda369f562 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-01-15  Andreas Jaeger  <aj@suse.de>
+
+       [BZ #2079]
+       * libio/fputwc_u.c (fputwc_unlocked): Fix return value.
+       * libio/getwc_u.c (__getwc_unlocked): Likewise.
+       * libio/wfileops.c (_IO_wdo_write): Likewise.
+
+       [BZ #2078]
+       * libio/fputwc.c (fputwc): Use proper type for result.
+       * libio/ioungetwc.c (ungetwc): Likewise.
+
 2006-01-14  Ulrich Drepper  <drepper@redhat.com>
 
        * sysdeps/unix/sysv/linux/bits/sched.h: Define SCHED_BATCH.

diff --git a/libio/fputwc.c b/libio/fputwc.c
index 8c749435a0ca36c76562eb7b1e68d2937040d4dd..42cf9d716c076f6af95e430b883aec162ffc74d2 100644 (file)
--- a/libio/fputwc.c
+++ b/libio/fputwc.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993,1996,1997,1998,1999,2003 Free Software Foundation, Inc.
+/* Copyright (C) 1993,1996,1997,1998,1999,2003, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -33,7 +33,7 @@ fputwc (wc, fp)
      wchar_t wc;
      _IO_FILE *fp;
 {
-  int result;
+  wint_t result;
   CHECK_FILE (fp, EOF);
   _IO_acquire_lock (fp);
   if (_IO_fwide (fp, 1) < 0)

diff --git a/libio/ioungetwc.c b/libio/ioungetwc.c
index 00d3e965b5e8cdaf28870360151f17fc0c4b37ab..f7b68666179f948d3000ae53e4de1840d6c8f7f1 100644 (file)
--- a/libio/ioungetwc.c
+++ b/libio/ioungetwc.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1996, 1997, 1998, 1999, 2001, 2002, 2003
+/* Copyright (C) 1993, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2006
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -34,7 +34,7 @@ ungetwc (c, fp)
      wint_t c;
      _IO_FILE *fp;
 {
-  int result;
+  wint_t result;
   CHECK_FILE (fp, WEOF);
   _IO_acquire_lock (fp);
   _IO_fwide (fp, 1);