Skip to content

Commit

Permalink
[BZ #2883]
Browse files Browse the repository at this point in the history
	* sysvipc/sys/msg.h: Change return value to ssize_t.
	* sysdeps/unix/sysv/linux/msgrcv.c: Likewise.
  • Loading branch information
Ulrich Drepper committed Aug 3, 2006
1 parent 39571a1 commit a585280
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
3 changes: 3 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
2006-08-03 Ulrich Drepper <[email protected]>

[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.
Expand Down
1 change: 1 addition & 0 deletions grp/initgroups.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
02111-1307 USA. */

#include <alloca.h>
#include <assert.h>
#include <errno.h>
#include <grp.h>
#include <limits.h>
Expand Down
8 changes: 4 additions & 4 deletions sysdeps/unix/sysv/linux/msgrcv.c
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>, August 1995.
Expand Down Expand Up @@ -35,7 +35,7 @@ struct ipc_kludge
};


int
ssize_t
__libc_msgrcv (msqid, msgp, msgsz, msgtyp, msgflg)
int msqid;
void *msgp;
Expand All @@ -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);

Expand Down
6 changes: 3 additions & 3 deletions sysvipc/sys/msg.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit a585280

Please sign in to comment.