Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simplify

This commit is contained in:
christos 2016-04-03 01:49:51 +00:00
parent cfc738154f
commit eb687c986e
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/libc/gen/waitid.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: waitid.c,v 1.1 2016/04/03 00:19:42 christos Exp $ */
/* $NetBSD: waitid.c,v 1.2 2016/04/03 01:49:51 christos Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__RCSID("$NetBSD: waitid.c,v 1.1 2016/04/03 00:19:42 christos Exp $");
__RCSID("$NetBSD: waitid.c,v 1.2 2016/04/03 01:49:51 christos Exp $");
#include "namespace.h"
#include <sys/types.h>
@ -40,10 +40,6 @@ __RCSID("$NetBSD: waitid.c,v 1.1 2016/04/03 00:19:42 christos Exp $");
#include <string.h>
#include <signal.h>
#ifdef __weak_alias
__weak_alias(waitpid,_waitpid)
#endif
#ifdef __weak_alias
__weak_alias(waitid,_waitid)
#endif
@ -52,15 +48,15 @@ int
waitid(idtype_t idtype, id_t id, siginfo_t *info, int flags)
{
int status;
pid_t rv;
rv = wait6(idtype, id, &status, flags, NULL, info);
if (rv < 0)
return rv;
if (rv == 0 && info != NULL)
switch (wait6(idtype, id, &status, flags, NULL, info)) {
case -1:
return -1;
case 0:
if (info != NULL)
memset(info, 0, sizeof(*info));
/*FALLTHROUGH*/
default:
return 0;
}
}