diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2006-08-03 15:41:32 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2006-08-03 15:41:32 +0000 |
| commit | a585280778ec20039b6cf400e4a052a89341c6c7 (patch) | |
| tree | add8f3f64a80a4e21b3f178f85a4f11643977a79 | |
| parent | 39571a1360afca37d7b9a4343eed90f4aadb4f90 (diff) | |
| download | glibc-a585280778ec20039b6cf400e4a052a89341c6c7.tar.gz | |
[BZ #2883]
* sysvipc/sys/msg.h: Change return value to ssize_t.
* sysdeps/unix/sysv/linux/msgrcv.c: Likewise.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | grp/initgroups.c | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/msgrcv.c | 8 | ||||
| -rw-r--r-- | sysvipc/sys/msg.h | 6 |
4 files changed, 11 insertions, 7 deletions
@@ -1,5 +1,8 @@ 2006-08-03 Ulrich Drepper <drepper@redhat.com> + [BZ #2883] + * sysvipc/sys/msg.h: Change return value to ssize_t. + * sysdeps/unix/sysv/linux/msgrcv.c: Likewise. * grp/initgroups.c (internal_getgrouplist): Remove unnecessary test introduced in patch for bz #661. diff --git a/grp/initgroups.c b/grp/initgroups.c index 883ea71680..2e489463df 100644 --- a/grp/initgroups.c +++ b/grp/initgroups.c @@ -17,6 +17,7 @@ 02111-1307 USA. */ #include <alloca.h> +#include <assert.h> #include <errno.h> #include <grp.h> #include <limits.h> 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); diff --git a/sysvipc/sys/msg.h b/sysvipc/sys/msg.h index 1fd64b2ac0..b22c07678a 100644 --- a/sysvipc/sys/msg.h +++ b/sysvipc/sys/msg.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1995,1996,1997,1999,2000,2003 Free Software Foundation, Inc. +/* Copyright (C) 1995-1997,1999,2000,2003,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 @@ -66,8 +66,8 @@ extern int msgget (key_t __key, int __msgflg) __THROW; This function is a cancellation point and therefore not marked with __THROW. */ -extern int msgrcv (int __msqid, void *__msgp, size_t __msgsz, - long int __msgtyp, int __msgflg); +extern ssize_t msgrcv (int __msqid, void *__msgp, size_t __msgsz, + long int __msgtyp, int __msgflg); /* Send message to message queue. |