diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-08-07 19:28:26 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2006-08-07 19:28:26 +0000 |
| commit | 503d6a958581777473c31f73113d0fa6cff19b30 (patch) | |
| tree | c8526f0403ac272cba94213a3c5b10a369876d78 /sysdeps | |
| parent | 98d2266156a49df5f93726c8f0b148bbdee41c9d (diff) | |
| download | glibc-503d6a958581777473c31f73113d0fa6cff19b30.tar.gz glibc-503d6a958581777473c31f73113d0fa6cff19b30.tar.xz glibc-503d6a958581777473c31f73113d0fa6cff19b30.zip | |
Updated to fedora-glibc-20060807T1859 cvs/fedora-glibc-2_4_90-18
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/unix/sysv/linux/gethostid.c | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/msgrcv.c | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/sysdeps/unix/sysv/linux/gethostid.c b/sysdeps/unix/sysv/linux/gethostid.c index f44a9afbf2..de98fb3d7b 100644 --- a/sysdeps/unix/sysv/linux/gethostid.c +++ b/sysdeps/unix/sysv/linux/gethostid.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1995,1996,1998-2001,2003,2004 Free Software Foundation, Inc. +/* Copyright (C) 1995,1996,1998-2001,2003,2004,2006 + 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 @@ -24,7 +25,6 @@ #include <not-cancel.h> #define HOSTIDFILE "/etc/hostid" -#define OLD_HOSTIDFILE "/etc/hostid" #ifdef SET_PROCEDURE int @@ -81,8 +81,6 @@ gethostid () /* First try to get the ID from a former invocation of sethostid. */ fd = open_not_cancel (HOSTIDFILE, O_RDONLY|O_LARGEFILE, 0); - if (fd < 0) - fd = open_not_cancel (OLD_HOSTIDFILE, O_RDONLY|O_LARGEFILE, 0); if (fd >= 0) { ssize_t n = read_not_cancel (fd, &id, sizeof (id)); diff --git a/sysdeps/unix/sysv/linux/msgrcv.c b/sysdeps/unix/sysv/linux/msgrcv.c index 7d8a8e7859..71e7c7aea5 100644 --- a/sysdeps/unix/sysv/linux/msgrcv.c +++ b/sysdeps/unix/sysv/linux/msgrcv.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1997, 1998, 2000, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1995,1997,1998,2000,2002,2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995. @@ -35,7 +35,7 @@ struct ipc_kludge }; -int +ssize_t __libc_msgrcv (msqid, msgp, msgsz, msgtyp, msgflg) int msqid; void *msgp; @@ -56,8 +56,8 @@ __libc_msgrcv (msqid, msgp, msgsz, msgtyp, msgflg) int oldtype = LIBC_CANCEL_ASYNC (); - int result = INLINE_SYSCALL (ipc, 5, IPCOP_msgrcv, msqid, msgsz, msgflg, - __ptrvalue (&tmp)); + ssize_t result = INLINE_SYSCALL (ipc, 5, IPCOP_msgrcv, msqid, msgsz, msgflg, + __ptrvalue (&tmp)); LIBC_CANCEL_RESET (oldtype); |