Module Name: src
Committed By: rillig
Date: Sun Sep 27 23:56:25 UTC 2020
Modified Files:
src/usr.bin/make: job.c
Log Message:
make(1): in JobCreatePipe, use descriptive field names
To generate a diff of this commit:
cvs rdiff -u -r1.247 -r1.248 src/usr.bin/make/job.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/job.c
diff -u src/usr.bin/make/job.c:1.247 src/usr.bin/make/job.c:1.248
--- src/usr.bin/make/job.c:1.247 Sun Sep 27 23:52:02 2020
+++ src/usr.bin/make/job.c Sun Sep 27 23:56:25 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.247 2020/09/27 23:52:02 rillig Exp $ */
+/* $NetBSD: job.c,v 1.248 2020/09/27 23:56:25 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.247 2020/09/27 23:52:02 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.248 2020/09/27 23:56:25 rillig Exp $");
# define STATIC static
@@ -415,9 +415,9 @@ JobCreatePipe(Job *job, int minfd)
}
/* Set close-on-exec flag for both */
- if (fcntl(job->jobPipe[0], F_SETFD, FD_CLOEXEC) == -1)
+ if (fcntl(job->inPipe, F_SETFD, FD_CLOEXEC) == -1)
Punt("Cannot set close-on-exec: %s", strerror(errno));
- if (fcntl(job->jobPipe[1], F_SETFD, FD_CLOEXEC) == -1)
+ if (fcntl(job->outPipe, F_SETFD, FD_CLOEXEC) == -1)
Punt("Cannot set close-on-exec: %s", strerror(errno));
/*
@@ -426,11 +426,11 @@ JobCreatePipe(Job *job, int minfd)
* race for the token when a new one becomes available, so the read
* from the pipe should not block.
*/
- flags = fcntl(job->jobPipe[0], F_GETFL, 0);
+ flags = fcntl(job->inPipe, F_GETFL, 0);
if (flags == -1)
Punt("Cannot get flags: %s", strerror(errno));
flags |= O_NONBLOCK;
- if (fcntl(job->jobPipe[0], F_SETFL, flags) == -1)
+ if (fcntl(job->inPipe, F_SETFL, flags) == -1)
Punt("Cannot set flags: %s", strerror(errno));
}
