From owner-svn-src-all@FreeBSD.ORG  Sun May 10 09:23:04 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 150C6CBE;
 Sun, 10 May 2015 09:23:04 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 037021617;
 Sun, 10 May 2015 09:23:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4A9N30r011655;
 Sun, 10 May 2015 09:23:03 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4A9N3cT011654;
 Sun, 10 May 2015 09:23:03 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201505100923.t4A9N3cT011654@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 10 May 2015 09:23:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r282713 - head/usr.sbin/pw
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 10 May 2015 09:23:04 -0000

Author: bapt
Date: Sun May 10 09:23:03 2015
New Revision: 282713
URL: https://svnweb.freebsd.org/changeset/base/282713

Log:
  The pwdb function is only used once to check the database rename it
  pwdb_check and simplify it accordingly

Modified:
  head/usr.sbin/pw/pwupd.c

Modified: head/usr.sbin/pw/pwupd.c
==============================================================================
--- head/usr.sbin/pw/pwupd.c	Sun May 10 09:11:12 2015	(r282712)
+++ head/usr.sbin/pw/pwupd.c	Sun May 10 09:23:03 2015	(r282713)
@@ -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 cons
 	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)