summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--libio/iofwrite.c6
-rw-r--r--libio/iofwrite_u.c6
3 files changed, 7 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 3314b60b47..e73b97b2ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2000-06-07 Ulrich Drepper <drepper@redhat.com>
+ * libio/iofwrite_u.c (fwrite_unlocked): Remove obsolete comment.
+ * libio/iofwrite.c (_IO_fwrite): Likewise.
+
* time/time.h: Add missing __THROW for clock_getcpuclockid
prototype.
diff --git a/libio/iofwrite.c b/libio/iofwrite.c
index 411eeb29a9..f9c6baabaf 100644
--- a/libio/iofwrite.c
+++ b/libio/iofwrite.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 96, 97, 98, 99, 2000 Free Software Foundation, Inc.
This file is part of the GNU IO Library.
This library is free software; you can redistribute it and/or
@@ -35,10 +35,8 @@ _IO_fwrite (buf, size, count, fp)
_IO_size_t request = size * count;
_IO_size_t written = 0;
CHECK_FILE (fp, 0);
- /* Many traditional implementations return 0 if size==0 && count > 0,
- but ANSI requires us to return count in this case. */
if (request == 0)
- return count;
+ return 0;
_IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp);
_IO_flockfile (fp);
if (fp->_vtable_offset != 0 || _IO_fwide (fp, -1) == -1)
diff --git a/libio/iofwrite_u.c b/libio/iofwrite_u.c
index acb5b2f527..b9f0816ddf 100644
--- a/libio/iofwrite_u.c
+++ b/libio/iofwrite_u.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 96, 97, 98, 99, 2000 Free Software Foundation, Inc.
This file is part of the GNU IO Library.
This library is free software; you can redistribute it and/or
@@ -38,10 +38,8 @@ fwrite_unlocked (buf, size, count, fp)
_IO_size_t request = size * count;
_IO_size_t written = 0;
CHECK_FILE (fp, 0);
- /* Many traditional implementations return 0 if size==0 && count > 0,
- but ANSI requires us to return count in this case. */
if (request == 0)
- return count;
+ return 0;
if (_IO_fwide (fp, -1) == -1)
{
written = _IO_sputn (fp, (const char *) buf, request);