summaryrefslogtreecommitdiffstats
path: root/lib/libc/gen/getgrent.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libc/gen/getgrent.c')
-rw-r--r--lib/libc/gen/getgrent.c55
1 files changed, 17 insertions, 38 deletions
diff --git a/lib/libc/gen/getgrent.c b/lib/libc/gen/getgrent.c
index bd432fc9897..1d157d679e2 100644
--- a/lib/libc/gen/getgrent.c
+++ b/lib/libc/gen/getgrent.c
@@ -29,7 +29,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getgrent.c,v 1.19 2003/06/02 20:18:34 millert Exp $";
+static char rcsid[] = "$OpenBSD: getgrent.c,v 1.20 2004/05/18 02:05:52 jfb Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -80,7 +80,7 @@ static int __ypcurrentlen;
#endif
struct group *
-getgrent()
+getgrent(void)
{
struct group *p_gr = (struct group*)_THREAD_PRIVATE(gr, _gr_group, NULL);
struct group_storage *gs = (struct group_storage *)_THREAD_PRIVATE(gr_storage,
@@ -94,10 +94,7 @@ getgrent()
}
static struct group *
-getgrnam_gs(name, p_gr, gs)
- const char *name;
- struct group *p_gr;
- struct group_storage *gs;
+getgrnam_gs(const char *name, struct group *p_gr, struct group_storage *gs)
{
int rval;
@@ -114,8 +111,7 @@ getgrnam_gs(name, p_gr, gs)
}
struct group *
-getgrnam(name)
- const char *name;
+getgrnam(const char *name)
{
struct group *p_gr = (struct group*)_THREAD_PRIVATE(gr,_gr_group,NULL);
struct group_storage *gs = (struct group_storage *)_THREAD_PRIVATE(gr_storage,
@@ -125,12 +121,8 @@ getgrnam(name)
}
int
-getgrnam_r(name, grp, buffer, bufsize, result)
- const char *name;
- struct group *grp;
- char *buffer;
- size_t bufsize;
- struct group **result;
+getgrnam_r(const char *name, struct group *grp, char *buffer,
+ size_t bufsize, struct group **result)
{
int errnosave;
int ret;
@@ -148,10 +140,7 @@ getgrnam_r(name, grp, buffer, bufsize, result)
}
static struct group *
-getgrgid_gs(gid, p_gr, gs)
- gid_t gid;
- struct group *p_gr;
- struct group_storage *gs;
+getgrgid_gs(gid_t gid, struct group *p_gr, struct group_storage *gs)
{
int rval;
@@ -168,8 +157,7 @@ getgrgid_gs(gid, p_gr, gs)
}
struct group *
-getgrgid(gid)
- gid_t gid;
+getgrgid(gid_t gid)
{
struct group *p_gr = (struct group*)_THREAD_PRIVATE(gr, _gr_group, NULL);
struct group_storage *gs = (struct group_storage *)_THREAD_PRIVATE(gr_storage,
@@ -179,12 +167,8 @@ getgrgid(gid)
}
int
-getgrgid_r(gid, grp, buffer, bufsize, result)
- gid_t gid;
- struct group *grp;
- char *buffer;
- size_t bufsize;
- struct group **result;
+getgrgid_r(gid_t gid, struct group *grp, char *buffer, size_t bufsize,
+ struct group **result)
{
int errnosave;
int ret;
@@ -202,7 +186,7 @@ getgrgid_r(gid, grp, buffer, bufsize, result)
}
static int
-start_gr()
+start_gr(void)
{
if (_gr_fp) {
rewind(_gr_fp);
@@ -218,14 +202,13 @@ start_gr()
}
void
-setgrent()
+setgrent(void)
{
(void) setgroupent(0);
}
int
-setgroupent(stayopen)
- int stayopen;
+setgroupent(int stayopen)
{
int retval;
@@ -242,7 +225,7 @@ setgroupent(stayopen)
static
void
-endgrent_basic()
+endgrent_basic(void)
{
if (_gr_fp) {
(void)fclose(_gr_fp);
@@ -257,7 +240,7 @@ endgrent_basic()
}
void
-endgrent()
+endgrent(void)
{
_THREAD_PRIVATE_MUTEX_LOCK(gr);
endgrent_basic();
@@ -265,12 +248,8 @@ endgrent()
}
static int
-grscan(search, gid, name, p_gr, gs)
- register int search;
- register gid_t gid;
- register const char *name;
- struct group *p_gr;
- struct group_storage *gs;
+grscan(int search, gid_t gid, const char *name, struct group *p_gr,
+ struct group_storage *gs)
{
register char *cp, **m;
char *bp, *endp;