* [BZ #2078, 2079] Fix some wide functions
@ 2006-01-15 16:28 Andreas Jaeger
2006-01-15 17:40 ` Ulrich Drepper
0 siblings, 1 reply; 3+ messages in thread
From: Andreas Jaeger @ 2006-01-15 16:28 UTC (permalink / raw)
To: Glibc hackers
[-- Attachment #1: Type: text/plain, Size: 4063 bytes --]
The following patch uses the correct types/values in a few places.
Tested on x86-64, ok to commit?
Andreas
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.
============================================================
Index: libio/fputwc.c
--- libio/fputwc.c 29 Aug 2003 19:58:26 -0000 1.4
+++ libio/fputwc.c 15 Jan 2006 16:08:15 -0000
@@ -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)
============================================================
Index: libio/ioungetwc.c
--- libio/ioungetwc.c 29 Aug 2003 19:58:27 -0000 1.5
+++ libio/ioungetwc.c 15 Jan 2006 16:08:15 -0000
@@ -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);
============================================================
Index: libio/getwc_u.c
--- libio/getwc_u.c 6 Jul 2001 04:54:55 -0000 1.3
+++ libio/getwc_u.c 15 Jan 2006 16:08:15 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993,1995,1996,1997,1999,2000 Free Software Foundation, Inc.
+/* Copyright (C) 1993,1995,1996,1997,1999,2000, 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 @@
wint_t
__getwc_unlocked (FILE *fp)
{
- CHECK_FILE (fp, EOF);
+ CHECK_FILE (fp, WEOF);
return _IO_getwc_unlocked (fp);
}
============================================================
Index: libio/wfileops.c
--- libio/wfileops.c 14 Jan 2004 18:40:03 -0000 1.29
+++ libio/wfileops.c 15 Jan 2006 16:08:16 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993,1995,1997-2003,2004 Free Software Foundation, Inc.
+/* Copyright (C) 1993,1995,1997-2003,2004, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Ulrich Drepper <drepper@cygnus.com>.
Based on the single byte version by Per Bothner <bothner@cygnus.com>.
@@ -69,7 +69,7 @@ _IO_wdo_write (fp, data, to_do)
{
if (_IO_new_do_write (fp, fp->_IO_write_base,
fp->_IO_write_ptr - fp->_IO_write_base) == EOF)
- return EOF;
+ return WEOF;
}
do
============================================================
Index: libio/fputwc_u.c
--- libio/fputwc_u.c 6 Jul 2001 04:54:54 -0000 1.3
+++ libio/fputwc_u.c 15 Jan 2006 16:08:16 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1996, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1996, 1997, 1999, 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
@@ -35,7 +35,7 @@ fputwc_unlocked (wc, fp)
wchar_t wc;
_IO_FILE *fp;
{
- CHECK_FILE (fp, EOF);
+ CHECK_FILE (fp, WEOF);
if (_IO_fwide (fp, 1) < 0)
return WEOF;
return _IO_putwc_unlocked (wc, fp);
--
Andreas Jaeger, aj@suse.de, http://www.suse.de/~aj/
SUSE Linux Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GPG fingerprint = 93A3 365E CE47 B889 DF7F FED1 389A 563C C272 A126
[-- Attachment #2: Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [BZ #2078, 2079] Fix some wide functions
2006-01-15 16:28 [BZ #2078, 2079] Fix some wide functions Andreas Jaeger
@ 2006-01-15 17:40 ` Ulrich Drepper
2006-01-15 17:44 ` Andreas Jaeger
0 siblings, 1 reply; 3+ messages in thread
From: Ulrich Drepper @ 2006-01-15 17:40 UTC (permalink / raw)
To: Andreas Jaeger; +Cc: Glibc hackers
[-- Attachment #1: Type: text/plain, Size: 948 bytes --]
Andreas Jaeger wrote:
> Index: libio/wfileops.c
> --- libio/wfileops.c 14 Jan 2004 18:40:03 -0000 1.29
> +++ libio/wfileops.c 15 Jan 2006 16:08:16 -0000
> @@ -1,4 +1,4 @@
> -/* Copyright (C) 1993,1995,1997-2003,2004 Free Software Foundation, Inc.
> +/* Copyright (C) 1993,1995,1997-2003,2004, 2006 Free Software Foundation, Inc.
> This file is part of the GNU C Library.
> Written by Ulrich Drepper <drepper@cygnus.com>.
> Based on the single byte version by Per Bothner <bothner@cygnus.com>.
> @@ -69,7 +69,7 @@ _IO_wdo_write (fp, data, to_do)
> {
> if (_IO_new_do_write (fp, fp->_IO_write_base,
> fp->_IO_write_ptr - fp->_IO_write_base) == EOF)
> - return EOF;
> + return WEOF;
As far as fixing this specific kind of mistake, the patch is fine. But
there is something fishy in the use of _IO_wdo_write.
--
➧ Ulrich Drepper ➧ Red Hat, Inc. ➧ 444 Castro St ➧ Mountain View, CA ❖
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 251 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [BZ #2078, 2079] Fix some wide functions
2006-01-15 17:40 ` Ulrich Drepper
@ 2006-01-15 17:44 ` Andreas Jaeger
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Jaeger @ 2006-01-15 17:44 UTC (permalink / raw)
To: Ulrich Drepper; +Cc: Glibc hackers
[-- Attachment #1: Type: text/plain, Size: 1203 bytes --]
Ulrich Drepper <drepper@redhat.com> writes:
> Andreas Jaeger wrote:
>> Index: libio/wfileops.c
>> --- libio/wfileops.c 14 Jan 2004 18:40:03 -0000 1.29
>> +++ libio/wfileops.c 15 Jan 2006 16:08:16 -0000
>> @@ -1,4 +1,4 @@
>> -/* Copyright (C) 1993,1995,1997-2003,2004 Free Software Foundation, Inc.
>> +/* Copyright (C) 1993,1995,1997-2003,2004, 2006 Free Software Foundation, Inc.
>> This file is part of the GNU C Library.
>> Written by Ulrich Drepper <drepper@cygnus.com>.
>> Based on the single byte version by Per Bothner <bothner@cygnus.com>.
>> @@ -69,7 +69,7 @@ _IO_wdo_write (fp, data, to_do)
>> {
>> if (_IO_new_do_write (fp, fp->_IO_write_base,
>> fp->_IO_write_ptr - fp->_IO_write_base) == EOF)
>> - return EOF;
>> + return WEOF;
>
> As far as fixing this specific kind of mistake, the patch is fine. But
> there is something fishy in the use of _IO_wdo_write.
Will you take care of this, please? I'll commit my patch now,
Andreas
--
Andreas Jaeger, aj@suse.de, http://www.suse.de/~aj/
SUSE Linux Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GPG fingerprint = 93A3 365E CE47 B889 DF7F FED1 389A 563C C272 A126
[-- Attachment #2: Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-01-15 17:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-01-15 16:28 [BZ #2078, 2079] Fix some wide functions Andreas Jaeger
2006-01-15 17:40 ` Ulrich Drepper
2006-01-15 17:44 ` Andreas Jaeger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).