aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-06-15 22:19:53 +0000
committerRoland McGrath <roland@gnu.org>2002-06-15 22:19:53 +0000
commit5b6cab3e1e9017020a5d2b3ddaab255ab50408c9 (patch)
tree7c0647b04bde5d1a55e9a0cb65a8ef07bdbc151e
parent3b9b82ec5eae6fae2e2736240f30786c905cbc61 (diff)
downloadglibc-5b6cab3e1e9017020a5d2b3ddaab255ab50408c9.zip
glibc-5b6cab3e1e9017020a5d2b3ddaab255ab50408c9.tar.gz
glibc-5b6cab3e1e9017020a5d2b3ddaab255ab50408c9.tar.bz2
* sysdeps/mach/hurd/mmap.c (__mmap): Add a dead case that quiets a
warning. * sysdeps/mach/hurd/getcwd.c (_hurd_canonicalize_directory_name_internal): unsigned int -> size_t
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/mach/hurd/getcwd.c2
-rw-r--r--sysdeps/mach/hurd/mmap.c4
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b49b6fb..5bc2ce1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2002-06-15 Roland McGrath <roland@frob.com>
+ * sysdeps/mach/hurd/mmap.c (__mmap): Add a dead case that quiets a
+ warning.
+
+ * sysdeps/mach/hurd/getcwd.c
+ (_hurd_canonicalize_directory_name_internal): unsigned int -> size_t
+
* sysdeps/unix/sysv/linux/bits/ustat.h: Moved to ...
* sysdeps/generic/bits/ustat.h: ... here (was almost identical).
diff --git a/sysdeps/mach/hurd/getcwd.c b/sysdeps/mach/hurd/getcwd.c
index 136202a..5102904 100644
--- a/sysdeps/mach/hurd/getcwd.c
+++ b/sysdeps/mach/hurd/getcwd.c
@@ -118,7 +118,7 @@ _hurd_canonicalize_directory_name_internal (file_t thisdir,
int mount_point;
file_t newp;
char *dirdata;
- unsigned int dirdatasize;
+ size_t dirdatasize;
int direntry, nentries;
diff --git a/sysdeps/mach/hurd/mmap.c b/sysdeps/mach/hurd/mmap.c
index 2d332b1..c54bc0c 100644
--- a/sysdeps/mach/hurd/mmap.c
+++ b/sysdeps/mach/hurd/mmap.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1995, 1996, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1994,95,96,97,99,2002 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
@@ -129,6 +129,8 @@ __mmap (__ptr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
return (__ptr_t) (long int) __hurd_fail (EACCES);
}
break;
+ default: /* impossible */
+ return 0;
}
break;
/* XXX handle MAP_NOEXTEND */