aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2005-12-29 10:38:16 +0000
committerRoland McGrath <roland@gnu.org>2005-12-29 10:38:16 +0000
commit8ad684db49bf9dc109c409cac38f744e3fa260c7 (patch)
tree85546bf32fa60dcf4fbb2b8b6bce9c3c313c3cb1
parentfc0c638f9d70a8436e060922159f94049884ecf9 (diff)
downloadglibc-8ad684db49bf9dc109c409cac38f744e3fa260c7.zip
glibc-8ad684db49bf9dc109c409cac38f744e3fa260c7.tar.gz
glibc-8ad684db49bf9dc109c409cac38f744e3fa260c7.tar.bz2
* sysdeps/posix/libc_fatal.c (__libc_message): Add a const, a cast.
* hurd/lookup-retry.c (__hurd_file_name_lookup_retry): Fix cast. * hurd/report-wait.c (_S_msg_report_wait): Likewise. * include/sys/xattr.h: New file.
-rw-r--r--ChangeLog9
-rw-r--r--hurd/lookup-retry.c4
-rw-r--r--hurd/report-wait.c2
-rw-r--r--sysdeps/posix/libc_fatal.c7
4 files changed, 16 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index d8c575e..afe77cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-12-29 Roland McGrath <roland@frob.com>
+
+ * sysdeps/posix/libc_fatal.c (__libc_message): Add a const, a cast.
+
+ * hurd/lookup-retry.c (__hurd_file_name_lookup_retry): Fix cast.
+ * hurd/report-wait.c (_S_msg_report_wait): Likewise.
+
+ * include/sys/xattr.h: New file.
+
2005-12-28 Roland McGrath <roland@redhat.com>
* hurd/sigunwind.c: Include <stdint.h>.
diff --git a/hurd/lookup-retry.c b/hurd/lookup-retry.c
index 1f53f91..0a886229 100644
--- a/hurd/lookup-retry.c
+++ b/hurd/lookup-retry.c
@@ -1,5 +1,5 @@
/* hairy bits of Hurd file name lookup
- Copyright (C) 1992,1993,1994,1995,1996,1997,1999,2001,2002,2003
+ Copyright (C) 1992,1993,1994,1995,1996,1997,1999,2001,2002,2003,2005
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -247,7 +247,7 @@ __hurd_file_name_lookup_retry (error_t (*use_init_port)
char *p;
/* XXX want client's host */
if (err = __host_info (__mach_host_self (), HOST_BASIC_INFO,
- (natural_t *) &hostinfo,
+ (integer_t *) &hostinfo,
&hostinfocnt))
return err;
if (hostinfocnt != HOST_BASIC_INFO_COUNT)
diff --git a/hurd/report-wait.c b/hurd/report-wait.c
index da0ca3b..296b2ee 100644
--- a/hurd/report-wait.c
+++ b/hurd/report-wait.c
@@ -140,7 +140,7 @@ _S_msg_report_wait (mach_port_t msgport, thread_t thread,
error_t err;
err = __thread_get_state (thread, MACHINE_THREAD_STATE_FLAVOR,
- (integer_t *) &state, &count);
+ (natural_t *) &state, &count);
if (err)
return err;
assert (count == MACHINE_THREAD_STATE_COUNT);
diff --git a/sysdeps/posix/libc_fatal.c b/sysdeps/posix/libc_fatal.c
index 9dfac68..c611b84 100644
--- a/sysdeps/posix/libc_fatal.c
+++ b/sysdeps/posix/libc_fatal.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1993,1994,1995,1997,2000,2004 Free Software Foundation, Inc.
+/* Copyright (C) 1993,1994,1995,1997,2000,2004,2005
+ 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
@@ -73,7 +74,7 @@ __libc_message (int do_abort, const char *fmt, ...)
while (*cp != '\0')
{
/* Find the next "%s" or the end of the string. */
- char *next = cp;
+ const char *next = cp;
while (next[0] != '%' || next[1] != 's')
{
next = __strchrnul (next + 1, '%');
@@ -114,7 +115,7 @@ __libc_message (int do_abort, const char *fmt, ...)
for (int cnt = nlist - 1; cnt >= 0; --cnt)
{
- iov[cnt].iov_base = list->str;
+ iov[cnt].iov_base = (char *) list->str;
iov[cnt].iov_len = list->len;
total += list->len;
list = list->next;