From owner-svn-src-head@FreeBSD.ORG  Wed Jul 16 10:37:05 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B653F5E8;
 Wed, 16 Jul 2014 10:37:05 +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 A401C2879;
 Wed, 16 Jul 2014 10:37:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6GAb5mi003612;
 Wed, 16 Jul 2014 10:37:05 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6GAb5vB003611;
 Wed, 16 Jul 2014 10:37:05 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201407161037.s6GAb5vB003611@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 16 Jul 2014 10:37:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r268747 - head/usr.bin/timeout
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.18
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: Wed, 16 Jul 2014 10:37:05 -0000

Author: bapt
Date: Wed Jul 16 10:37:05 2014
New Revision: 268747
URL: http://svnweb.freebsd.org/changeset/base/268747

Log:
  Fix build with gcc

Modified:
  head/usr.bin/timeout/timeout.c

Modified: head/usr.bin/timeout/timeout.c
==============================================================================
--- head/usr.bin/timeout/timeout.c	Wed Jul 16 10:34:55 2014	(r268746)
+++ head/usr.bin/timeout/timeout.c	Wed Jul 16 10:37:05 2014	(r268747)
@@ -102,11 +102,11 @@ static int
 parse_signal(const char *str)
 {
 	int sig, i;
-	const char *err;
+	const char *errstr;
 
-	sig = strtonum(str, 0, sys_nsig, &err);
+	sig = strtonum(str, 0, sys_nsig, &errstr);
 
-	if (err == NULL)
+	if (errstr == NULL)
 		return (sig);
 	if (strncasecmp(str, "SIG", 3) == 0)
 		str += 3;
@@ -166,7 +166,6 @@ main(int argc, char **argv)
 	int foreground, preserve;
 	int error, pstat, status;
 	int killsig = SIGTERM;
-	int killedwith;
 	pid_t pgid, pid, cpid;
 	double first_kill;
 	double second_kill;
@@ -186,6 +185,7 @@ main(int argc, char **argv)
 	foreground = preserve = 0;
 	second_kill = 0;
 	cpid = -1;
+	pgid = -1;
 
 	struct option longopts[] = {
 		{ "preserve-status", no_argument,       &preserve,    1 },
@@ -273,7 +273,6 @@ main(int argc, char **argv)
 	sigemptyset(&signals.sa_mask);
 
 	for (;;) {
-		killedwith = killsig;
 		sigemptyset(&signals.sa_mask);
 		sigsuspend(&signals.sa_mask);