Merge changes between r23217 and r23296 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@23297 7b3dc134-2b1b-0410-93df-9e9f96275f8d

15 files changed, 36 insertions, 36 deletions

diff --git a/libc/libio/fcloseall.c b/libc/libio/fcloseall.c
index e1b0049f6..39c3be472 100644
--- a/libc/libio/fcloseall.c
+++ b/libc/libio/fcloseall.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 
 int
-__fcloseall ()
+__fcloseall (void)
 {
   /* Close all streams.  */
   return _IO_cleanup ();
diff --git a/libc/libio/fileops.c b/libc/libio/fileops.c
index 5a10db1de..588bb6390 100644
--- a/libc/libio/fileops.c
+++ b/libc/libio/fileops.c
@@ -1280,7 +1280,7 @@ _IO_new_file_xsputn (f, data, n)
      const void *data;
      _IO_size_t n;
 {
-  register const char *s = (const char *) data;
+  const char *s = (const char *) data;
   _IO_size_t to_do = n;
   int must_flush = 0;
   _IO_size_t count = 0;
@@ -1297,7 +1297,7 @@ _IO_new_file_xsputn (f, data, n)
       count = f->_IO_buf_end - f->_IO_write_ptr;
       if (count >= n)
 	{
-	  register const char *p;
+	  const char *p;
 	  for (p = s + n; p > s; )
 	    {
 	      if (*--p == '\n')
@@ -1365,9 +1365,9 @@ _IO_file_xsgetn (fp, data, n)
      void *data;
      _IO_size_t n;
 {
-  register _IO_size_t want, have;
-  register _IO_ssize_t count;
-  register char *s = data;
+  _IO_size_t want, have;
+  _IO_ssize_t count;
+  char *s = data;
 
   want = n;
 
@@ -1467,9 +1467,9 @@ _IO_file_xsgetn_mmap (fp, data, n)
      void *data;
      _IO_size_t n;
 {
-  register _IO_size_t have;
+  _IO_size_t have;
   char *read_ptr = fp->_IO_read_ptr;
-  register char *s = (char *) data;
+  char *s = (char *) data;
 
   have = fp->_IO_read_end - fp->_IO_read_ptr;
 
diff --git a/libc/libio/genops.c b/libc/libio/genops.c
index e5c5d5caf..a5fe13758 100644
--- a/libc/libio/genops.c
+++ b/libc/libio/genops.c
@@ -873,7 +873,7 @@ _IO_flush_all_lockp (int do_lock)
 
 
 int
-_IO_flush_all ()
+_IO_flush_all (void)
 {
   /* We want locking.  */
   return _IO_flush_all_lockp (1);
@@ -881,7 +881,7 @@ _IO_flush_all ()
 libc_hidden_def (_IO_flush_all)
 
 void
-_IO_flush_all_linebuffered ()
+_IO_flush_all_linebuffered (void)
 {
   struct _IO_FILE *fp;
   int last_stamp;
@@ -1006,7 +1006,7 @@ libc_freeres_fn (buffer_free)
 
 
 int
-_IO_cleanup ()
+_IO_cleanup (void)
 {
   /* We do *not* want locking.  Some threads might use streams but
      that is their problem, we flush them underneath them.  */
@@ -1266,14 +1266,14 @@ _IO_default_imbue (fp, locale)
 }
 
 _IO_ITER
-_IO_iter_begin()
+_IO_iter_begin (void)
 {
   return (_IO_ITER) _IO_list_all;
 }
 libc_hidden_def (_IO_iter_begin)
 
 _IO_ITER
-_IO_iter_end()
+_IO_iter_end (void)
 {
   return NULL;
 }
@@ -1296,7 +1296,7 @@ _IO_iter_file(iter)
 libc_hidden_def (_IO_iter_file)
 
 void
-_IO_list_lock()
+_IO_list_lock (void)
 {
 #ifdef _IO_MTSAFE_IO
   _IO_lock_lock (list_all_lock);
@@ -1305,7 +1305,7 @@ _IO_list_lock()
 libc_hidden_def (_IO_list_lock)
 
 void
-_IO_list_unlock()
+_IO_list_unlock (void)
 {
 #ifdef _IO_MTSAFE_IO
   _IO_lock_unlock (list_all_lock);
@@ -1314,7 +1314,7 @@ _IO_list_unlock()
 libc_hidden_def (_IO_list_unlock)
 
 void
-_IO_list_resetlock()
+_IO_list_resetlock (void)
 {
 #ifdef _IO_MTSAFE_IO
   _IO_lock_init (list_all_lock);
diff --git a/libc/libio/getchar.c b/libc/libio/getchar.c
index 4a415f7df..17709bf45 100644
--- a/libc/libio/getchar.c
+++ b/libc/libio/getchar.c
@@ -30,7 +30,7 @@
 #undef getchar
 
 int
-getchar ()
+getchar (void)
 {
   int result;
   _IO_acquire_lock (_IO_stdin);
diff --git a/libc/libio/getchar_u.c b/libc/libio/getchar_u.c
index 9f22aa529..c01d95715 100644
--- a/libc/libio/getchar_u.c
+++ b/libc/libio/getchar_u.c
@@ -30,7 +30,7 @@
 #undef getchar_unlocked
 
 int
-getchar_unlocked ()
+getchar_unlocked (void)
 {
   return _IO_getc_unlocked (_IO_stdin);
 }
diff --git a/libc/libio/getwchar.c b/libc/libio/getwchar.c
index b327c313a..10844e2bd 100644
--- a/libc/libio/getwchar.c
+++ b/libc/libio/getwchar.c
@@ -30,7 +30,7 @@
 #undef getwchar
 
 wint_t
-getwchar ()
+getwchar (void)
 {
   wint_t result;
   _IO_acquire_lock (_IO_stdin);
diff --git a/libc/libio/getwchar_u.c b/libc/libio/getwchar_u.c
index 77138ee33..97bb244c6 100644
--- a/libc/libio/getwchar_u.c
+++ b/libc/libio/getwchar_u.c
@@ -30,7 +30,7 @@
 #undef getwchar_unlocked
 
 wint_t
-getwchar_unlocked ()
+getwchar_unlocked (void)
 {
   return _IO_getwc_unlocked (_IO_stdin);
 }
diff --git a/libc/libio/iofgets_u.c b/libc/libio/iofgets_u.c
index 5f6b7ffc5..9b32fea8a 100644
--- a/libc/libio/iofgets_u.c
+++ b/libc/libio/iofgets_u.c
@@ -56,7 +56,7 @@ fgets_unlocked (buf, n, fp)
   /* If we read in some bytes and errno is EAGAIN, that error will
      be reported for next read. */
   if (count == 0 || ((fp->_IO_file_flags & _IO_ERR_SEEN)
-  		     && errno != EAGAIN))
+		     && errno != EAGAIN))
     result = NULL;
   else
     {
diff --git a/libc/libio/iofgetws_u.c b/libc/libio/iofgetws_u.c
index 982dfe085..1584beec1 100644
--- a/libc/libio/iofgetws_u.c
+++ b/libc/libio/iofgetws_u.c
@@ -56,7 +56,7 @@ fgetws_unlocked (buf, n, fp)
   /* If we read in some bytes and errno is EAGAIN, that error will
      be reported for next read. */
   if (count == 0 || ((fp->_IO_file_flags & _IO_ERR_SEEN)
-  		     && errno != EAGAIN))
+		     && errno != EAGAIN))
     result = NULL;
   else
     {
diff --git a/libc/libio/iofopncook.c b/libc/libio/iofopncook.c
index 386704215..34db0cb7f 100644
--- a/libc/libio/iofopncook.c
+++ b/libc/libio/iofopncook.c
@@ -30,9 +30,9 @@
 #include <shlib-compat.h>
 
 /* Prototyped for local functions.  */
-static _IO_ssize_t _IO_cookie_read (register _IO_FILE* fp, void* buf,
+static _IO_ssize_t _IO_cookie_read (_IO_FILE* fp, void* buf,
 				    _IO_ssize_t size);
-static _IO_ssize_t _IO_cookie_write (register _IO_FILE* fp,
+static _IO_ssize_t _IO_cookie_write (_IO_FILE* fp,
 				     const void* buf, _IO_ssize_t size);
 static _IO_off64_t _IO_cookie_seek (_IO_FILE *fp, _IO_off64_t offset, int dir);
 static _IO_off64_t _IO_cookie_seekoff (_IO_FILE *fp, _IO_off64_t offset,
diff --git a/libc/libio/ioungetc.c b/libc/libio/ioungetc.c
index f2e1b2706..186569418 100644
--- a/libc/libio/ioungetc.c
+++ b/libc/libio/ioungetc.c
@@ -35,7 +35,7 @@ _IO_ungetc (c, fp)
   CHECK_FILE (fp, EOF);
   if (c == EOF)
     return EOF;
-  _IO_acquire_lock (fp); 
+  _IO_acquire_lock (fp);
   result = _IO_sputbackc (fp, (unsigned char) c);
   _IO_release_lock (fp);
   return result;
diff --git a/libc/libio/oldfileops.c b/libc/libio/oldfileops.c
index 80e4b57ee..c9537f4d8 100644
--- a/libc/libio/oldfileops.c
+++ b/libc/libio/oldfileops.c
@@ -689,7 +689,7 @@ _IO_old_file_xsputn (f, data, n)
      const void *data;
      _IO_size_t n;
 {
-  register const char *s = (char *) data;
+  const char *s = (char *) data;
   _IO_size_t to_do = n;
   int must_flush = 0;
   _IO_size_t count = 0;
@@ -706,7 +706,7 @@ _IO_old_file_xsputn (f, data, n)
       count = f->_IO_buf_end - f->_IO_write_ptr;
       if (count >= n)
 	{
-	  register const char *p;
+	  const char *p;
 	  for (p = s + n; p > s; )
 	    {
 	      if (*--p == '\n')
@@ -738,8 +738,8 @@ _IO_old_file_xsputn (f, data, n)
 	}
       else
 	{
-	  register char *p = f->_IO_write_ptr;
-	  register int i = (int) count;
+	  char *p = f->_IO_write_ptr;
+	  int i = (int) count;
 	  while (--i >= 0)
 	    *p++ = *s++;
 	  f->_IO_write_ptr = p;
diff --git a/libc/libio/oldstdfiles.c b/libc/libio/oldstdfiles.c
index b0353d555..b02c62d7f 100644
--- a/libc/libio/oldstdfiles.c
+++ b/libc/libio/oldstdfiles.c
@@ -73,7 +73,7 @@ static void _IO_check_libio (void) __THROW __attribute__ ((constructor));
    _IO_list_all accordingly. */
 
 static void
-_IO_check_libio ()
+_IO_check_libio (void)
 {
   if (&_IO_stdin_used == NULL)
     {
diff --git a/libc/libio/wfiledoalloc.c b/libc/libio/wfiledoalloc.c
index 14501f2fe..4a900a811 100644
--- a/libc/libio/wfiledoalloc.c
+++ b/libc/libio/wfiledoalloc.c
@@ -27,7 +27,7 @@
 /*
    Copyright (C) 1990 The Regents of the University of California.
    All rights reserved.
- 
+
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    are met:
@@ -40,7 +40,7 @@
    4. Neither the name of the University nor the names of its contributors
       may be used to endorse or promote products derived from this software
       without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/libc/libio/wfileops.c b/libc/libio/wfileops.c
index d59abbdce..0a156eaad 100644
--- a/libc/libio/wfileops.c
+++ b/libc/libio/wfileops.c
@@ -907,7 +907,7 @@ _IO_wfile_xsputn (f, data, n)
      const void *data;
      _IO_size_t n;
 {
-  register const wchar_t *s = (const wchar_t *) data;
+  const wchar_t *s = (const wchar_t *) data;
   _IO_size_t to_do = n;
   int must_flush = 0;
   _IO_size_t count;
@@ -925,7 +925,7 @@ _IO_wfile_xsputn (f, data, n)
       count = f->_wide_data->_IO_buf_end - f->_wide_data->_IO_write_ptr;
       if (count >= n)
 	{
-	  register const wchar_t *p;
+	  const wchar_t *p;
 	  for (p = s + n; p > s; )
 	    {
 	      if (*--p == L'\n')
@@ -955,8 +955,8 @@ _IO_wfile_xsputn (f, data, n)
 	}
       else
 	{
-	  register wchar_t *p = f->_wide_data->_IO_write_ptr;
-	  register int i = (int) count;
+	  wchar_t *p = f->_wide_data->_IO_write_ptr;
+	  int i = (int) count;
 	  while (--i >= 0)
 	    *p++ = *s++;
 	  f->_wide_data->_IO_write_ptr = p;