From 3a12d5258ad0e4a3cec7f63aa54718ba969c05b4 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sun, 15 Jan 2006 17:46:04 +0000 Subject: [PATCH] [BZ #2078, BZ #2079] Update 2006-01-15 Andreas Jaeger [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. --- ChangeLog | 11 +++++++++++ libio/fputwc.c | 4 ++-- libio/ioungetwc.c | 4 ++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 399b096..85e3554 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2006-01-15 Andreas Jaeger + + [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 * sysdeps/unix/sysv/linux/bits/sched.h: Define SCHED_BATCH. diff --git a/libio/fputwc.c b/libio/fputwc.c index 8c74943..42cf9d7 100644 --- 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 00d3e96..f7b6866 100644 --- 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); -- 2.7.4