[src/trunk]: src/usr.bin/make make(1): use proper enum constants for aborting...

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

details:   https://anonhg.NetBSD.org/src/rev/43a19a795b28
branches:  trunk
changeset: 956334:43a19a795b28
user:      rillig <rillig%NetBSD.org@localhost>
date:      Mon Oct 26 23:19:17 2020 +0000

description:
make(1): use proper enum constants for aborting, instead of 0

diffstat:

 usr.bin/make/job.c |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (63 lines):

diff -r 14bae0106bfb -r 43a19a795b28 usr.bin/make/job.c
--- a/usr.bin/make/job.c        Mon Oct 26 22:51:56 2020 +0000
+++ b/usr.bin/make/job.c        Mon Oct 26 23:19:17 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: job.c,v 1.291 2020/10/26 22:51:56 rillig Exp $ */
+/*     $NetBSD: job.c,v 1.292 2020/10/26 23:19:17 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.291 2020/10/26 22:51:56 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.292 2020/10/26 23:19:17 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
@@ -1637,7 +1637,7 @@
         * We only want to work our way up the graph if we aren't here because
         * the commands for the job were no good.
         */
-       if (cmdsOK && aborting == 0) {
+       if (cmdsOK && aborting == ABORT_NONE) {
            JobSaveCommands(job);
            job->node->made = MADE;
            Make_Update(job->node);
@@ -2122,7 +2122,7 @@
     job_table_end = job_table + opts.maxJobs;
     wantToken =        0;
 
-    aborting = 0;
+    aborting = ABORT_NONE;
     errors = 0;
 
     lastNode = NULL;
@@ -2168,7 +2168,7 @@
 #define ADDSIG(s,h)                            \
     if (bmake_signal(s, SIG_IGN) != SIG_IGN) { \
        sigaddset(&caught_signals, s);          \
-       (void)bmake_signal(s, h);                       \
+       (void)bmake_signal(s, h);               \
     }
 
     /*
@@ -2520,7 +2520,7 @@
     while (jobTokensRunning != 0) {
        Job_CatchOutput();
     }
-    aborting = 0;
+    aborting = ABORT_NONE;
 }
 
 /* Abort all currently running jobs without handling output or anything.
@@ -2730,7 +2730,7 @@
     DEBUG3(JOB, "Job_TokenWithdraw(%d): aborting %d, running %d\n",
           getpid(), aborting, jobTokensRunning);
 
-    if (aborting || (jobTokensRunning >= opts.maxJobs))
+    if (aborting != ABORT_NONE || (jobTokensRunning >= opts.maxJobs))
        return FALSE;
 
     count = read(tokenWaitJob.inPipe, &tok, 1);