From d6765f1da60acf05871ce09164416eaba58d324f Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 11 Aug 1998 21:52:02 +0000 Subject: 1998-08-12 Roland McGrath * sysdeps/mach/usleep.c: Include . (usleep): Return void. 1998-08-11 Roland McGrath * sysdeps/generic/if_index.c (struct if_freenameindex): Add forward decl to inhibit warning in if_freenameindex defn. * sysdeps/mach/hurd/ttyname_r.c (__ttyname_r): Remove unused variable. * sysdeps/mach/hurd/getdomain.c (getdomainname): Renamed from __ name. * sysdeps/mach/hurd/reboot.c: Include . * sysdeps/mach/hurd/getdents.c: Include . * sysdeps/mach/hurd/sbrk.c: Include . * sysdeps/mach/usleep.c: Likewise. * sysdeps/mach/hurd/bind.c (bind): Add a const. * sysdeps/mach/hurd/getdents.c (__getdirentries): Use prototype defn. * sysdeps/unix/bsd/init-posix.c (__init_posix): Likewise. * sysdeps/unix/bsd/times.c (timeval_to_clock_t): Likewise. * sysdeps/mach/hurd/reboot.c (reboot): Likewise. * sysdeps/mach/usleep.c (usleep): Likewise. * sysdeps/mach/hurd/chflags.c (chflags): Likewise. * sysdeps/mach/hurd/fchflags.c (fchflags): Likewise. * sysdeps/mach/hurd/sbrk.c (__sbrk): Likewise. * sysdeps/mach/hurd/stdio_init.c (__stdio_init_stream): Likewise. 1998-08-11 Roland McGrath * sysdeps/generic/glob64.c: Include , , . (glob64): Fix typo. * malloc/malloc.c (free_check, realloc_check): Don't cast to long for %p arg to fprintf, since `void *' is the right type already. --- sysdeps/mach/hurd/bind.c | 4 ++-- sysdeps/mach/hurd/chflags.c | 6 ++---- sysdeps/mach/hurd/fchflags.c | 6 ++---- sysdeps/mach/hurd/getdents.c | 12 ++++++------ sysdeps/mach/hurd/getdomain.c | 6 +----- sysdeps/mach/hurd/reboot.c | 6 +++--- sysdeps/mach/hurd/sbrk.c | 6 +++--- sysdeps/mach/hurd/stdio_init.c | 5 ++--- sysdeps/mach/hurd/ttyname_r.c | 3 +-- sysdeps/mach/usleep.c | 15 ++++++--------- 10 files changed, 28 insertions(+), 41 deletions(-) (limited to 'sysdeps/mach') diff --git a/sysdeps/mach/hurd/bind.c b/sysdeps/mach/hurd/bind.c index 393291b94d..c24de742a4 100644 --- a/sysdeps/mach/hurd/bind.c +++ b/sysdeps/mach/hurd/bind.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1992, 94, 95, 96, 97, 98 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 @@ -37,7 +37,7 @@ bind (fd, addrarg, len) { addr_port_t aport; error_t err; - struct sockaddr_un *addr = addrarg.__sockaddr_un__; + const struct sockaddr_un *addr = addrarg.__sockaddr_un__; if (addr->sun_family == AF_LOCAL) { diff --git a/sysdeps/mach/hurd/chflags.c b/sysdeps/mach/hurd/chflags.c index ed953b6270..2fd213d323 100644 --- a/sysdeps/mach/hurd/chflags.c +++ b/sysdeps/mach/hurd/chflags.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1993, 1994, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 92, 93, 94, 97, 98 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 @@ -25,9 +25,7 @@ /* XXX shouldn't this be __chflags? */ int -chflags (file, flags) - const char *file; - int flags; +chflags (const char *file, int flags) { error_t err; file_t port = __file_name_lookup (file, 0, 0); diff --git a/sysdeps/mach/hurd/fchflags.c b/sysdeps/mach/hurd/fchflags.c index b811f6dded..42dd03db3a 100644 --- a/sysdeps/mach/hurd/fchflags.c +++ b/sysdeps/mach/hurd/fchflags.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1993, 1994, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 92, 93, 94, 97, 98 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 @@ -26,9 +26,7 @@ /* XXX should be __fchflags? */ int -fchflags (fd, flags) - int fd; - int flags; +fchflags (int fd, int flags) { error_t err; diff --git a/sysdeps/mach/hurd/getdents.c b/sysdeps/mach/hurd/getdents.c index 61b11accd1..879d25613d 100644 --- a/sysdeps/mach/hurd/getdents.c +++ b/sysdeps/mach/hurd/getdents.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1993, 1994, 1995, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1992, 93, 94, 95, 97, 98 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 @@ -22,13 +22,13 @@ #include #include #include +#include ssize_t -__getdirentries (fd, buf, nbytes, basep) - int fd; - char *buf; - size_t nbytes; - off_t *basep; +__getdirentries (int fd, + char *buf, + size_t nbytes, + off_t *basep) { error_t err; int entriesread; diff --git a/sysdeps/mach/hurd/getdomain.c b/sysdeps/mach/hurd/getdomain.c index 0f32374bd1..043d6542be 100644 --- a/sysdeps/mach/hurd/getdomain.c +++ b/sysdeps/mach/hurd/getdomain.c @@ -23,13 +23,9 @@ The result is null-terminated if LEN is large enough for the full name and the terminator. */ int -__getdomainname (name, len) - char *name; - size_t len; +getdomainname (char *name, size_t len) { /* The NIS domain name is just the contents of the file /etc/nisdomain. */ ssize_t n = _hurd_get_host_config ("/etc/nisdomain", name, len); return n < 0 ? -1 : 0; } - -weak_alias (__getdomainname, getdomainname) diff --git a/sysdeps/mach/hurd/reboot.c b/sysdeps/mach/hurd/reboot.c index 510fc552f5..ea298b2135 100644 --- a/sysdeps/mach/hurd/reboot.c +++ b/sysdeps/mach/hurd/reboot.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1993, 1994, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1992, 93, 94, 97, 98 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 @@ -20,11 +20,11 @@ #include #include #include +#include /* Reboot the system. */ int -reboot (howto) - int howto; +reboot (int howto) { error_t err; startup_t init; diff --git a/sysdeps/mach/hurd/sbrk.c b/sysdeps/mach/hurd/sbrk.c index 0fcf4a6bca..ece9b50967 100644 --- a/sysdeps/mach/hurd/sbrk.c +++ b/sysdeps/mach/hurd/sbrk.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1994, 1995, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 94, 95, 97, 98 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 @@ -18,13 +18,13 @@ #include #include +#include /* Extend the process's data space by INCREMENT. If INCREMENT is negative, shrink data space by - INCREMENT. Return the address of the start of the new data space, or -1 for errors. */ void * -__sbrk (increment) - int increment; +__sbrk (int increment) { void *result; diff --git a/sysdeps/mach/hurd/stdio_init.c b/sysdeps/mach/hurd/stdio_init.c index d353460a15..6f2cdbef9c 100644 --- a/sysdeps/mach/hurd/stdio_init.c +++ b/sysdeps/mach/hurd/stdio_init.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1997, 1998 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 @@ -29,8 +29,7 @@ If no buffer is allocated, but the bufsize is set, the bufsize will be used to allocate the buffer. */ void -__stdio_init_stream (stream) - FILE *stream; +__stdio_init_stream (FILE *stream) { struct hurd_fd *const d = stream->__cookie; struct stat statb; diff --git a/sysdeps/mach/hurd/ttyname_r.c b/sysdeps/mach/hurd/ttyname_r.c index 8a2cdd6605..cb7bf2050c 100644 --- a/sysdeps/mach/hurd/ttyname_r.c +++ b/sysdeps/mach/hurd/ttyname_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. +/* Copyright (C) 1994, 95, 96, 98 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 @@ -30,7 +30,6 @@ __ttyname_r (int fd, char *buf, size_t buflen) { error_t err; char nodename[1024]; /* XXX */ - char *cp; size_t len; nodename[0] = '\0'; diff --git a/sysdeps/mach/usleep.c b/sysdeps/mach/usleep.c index 5efed209fe..b687784552 100644 --- a/sysdeps/mach/usleep.c +++ b/sysdeps/mach/usleep.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1993, 1994, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1992, 93, 94, 97, 98 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 @@ -19,11 +19,11 @@ #include #include #include +#include /* Sleep USECONDS microseconds, or until a previously set timer goes off. */ -unsigned int -usleep (useconds) - unsigned int useconds; +void +usleep (unsigned int useconds) { mach_port_t recv; struct timeval before, after; @@ -31,13 +31,10 @@ usleep (useconds) recv = __mach_reply_port (); if (__gettimeofday (&before, NULL) < 0) - return useconds; + return; (void) __mach_msg (NULL, MACH_RCV_MSG|MACH_RCV_TIMEOUT|MACH_RCV_INTERRUPT, 0, 0, recv, (useconds + 999) / 1000, MACH_PORT_NULL); __mach_port_destroy (mach_task_self (), recv); if (__gettimeofday (&after, NULL) < 0) - return 0; - - return useconds - (((after.tv_sec - before.tv_sec) * 1000000) + - (after.tv_usec - before.tv_usec)); + return; } -- cgit v1.2.3