From 242652fe24866cb16f778ff1c7bffcb48c7f1138 Mon Sep 17 00:00:00 2001 From: dtucker Date: Thu, 10 Nov 2005 04:56:44 +0000 Subject: [PATCH] - (dtucker) [openbsd-compat/getgrouplist.c] Sync OpenBSD revs 1.10 - 1.2 (ANSI prototypes, removal of "register"). --- ChangeLog | 2 ++ openbsd-compat/getgrouplist.c | 15 ++++----------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index f39b7c3c..17267c32 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,8 @@ Patch from djm@. - (dtucker) [configure.ac] Disable pointer-sign warnings on gcc 4.0+ since they're not useful right now. Patch from djm@. + - (dtucker) [openbsd-compat/getgrouplist.c] Sync OpenBSD revs 1.10 - 1.2 (ANSI + prototypes, removal of "register"). 20051105 - (djm) OpenBSD CVS Sync diff --git a/openbsd-compat/getgrouplist.c b/openbsd-compat/getgrouplist.c index 59c164f4..2a2b8878 100644 --- a/openbsd-compat/getgrouplist.c +++ b/openbsd-compat/getgrouplist.c @@ -1,5 +1,6 @@ /* OPENBSD ORIGINAL: lib/libc/gen/getgrouplist.c */ +/* $OpenBSD: getgrouplist.c,v 1.12 2005/08/08 08:05:34 espie Exp $ */ /* * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. @@ -33,10 +34,6 @@ #ifndef HAVE_GETGROUPLIST -#if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: getgrouplist.c,v 1.9 2003/06/25 21:16:47 deraadt Exp $"; -#endif /* LIBC_SCCS and not lint */ - /* * get credential */ @@ -46,14 +43,10 @@ static char rcsid[] = "$OpenBSD: getgrouplist.c,v 1.9 2003/06/25 21:16:47 deraad #include int -getgrouplist(uname, agroup, groups, grpcnt) - const char *uname; - gid_t agroup; - register gid_t *groups; - int *grpcnt; +getgrouplist(const char *uname, gid_t agroup, gid_t *groups, int *grpcnt) { - register struct group *grp; - register int i, ngroups; + struct group *grp; + int i, ngroups; int ret, maxgroups; int bail; -- 2.45.1