From owner-svn-src-head@FreeBSD.ORG  Sun Jul 15 10:49:17 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C0E1E1065670;
	Sun, 15 Jul 2012 10:49:17 +0000 (UTC)
	(envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AC1778FC14;
	Sun, 15 Jul 2012 10:49:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6FAnHbZ042781;
	Sun, 15 Jul 2012 10:49:17 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6FAnHNN042778;
	Sun, 15 Jul 2012 10:49:17 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201207151049.q6FAnHNN042778@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Sun, 15 Jul 2012 10:49:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238470 - head/bin/sh
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sun, 15 Jul 2012 10:49:17 -0000

Author: jilles
Date: Sun Jul 15 10:49:16 2012
New Revision: 238470
URL: http://svn.freebsd.org/changeset/base/238470

Log:
  sh: Remove unused variable in_dowait.

Modified:
  head/bin/sh/jobs.c
  head/bin/sh/jobs.h

Modified: head/bin/sh/jobs.c
==============================================================================
--- head/bin/sh/jobs.c	Sun Jul 15 10:22:13 2012	(r238469)
+++ head/bin/sh/jobs.c	Sun Jul 15 10:49:16 2012	(r238470)
@@ -84,7 +84,6 @@ static struct job *jobmru;	/* most recen
 static pid_t initialpgrp;	/* pgrp of shell on invocation */
 #endif
 int in_waitcmd = 0;		/* are we in waitcmd()? */
-int in_dowait = 0;		/* are we in dowait()? */
 volatile sig_atomic_t breakwaitcmd = 0;	/* should wait be terminated? */
 static int ttyfd = -1;
 
@@ -1023,14 +1022,12 @@ dowait(int block, struct job *job)
 	int sig;
 	int coredump;
 
-	in_dowait++;
 	TRACE(("dowait(%d) called\n", block));
 	do {
 		pid = waitproc(block, &status);
 		TRACE(("wait returns %d, status=%d\n", (int)pid, status));
 	} while ((pid == -1 && errno == EINTR && breakwaitcmd == 0) ||
 		 (pid > 0 && WIFSTOPPED(status) && !iflag));
-	in_dowait--;
 	if (pid == -1 && errno == ECHILD && job != NULL)
 		job->state = JOBDONE;
 	if (breakwaitcmd != 0) {

Modified: head/bin/sh/jobs.h
==============================================================================
--- head/bin/sh/jobs.h	Sun Jul 15 10:22:13 2012	(r238469)
+++ head/bin/sh/jobs.h	Sun Jul 15 10:49:16 2012	(r238470)
@@ -84,7 +84,6 @@ enum {
 
 extern int job_warning;		/* user was warned about stopped jobs */
 extern int in_waitcmd;		/* are we in waitcmd()? */
-extern int in_dowait;		/* are we in dowait()? */
 extern volatile sig_atomic_t breakwaitcmd; /* break wait to process traps? */
 
 void setjobctl(int);