From 32968566bdffd96990e4925eb37a4f26f3dbcf6a Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Tue, 7 Apr 2009 18:59:53 +0200
Subject: [PATCH] pw(8): setgrent()'s return type is void.

---
 usr.sbin/pw/pw_vpw.c |  5 +----
 usr.sbin/pw/pwupd.h  | 10 ++--------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/usr.sbin/pw/pw_vpw.c b/usr.sbin/pw/pw_vpw.c
index b0789e4fa7..de7a9611c5 100644
--- a/usr.sbin/pw/pw_vpw.c
+++ b/usr.sbin/pw/pw_vpw.c
@@ -188,13 +188,10 @@ vendgrent(void)
 	}
 }
 
-RET_SETGRENT
+void
 vsetgrent(void)
 {
 	vendgrent();
-#if defined(__DragonFly__)
-	return 0;
-#endif
 }
 
 static struct group *
diff --git a/usr.sbin/pw/pwupd.h b/usr.sbin/pw/pwupd.h
index 29e7cebf83..7c890a5637 100644
--- a/usr.sbin/pw/pwupd.h
+++ b/usr.sbin/pw/pwupd.h
@@ -36,12 +36,6 @@
 
 #include <sys/cdefs.h>
 
-#if defined(__DragonFly__)
-#define	RET_SETGRENT	int
-#else
-#define	RET_SETGRENT	void
-#endif
-
 enum updtype
 {
         UPD_DELETE = -1,
@@ -70,7 +64,7 @@ struct pwf
 	struct passwd	* (*_getpwuid)(uid_t uid);
 	struct passwd	* (*_getpwnam)(const char * nam);
 	int             (*_pwdb)(char *arg, ...);
-	RET_SETGRENT	  (*_setgrent)(void);
+	void		  (*_setgrent)(void);
 	void		  (*_endgrent)(void);
 	struct group  * (*_getgrent)(void);
 	struct group  * (*_getgrgid)(gid_t gid);
@@ -147,7 +141,7 @@ struct group * vgetgrgid(gid_t gid);
 struct group * vgetgrnam(const char * nam);
 struct group * vgetgrent(void);
 int	       vgrdb(char *arg, ...);
-RET_SETGRENT   vsetgrent(void);
+void           vsetgrent(void);
 void           vendgrent(void);
 
 void copymkdir(char const * dir, char const * skel, mode_t mode, uid_t uid, gid_t gid);
-- 
2.11.4.GIT