commit 60d2f8f3c7f1cdacafcbd60dc004e32cc90035ca

Author: Joseph Myers <joseph@codesourcery.com>

Date:   Sat Jun 8 00:22:23 2013 +0000

    Use (void) in no-arguments function definitions.

Conflicts:

	resolv/compat-gethnamaddr.c

Changes were already port of the stub resolver rebase in

glibc-rh677316-resolv.patch.

diff --git a/catgets/gencat.c b/catgets/gencat.c

index 5078e3c8282cfa00..28dd8a5b05e5b0a0 100644

--- a/catgets/gencat.c

+++ b/catgets/gencat.c

@@ -260,7 +260,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\

 /* The address of this function will be assigned to the hook in the

    error functions.  */

 static void

-error_print ()

+error_print (void)

 {

   /* We don't want the program name to be printed in messages.  Emacs'

      compile.el does not like this.  */

diff --git a/crypt/crypt_util.c b/crypt/crypt_util.c

index e08dd8fa994a3ab1..1ae7711915822715 100644

--- a/crypt/crypt_util.c

+++ b/crypt/crypt_util.c

@@ -554,7 +554,7 @@ small_tables_done:

 }

 void

-__init_des()

+__init_des (void)

 {

   __init_des_r(&_ufc_foobar);

 }

diff --git a/crypt/speeds.c b/crypt/speeds.c

index 7362391892aabe55..3afefb954216d8f2 100644

--- a/crypt/speeds.c

+++ b/crypt/speeds.c

@@ -42,7 +42,7 @@ struct tms tstart, tfinish;

 char *crypt(), *fcrypt();

 void

-Stop ()

+Stop (void)

 {

     double elapsed;

 #ifdef NO_ITIMER

@@ -76,7 +76,7 @@ static void clearmem(start, cnt)

       *start++ = '\0';

   }

-main ()

+main (void)

 {

    char *s;

 #ifdef NO_ITIMER

diff --git a/hurd/hurdmalloc.c b/hurd/hurdmalloc.c

index 886b40208da56866..da611653b602975f 100644

--- a/hurd/hurdmalloc.c

+++ b/hurd/hurdmalloc.c

@@ -380,7 +380,7 @@ realloc(old_base, new_size)

 #ifdef	DEBUG

 void

-print_malloc_free_list()

+print_malloc_free_list (void)

 {

   	int i, size;

 	free_list_t fl;

diff --git a/inet/ruserpass.c b/inet/ruserpass.c

index 71a734dfdac934b7..f64ca3f1c12d478e 100644

--- a/inet/ruserpass.c

+++ b/inet/ruserpass.c

@@ -289,7 +289,7 @@ bad:

 libc_hidden_def (ruserpass)

 static int

-token()

+token (void)

 {

 	char *cp;

 	int c;

diff --git a/intl/finddomain.c b/intl/finddomain.c

index fec3156985051234..4fff9dad5de54dad 100644

--- a/intl/finddomain.c

+++ b/intl/finddomain.c

@@ -171,7 +171,7 @@ out:

 /* This is called from iconv/gconv_db.c's free_mem, as locales must

    be freed before freeing gconv steps arrays.  */

 void __libc_freeres_fn_section

-_nl_finddomain_subfreeres ()

+_nl_finddomain_subfreeres (void)

 {

   struct loaded_l10nfile *runp = _nl_loaded_domains;

diff --git a/intl/localealias.c b/intl/localealias.c

index 1341228716241ffe..2f067dfe2cd7a130 100644

--- a/intl/localealias.c

+++ b/intl/localealias.c

@@ -362,7 +362,7 @@ out:

 static int

-extend_alias_table ()

+extend_alias_table (void)

 {

   size_t new_size;

   struct alias_map *new_map;

diff --git a/intl/plural-exp.c b/intl/plural-exp.c

index 2fa27bd7f3afca65..e157bba4adfca8df 100644

--- a/intl/plural-exp.c

+++ b/intl/plural-exp.c

@@ -72,7 +72,7 @@ static struct expression plone;

 struct expression GERMANIC_PLURAL;

 static void

-init_germanic_plural ()

+init_germanic_plural (void)

 {

   if (plone.val.num == 0)

     {

diff --git a/libio/fcloseall.c b/libio/fcloseall.c

index 0864690a85504969..46184f6c4a7ad741 100644

--- a/libio/fcloseall.c

+++ b/libio/fcloseall.c

@@ -28,7 +28,7 @@

 #include <stdio.h>

 int

-__fcloseall ()

+__fcloseall (void)

 {

   /* Close all streams.  */

   return _IO_cleanup ();

diff --git a/libio/genops.c b/libio/genops.c

index 02d7dfd02ac3ea7c..4e0a40f90c8223dd 100644

--- a/libio/genops.c

+++ b/libio/genops.c

@@ -876,7 +876,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);

@@ -884,7 +884,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;

@@ -1009,7 +1009,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.  */

@@ -1269,14 +1269,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;

 }

@@ -1299,7 +1299,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);

@@ -1308,7 +1308,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);

@@ -1317,7 +1317,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/libio/getchar.c b/libio/getchar.c

index 3e35a0e524ef5236..d34398e69b9d42c2 100644

--- a/libio/getchar.c

+++ b/libio/getchar.c

@@ -30,7 +30,7 @@

 #undef getchar

 int

-getchar ()

+getchar (void)

 {

   int result;

   _IO_acquire_lock (_IO_stdin);

diff --git a/libio/getchar_u.c b/libio/getchar_u.c

index de0d1498737bb36a..4821163a486c8474 100644

--- a/libio/getchar_u.c

+++ b/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/libio/getwchar.c b/libio/getwchar.c

index 8a9cb5cde21b5dfa..8344998f6fd2de65 100644

--- a/libio/getwchar.c

+++ b/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/libio/getwchar_u.c b/libio/getwchar_u.c

index 4ac335b4fce84b7a..a395fd6e78309944 100644

--- a/libio/getwchar_u.c

+++ b/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/libio/oldstdfiles.c b/libio/oldstdfiles.c

index 5a67d73e27cc7e3b..870cb0536c52024f 100644

--- a/libio/oldstdfiles.c

+++ b/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/login/getpt.c b/login/getpt.c

index 4b9b037b986de2cc..89293d8cdf8d9523 100644

--- a/login/getpt.c

+++ b/login/getpt.c

@@ -22,7 +22,7 @@

 /* Open the master side of a pseudoterminal and return its file

    descriptor, or -1 on error. */

 int

-__getpt ()

+__getpt (void)

 {

   __set_errno (ENOSYS);

   return -1;

diff --git a/login/tst-utmp.c b/login/tst-utmp.c

index cce79b4980ed4841..7cc39cb2b7ff2dba 100644

--- a/login/tst-utmp.c

+++ b/login/tst-utmp.c

@@ -395,7 +395,7 @@ do_test (int argc, char *argv[])

 /* No field 'ut_type' in struct utmp.  */

 int

-main ()

+main (void)

 {

   return 0;

 }

diff --git a/malloc/hooks.c b/malloc/hooks.c

index a63668fdd07e89ef..e7bfb7e002b4fcdc 100644

--- a/malloc/hooks.c

+++ b/malloc/hooks.c

@@ -69,7 +69,7 @@ static int disallow_malloc_check;

 /* Activate a standard set of debugging hooks. */

 void

-__malloc_check_init()

+__malloc_check_init (void)

 {

   if (disallow_malloc_check) {

     disallow_malloc_check = 0;

diff --git a/malloc/malloc.c b/malloc/malloc.c

index cad40661cd0a6b8a..fc86b344ee3b3a7c 100644

--- a/malloc/malloc.c

+++ b/malloc/malloc.c

@@ -4708,7 +4708,7 @@ struct mallinfo __libc_mallinfo()

 */

 void

-__malloc_stats()

+__malloc_stats (void)

 {

   int i;

   mstate ar_ptr;

diff --git a/malloc/mtrace.c b/malloc/mtrace.c

index 0a26ccc65d81bd2a..34ec2a85b219882c 100644

--- a/malloc/mtrace.c

+++ b/malloc/mtrace.c

@@ -72,7 +72,7 @@ static __ptr_t (*tr_old_memalign_hook) (size_t __alignment, size_t __size,

 extern void tr_break (void) __THROW;

 libc_hidden_proto (tr_break)

 void

-tr_break ()

+tr_break (void)

 {

 }

 libc_hidden_def (tr_break)

@@ -293,7 +293,7 @@ release_libc_mem (void)

    don't forget to set a breakpoint on tr_break!  */

 void

-mtrace ()

+mtrace (void)

 {

 #ifdef _LIBC

   static int added_atexit_handler;

@@ -358,7 +358,7 @@ mtrace ()

 }

 void

-muntrace ()

+muntrace (void)

 {

   if (mallstream == NULL)

     return;

diff --git a/misc/fstab.c b/misc/fstab.c

index d53845a9087771ec..86680466938ecc04 100644

--- a/misc/fstab.c

+++ b/misc/fstab.c

@@ -96,7 +96,7 @@ getfsfile (name)

 void

-endfsent ()

+endfsent (void)

 {

   struct fstab_state *state;

diff --git a/misc/getclktck.c b/misc/getclktck.c

index fe8e1338b11f19b9..5f9918c0121c02e5 100644

--- a/misc/getclktck.c

+++ b/misc/getclktck.c

@@ -19,7 +19,7 @@

 /* Return frequency of times().  */

 int

-__getclktck ()

+__getclktck (void)

 {

 #ifdef	CLK_TCK

   return CLK_TCK;

diff --git a/misc/getdtsz.c b/misc/getdtsz.c

index 7c6f7e633998daee..5c08127f82ee10dd 100644

--- a/misc/getdtsz.c

+++ b/misc/getdtsz.c

@@ -21,7 +21,7 @@

 /* Return the maximum number of file descriptors

    the current process could possibly have.  */

 int

-__getdtablesize ()

+__getdtablesize (void)

 {

   __set_errno (ENOSYS);

   return -1;

diff --git a/misc/gethostid.c b/misc/gethostid.c

index 876c83c691994d92..09e2e6bf76a55b41 100644

--- a/misc/gethostid.c

+++ b/misc/gethostid.c

@@ -20,7 +20,7 @@

 /* Return the current machine's Internet number.  */

 long int

-gethostid ()

+gethostid (void)

 {

   __set_errno (ENOSYS);

   return -1L;

diff --git a/misc/getpagesize.c b/misc/getpagesize.c

index 6d3821aef1be0a45..1374a208511a47e3 100644

--- a/misc/getpagesize.c

+++ b/misc/getpagesize.c

@@ -20,7 +20,7 @@

 /* Return the system page size.  */

 int

-__getpagesize ()

+__getpagesize (void)

 {

   __set_errno (ENOSYS);

   return 0;

diff --git a/misc/getsysstats.c b/misc/getsysstats.c

index c5ce2fdb9fec724a..9ad2ad22c32c7f10 100644

--- a/misc/getsysstats.c

+++ b/misc/getsysstats.c

@@ -21,7 +21,7 @@

 #include <sys/sysinfo.h>

 int

-__get_nprocs_conf ()

+__get_nprocs_conf (void)

 {

   /* We don't know how to determine the number.  Simply return always 1.  */

   return 1;

@@ -33,7 +33,7 @@ link_warning (get_nprocs_conf, "warning: get_nprocs_conf will always return 1")

 int

-__get_nprocs ()

+__get_nprocs (void)

 {

   /* We don't know how to determine the number.  Simply return always 1.  */

   return 1;

@@ -44,7 +44,7 @@ link_warning (get_nprocs, "warning: get_nprocs will always return 1")

 long int

-__get_phys_pages ()

+__get_phys_pages (void)

 {

   /* We have no general way to determine this value.  */

   __set_errno (ENOSYS);

@@ -56,7 +56,7 @@ stub_warning (get_phys_pages)

 long int

-__get_avphys_pages ()

+__get_avphys_pages (void)

 {

   /* We have no general way to determine this value.  */

   __set_errno (ENOSYS);

diff --git a/misc/getttyent.c b/misc/getttyent.c

index 18944e2b99150aea..864f65f523de2522 100644

--- a/misc/getttyent.c

+++ b/misc/getttyent.c

@@ -61,7 +61,7 @@ static char *skip (char *) __THROW internal_function;

 static char *value (char *) __THROW internal_function;

 struct ttyent *

-getttyent()

+getttyent (void)

 {

 	static struct ttyent tty;

 	int c;

@@ -184,7 +184,7 @@ value(p)

 }

 int

-setttyent()

+setttyent (void)

 {

 	if (tf) {

@@ -200,7 +200,7 @@ setttyent()

 libc_hidden_def (setttyent)

 int

-endttyent()

+endttyent (void)

 {

 	int rval;

diff --git a/misc/getusershell.c b/misc/getusershell.c

index 677377c3f7fb9081..fc2c43b771439c08 100644

--- a/misc/getusershell.c

+++ b/misc/getusershell.c

@@ -62,7 +62,7 @@ static char **initshells (void) __THROW;

  * Get a list of shells from _PATH_SHELLS, if it exists.

  */

 char *

-getusershell()

+getusershell (void)

 {

 	char *ret;

@@ -75,7 +75,7 @@ getusershell()

 }

 void

-endusershell()

+endusershell (void)

 {

 	free(shells);

@@ -86,14 +86,14 @@ endusershell()

 }

 void

-setusershell()

+setusershell (void)

 {

 	curshell = initshells();

 }

 static char **

-initshells()

+initshells (void)

 {

 	char **sp, *cp;

 	FILE *fp;

diff --git a/misc/hsearch.c b/misc/hsearch.c

index 928b192a5df9197c..26d12a96939f64d6 100644

--- a/misc/hsearch.c

+++ b/misc/hsearch.c

@@ -45,7 +45,7 @@ hcreate (nel)

 void

-__hdestroy ()

+__hdestroy (void)

 {

   hdestroy_r (&htab);

 }

diff --git a/misc/sync.c b/misc/sync.c

index 01a1696ce2e1d5e5..d71d4334368d3e2e 100644

--- a/misc/sync.c

+++ b/misc/sync.c

@@ -20,7 +20,7 @@

 /* Make all changes done to all files actually appear on disk.  */

 void

-sync ()

+sync (void)

 {

   __set_errno (ENOSYS);

 }

diff --git a/misc/syslog.c b/misc/syslog.c

index 4976e89b6ea56364..70daa9e1f3b7b745 100644

--- a/misc/syslog.c

+++ b/misc/syslog.c

@@ -425,7 +425,7 @@ sigpipe_handler (int signo)

 #endif

 static void

-closelog_internal()

+closelog_internal (void)

 {

   if (!connected)

     return;

@@ -436,7 +436,7 @@ closelog_internal()

 }

 void

-closelog ()

+closelog (void)

 {

   /* Protect against multiple users and cancellation.  */

   __libc_cleanup_push (cancel_handler, NULL);

diff --git a/misc/ttyslot.c b/misc/ttyslot.c

index 75ca6a2d42d2c79d..9c69589daee2b164 100644

--- a/misc/ttyslot.c

+++ b/misc/ttyslot.c

@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)ttyslot.c	8.1 (Berkeley) 6/4/93";

 #include <unistd.h>

 int

-ttyslot()

+ttyslot (void)

 {

 	struct ttyent *ttyp;

 	int slot;

diff --git a/misc/vhangup.c b/misc/vhangup.c

index 0d8ce287c999e08f..1f86262f9c9fcd56 100644

--- a/misc/vhangup.c

+++ b/misc/vhangup.c

@@ -22,7 +22,7 @@

    with the control terminal, and then send a SIGHUP signal to the process

    group of the control terminal.  */

 int

-vhangup ()

+vhangup (void)

 {

   __set_errno (ENOSYS);

   return -1;

diff --git a/ports/sysdeps/unix/sysv/linux/ia64/getpagesize.c b/ports/sysdeps/unix/sysv/linux/ia64/getpagesize.c

index ade9123a3a79d621..007cc09646352fdb 100644

--- a/ports/sysdeps/unix/sysv/linux/ia64/getpagesize.c

+++ b/ports/sysdeps/unix/sysv/linux/ia64/getpagesize.c

@@ -29,7 +29,7 @@

    as mmap and friends.  --davidm 99/11/30 */

 int

-__getpagesize ()

+__getpagesize (void)

 {

   assert (GLRO(dl_pagesize) != 0);

   return GLRO(dl_pagesize);

diff --git a/ports/sysdeps/unix/sysv/linux/m68k/getpagesize.c b/ports/sysdeps/unix/sysv/linux/m68k/getpagesize.c

index 9e6000a196e3fe70..c50bc00a21a59020 100644

--- a/ports/sysdeps/unix/sysv/linux/m68k/getpagesize.c

+++ b/ports/sysdeps/unix/sysv/linux/m68k/getpagesize.c

@@ -26,7 +26,7 @@

 /* Return the system page size.  */

 int

-__getpagesize ()

+__getpagesize (void)

 {

 #ifdef __NR_getpagesize

   int result;

diff --git a/posix/fork.c b/posix/fork.c

index 08c69b69bd9cbbe3..107b76e293c155ad 100644

--- a/posix/fork.c

+++ b/posix/fork.c

@@ -23,7 +23,7 @@

    Return -1 for errors, 0 to the new process,

    and the process ID of the new process to the old process.  */

 int

-__fork ()

+__fork (void)

 {

   __set_errno (ENOSYS);

   return -1;

diff --git a/posix/getegid.c b/posix/getegid.c

index 6692bc0837ec0066..1cffdc4e10b8e749 100644

--- a/posix/getegid.c

+++ b/posix/getegid.c

@@ -20,7 +20,7 @@

 /* Get the effective group ID of the calling process.  */

 __gid_t

-__getegid ()

+__getegid (void)

 {

   __set_errno (ENOSYS);

   return -1;

diff --git a/posix/geteuid.c b/posix/geteuid.c

index eb59db35d88d522a..9e2087babc4dc02c 100644

--- a/posix/geteuid.c

+++ b/posix/geteuid.c

@@ -21,7 +21,7 @@

 /* Get the effective user ID of the calling process.  */

 __uid_t

-__geteuid ()

+__geteuid (void)

 {

   __set_errno (ENOSYS);

   return -1;

diff --git a/posix/getgid.c b/posix/getgid.c

index 54c7d18705c971a5..464f03f9b2727d0d 100644

--- a/posix/getgid.c

+++ b/posix/getgid.c

@@ -21,7 +21,7 @@

 /* Get the real group ID of the calling process.  */

 gid_t

-__getgid ()

+__getgid (void)

 {

   __set_errno (ENOSYS);

   return -1;

diff --git a/posix/getpid.c b/posix/getpid.c

index 3c3bb6a2afe4d5c5..5b5f11b0c091fe0a 100644

--- a/posix/getpid.c

+++ b/posix/getpid.c

@@ -20,7 +20,7 @@

 /* Get the process ID of the calling process.  */

 int

-__getpid ()

+__getpid (void)

 {

   __set_errno (ENOSYS);

   return -1;

diff --git a/posix/getppid.c b/posix/getppid.c

index 92c8b9b6dfca4592..7e3baacce8b98140 100644

--- a/posix/getppid.c

+++ b/posix/getppid.c

@@ -21,7 +21,7 @@

 /* Get the parent process ID of the calling process.  */

 int

-__getppid ()

+__getppid (void)

 {

   __set_errno (ENOSYS);

   return -1;

diff --git a/posix/getuid.c b/posix/getuid.c

index 2afbe583fd76f520..c16a72a4ae5182cc 100644

--- a/posix/getuid.c

+++ b/posix/getuid.c

@@ -21,7 +21,7 @@