aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1998-08-11 21:52:02 +0000
committerRoland McGrath <roland@gnu.org>1998-08-11 21:52:02 +0000
commitd6765f1da60acf05871ce09164416eaba58d324f (patch)
tree5e59336c60b8740e500f93023c3610cc69cc6001
parentb5876a19ce099c5d13ffab17f160c4ad4bee64d1 (diff)
downloadglibc-d6765f1da60acf05871ce09164416eaba58d324f.tar
glibc-d6765f1da60acf05871ce09164416eaba58d324f.tar.gz
glibc-d6765f1da60acf05871ce09164416eaba58d324f.tar.bz2
glibc-d6765f1da60acf05871ce09164416eaba58d324f.zip
1998-08-12 Roland McGrath <roland@baalperazim.frob.com>
* sysdeps/mach/usleep.c: Include <unistd.h>. (usleep): Return void. 1998-08-11 Roland McGrath <roland@baalperazim.frob.com> * 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 <sys/reboot.h>. * sysdeps/mach/hurd/getdents.c: Include <unistd.h>. * sysdeps/mach/hurd/sbrk.c: Include <unistd.h>. * 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 <roland@baalperazim.frob.com> * sysdeps/generic/glob64.c: Include <sys/types.h>, <glob.h>, <errno.h>. (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.
-rw-r--r--ChangeLog39
-rw-r--r--malloc/malloc.c4
-rw-r--r--sysdeps/generic/glob64.c6
-rw-r--r--sysdeps/generic/if_index.c3
-rw-r--r--sysdeps/mach/hurd/bind.c4
-rw-r--r--sysdeps/mach/hurd/chflags.c6
-rw-r--r--sysdeps/mach/hurd/fchflags.c6
-rw-r--r--sysdeps/mach/hurd/getdents.c12
-rw-r--r--sysdeps/mach/hurd/getdomain.c6
-rw-r--r--sysdeps/mach/hurd/reboot.c6
-rw-r--r--sysdeps/mach/hurd/sbrk.c6
-rw-r--r--sysdeps/mach/hurd/stdio_init.c5
-rw-r--r--sysdeps/mach/hurd/ttyname_r.c3
-rw-r--r--sysdeps/mach/usleep.c15
-rw-r--r--sysdeps/unix/bsd/init-posix.c4
-rw-r--r--sysdeps/unix/bsd/times.c5
16 files changed, 80 insertions, 50 deletions
diff --git a/ChangeLog b/ChangeLog
index cbe40b0848..c5c5faa924 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,42 @@
+1998-08-12 Roland McGrath <roland@baalperazim.frob.com>
+
+ * sysdeps/mach/usleep.c: Include <unistd.h>.
+ (usleep): Return void.
+
+1998-08-11 Roland McGrath <roland@baalperazim.frob.com>
+
+ * 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 <sys/reboot.h>.
+ * sysdeps/mach/hurd/getdents.c: Include <unistd.h>.
+ * sysdeps/mach/hurd/sbrk.c: Include <unistd.h>.
+ * 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 <roland@baalperazim.frob.com>
+
+ * sysdeps/generic/glob64.c: Include <sys/types.h>, <glob.h>, <errno.h>.
+ (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.
+
1998-07-25 19:47 Jose M. Moya <josem@gnu.org>
* sysdeps/mach/hurd/getcwd.c
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 76a0b00b4e..3bf4910651 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -4330,7 +4330,7 @@ free_check(mem, caller) Void_t* mem; const Void_t *caller;
(void)mutex_unlock(&main_arena.mutex);
switch(check_action) {
case 1:
- fprintf(stderr, "free(): invalid pointer %p!\n", (long)(mem));
+ fprintf(stderr, "free(): invalid pointer %p!\n", mem);
break;
case 2:
abort();
@@ -4369,7 +4369,7 @@ realloc_check(oldmem, bytes, caller)
(void)mutex_unlock(&main_arena.mutex);
switch(check_action) {
case 1:
- fprintf(stderr, "realloc(): invalid pointer %p!\n", (long)(oldmem));
+ fprintf(stderr, "realloc(): invalid pointer %p!\n", oldmem);
break;
case 2:
abort();
diff --git a/sysdeps/generic/glob64.c b/sysdeps/generic/glob64.c
index 6e1b835f8d..72c2a807be 100644
--- a/sysdeps/generic/glob64.c
+++ b/sysdeps/generic/glob64.c
@@ -16,6 +16,10 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#include <sys/types.h>
+#include <glob.h>
+#include <errno.h>
+
/* Do glob searching for PATTERN, placing results in PGLOB.
The bits defined above may be set in FLAGS.
If a directory cannot be opened or read and ERRFUNC is not nil,
@@ -26,7 +30,7 @@
Otherwise, `glob' returns zero. */
int
glob64 (const char *pattern, int flags,
- int (*errfunc) (const char *, int), glib64_t *pglob);
+ int (*errfunc) (const char *, int), glob64_t *pglob)
{
if (pattern == NULL || pglob == NULL || (flags & ~__GLOB_FLAGS) != 0)
{
diff --git a/sysdeps/generic/if_index.c b/sysdeps/generic/if_index.c
index c7022d8b07..9ef4e1e810 100644
--- a/sysdeps/generic/if_index.c
+++ b/sysdeps/generic/if_index.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997 Free Software Foundation, Inc.
+/* Copyright (C) 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
@@ -36,6 +36,7 @@ if_indextoname (unsigned int ifindex, char *ifname)
}
stub_warning (if_indextoname)
+struct if_nameindex; /* inhibit warning */
void
if_freenameindex (struct if_nameindex *ifn)
{
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 <hurd.h>
#include <hurd/fd.h>
#include <string.h>
+#include <unistd.h>
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 <unistd.h>
#include <hurd.h>
#include <hurd/startup.h>
+#include <sys/reboot.h>
/* 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 <errno.h>
#include <hurd.h>
+#include <unistd.h>
/* 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 <errno.h>
#include <mach.h>
#include <sys/time.h>
+#include <unistd.h>
/* 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;
}
diff --git a/sysdeps/unix/bsd/init-posix.c b/sysdeps/unix/bsd/init-posix.c
index 91797c483b..94eff68a99 100644
--- a/sysdeps/unix/bsd/init-posix.c
+++ b/sysdeps/unix/bsd/init-posix.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
@@ -25,7 +25,7 @@
time_t _posix_start_time = -1;
void
-__init_posix ()
+__init_posix (void)
{
_posix_start_time = time ((time_t *) NULL);
}
diff --git a/sysdeps/unix/bsd/times.c b/sysdeps/unix/bsd/times.c
index c2e1656a9b..18add51063 100644
--- a/sysdeps/unix/bsd/times.c
+++ b/sysdeps/unix/bsd/times.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 93, 95, 96, 97 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 93, 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
@@ -30,8 +30,7 @@ extern time_t _posix_start_time;
__inline
#endif
static clock_t
-timeval_to_clock_t (tv)
- const struct timeval *tv;
+timeval_to_clock_t (const struct timeval *tv)
{
return (clock_t) ((tv->tv_sec * CLK_TCK) +
(tv->tv_usec * CLK_TCK / 1000000L));