From 35ddfb6d6c8c9b50507936e4ac89408e4792de54 Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 10 May 2015 09:23:03 +0000
Subject: [PATCH] The pwdb function is only used once to check the database
 rename it pwdb_check and simplify it accordingly

---
 usr.sbin/pw/pwupd.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/usr.sbin/pw/pwupd.c b/usr.sbin/pw/pwupd.c
index 51d732ee3cc6..710e901cb061 100644
--- a/usr.sbin/pw/pwupd.c
+++ b/usr.sbin/pw/pwupd.c
@@ -33,7 +33,6 @@ static const char rcsid[] =
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <stdarg.h>
 #include <pwd.h>
 #include <libutil.h>
 #include <errno.h>
@@ -72,19 +71,15 @@ getpwpath(char const * file)
 }
 
 static int
-pwdb(char *arg,...)
+pwdb_check(void)
 {
 	int             i = 0;
 	pid_t           pid;
-	va_list         ap;
 	char           *args[10];
 
 	args[i++] = _PATH_PWD_MKDB;
-	va_start(ap, arg);
-	while (i < 6 && arg != NULL) {
-		args[i++] = arg;
-		arg = va_arg(ap, char *);
-	}
+	args[i++] = "-C";
+
 	if (pwpath != pathpwd) {
 		args[i++] = "-d";
 		args[i++] = pwpath;
@@ -102,7 +97,6 @@ pwdb(char *arg,...)
 		if (WEXITSTATUS(i))
 			i = EIO;
 	}
-	va_end(ap);
 
 	return (i);
 }
@@ -114,7 +108,7 @@ pw_update(struct passwd * pwd, char const * user)
 	struct passwd	*old_pw = NULL;
 	int		 rc, pfd, tfd;
 
-	if ((rc = pwdb("-C", NULL)) != 0)
+	if ((rc = pwdb_check()) != 0)
 		return (rc);
 
 	if (pwd != NULL)