From owner-svn-src-head@freebsd.org  Mon Aug  3 06:06:57 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E41B399C385;
 Mon,  3 Aug 2015 06:06:57 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 CF9C81A1A;
 Mon,  3 Aug 2015 06:06:57 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t7366vjs040600;
 Mon, 3 Aug 2015 06:06:57 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t7366vBn040599;
 Mon, 3 Aug 2015 06:06:57 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201508030606.t7366vBn040599@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 3 Aug 2015 06:06:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r286218 - 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-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Aug 2015 06:06:58 -0000

Author: bapt
Date: Mon Aug  3 06:06:56 2015
New Revision: 286218
URL: https://svnweb.freebsd.org/changeset/base/286218

Log:
  Fix bugs spotted by gcc
  
  Reported by:	adrian

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

Modified: head/usr.sbin/pw/pw_user.c
==============================================================================
--- head/usr.sbin/pw/pw_user.c	Mon Aug  3 05:59:30 2015	(r286217)
+++ head/usr.sbin/pw/pw_user.c	Mon Aug  3 06:06:56 2015	(r286218)
@@ -700,7 +700,7 @@ pw_user_show(int argc, char **argv, char
 {
 	struct passwd *pwd = NULL;
 	char *name = NULL;
-	uid_t id = -1;
+	intmax_t id = -1;
 	int ch;
 	bool all = false;
 	bool pretty = false;
@@ -786,7 +786,7 @@ pw_user_del(int argc, char **argv, char 
 	char home[MAXPATHLEN];
 	const char *cfg = NULL;
 	struct stat st;
-	uid_t id;
+	intmax_t id = -1;
 	int ch, rc;
 	bool nis = false;
 	bool deletehome = false;
@@ -1423,8 +1423,9 @@ pw_user_mod(int argc, char **argv, char 
 	int ch, fd = -1;
 	size_t i, j;
 	bool quiet, createhome, pretty, dryrun, nis, edited, docreatehome;
+	bool precrypted;
 	mode_t homemode = 0;
-	time_t expire_days, password_days, now, precrypted;
+	time_t expire_days, password_days, now;
 
 	expire_days = password_days = -1;
 	gecos = homedir = grname = name = newname = skel = shell =NULL;