svn commit: r238470 - head/bin/sh
Jilles Tjoelker
jilles at FreeBSD.org
Sun Jul 15 10:49:17 UTC 2012
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);
More information about the svn-src-head
mailing list