[src/trunk]: src/usr.bin/make Expunge last references to jobTokensFree

[dsl <dsl%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/736e668bf059
branches:  trunk
changeset: 586891:736e668bf059
user:      dsl <dsl%NetBSD.org@localhost>
date:      Wed Jan 04 21:35:44 2006 +0000

description:
Expunge last references to jobTokensFree

diffstat:

 usr.bin/make/job.h   |   3 +--
 usr.bin/make/trace.c |  10 +++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diffs (52 lines):

diff -r 5a1fa7ed9b10 -r 736e668bf059 usr.bin/make/job.h
--- a/usr.bin/make/job.h        Wed Jan 04 21:31:55 2006 +0000
+++ b/usr.bin/make/job.h        Wed Jan 04 21:35:44 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: job.h,v 1.22 2006/01/04 21:31:55 dsl Exp $     */
+/*     $NetBSD: job.h,v 1.23 2006/01/04 21:35:44 dsl Exp $     */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -276,7 +276,6 @@
 
 extern int     job_pipe[2];    /* token pipe for jobs. */
 extern int     jobTokensRunning; /* tokens currently "out" */
-extern int     jobTokensFree;  /* tokens free but not yet released to pipe */
 
 #ifdef REMOTE
 extern char    *targFmt;       /* Format string for banner that separates
diff -r 5a1fa7ed9b10 -r 736e668bf059 usr.bin/make/trace.c
--- a/usr.bin/make/trace.c      Wed Jan 04 21:31:55 2006 +0000
+++ b/usr.bin/make/trace.c      Wed Jan 04 21:35:44 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trace.c,v 1.6 2004/05/07 00:04:40 ross Exp $   */
+/*     $NetBSD: trace.c,v 1.7 2006/01/04 21:35:44 dsl Exp $    */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -38,11 +38,11 @@
 
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: trace.c,v 1.6 2004/05/07 00:04:40 ross Exp $";
+static char rcsid[] = "$NetBSD: trace.c,v 1.7 2006/01/04 21:35:44 dsl Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: trace.c,v 1.6 2004/05/07 00:04:40 ross Exp $");
+__RCSID("$NetBSD: trace.c,v 1.7 2006/01/04 21:35:44 dsl Exp $");
 #endif /* not lint */
 #endif
 
@@ -103,9 +103,9 @@
 
        gettimeofday(&rightnow, NULL);
 
-       fprintf(trfile, "%ld.%06d %d %d %s %d %s",
+       fprintf(trfile, "%ld.%06d %d %s %d %s",
            rightnow.tv_sec, (int)rightnow.tv_usec,
-           jobTokensRunning, jobTokensFree,
+           jobTokensRunning,
            evname[event], trpid, trwd);
        if (job != NULL) {
                fprintf(trfile, " %s %d %x %x", job->node->name,