[src/trunk]: src/usr.bin/make make(1): format source code in JobStart and Job...

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

details:   https://anonhg.NetBSD.org/src/rev/c03677df0d76
branches:  trunk
changeset: 956802:c03677df0d76
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Nov 08 01:07:00 2020 +0000

description:
make(1): format source code in JobStart and JobDoOutput

diffstat:

 usr.bin/make/job.c |  19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diffs (73 lines):

diff -r e758e8d20deb -r c03677df0d76 usr.bin/make/job.c
--- a/usr.bin/make/job.c        Sun Nov 08 01:00:25 2020 +0000
+++ b/usr.bin/make/job.c        Sun Nov 08 01:07:00 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: job.c,v 1.312 2020/11/08 01:00:25 rillig Exp $ */
+/*     $NetBSD: job.c,v 1.313 2020/11/08 01:07:00 rillig Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -143,7 +143,7 @@
 #include "trace.h"
 
 /*     "@(#)job.c      8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: job.c,v 1.312 2020/11/08 01:00:25 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.313 2020/11/08 01:07:00 rillig Exp $");
 
 /* A shell defines how the commands are run.  All commands for a target are
  * written into a single file, which is then given to the shell to execute
@@ -1533,7 +1533,7 @@
      * we just set the file to be stdout. Cute, huh?
      */
     if (((gn->type & OP_MAKE) && !opts.noRecursiveExecute) ||
-           (!opts.noExecute && !opts.touchFlag)) {
+       (!opts.noExecute && !opts.touchFlag)) {
        /*
         * tfile is the name of a file into which all shell commands are
         * put. It is removed before the child shell is executed, unless
@@ -1553,13 +1553,13 @@
        JobSigLock(&mask);
        tfd = mkTempFile(TMPPAT, &tfile);
        if (!DEBUG(SCRIPT))
-               (void)eunlink(tfile);
+           (void)eunlink(tfile);
        JobSigUnlock(&mask);
 
        job->cmdFILE = fdopen(tfd, "w+");
-       if (job->cmdFILE == NULL) {
+       if (job->cmdFILE == NULL)
            Punt("Could not fdopen %s", tfile);
-       }
+
        (void)fcntl(fileno(job->cmdFILE), F_SETFD, FD_CLOEXEC);
        /*
         * Send the commands to the command file, flush all its buffers then
@@ -1570,9 +1570,8 @@
 #ifdef USE_META
        if (useMeta) {
            meta_job_start(job, gn);
-           if (Targ_Silent(gn)) {      /* might have changed */
+           if (Targ_Silent(gn))        /* might have changed */
                job->flags |= JOB_SILENT;
-           }
        }
 #endif
        /*
@@ -1619,7 +1618,7 @@
         * up the graph.
         */
        job->cmdFILE = stdout;
-       Job_Touch(gn, job->flags&JOB_SILENT);
+       Job_Touch(gn, job->flags & JOB_SILENT);
        noExec = TRUE;
     }
     /* Just in case it isn't already... */
@@ -1749,7 +1748,7 @@
     fbuf = FALSE;
 
     nRead = read(job->inPipe, &job->outBuf[job->curPos],
-                    JOB_BUFSIZE - job->curPos);
+                JOB_BUFSIZE - job->curPos);
     if (nRead < 0) {
        if (errno == EAGAIN)
            return;