diff options
| author |   espie <espie@openbsd.org> | 2020-01-13 15:15:17 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2020-01-13 15:15:17 +0000 |
| commit | 80ccc038b13678f164e2469490eff5d64893c8c3 (patch) | |
| tree | ad94f9cbff409ce778551cefbe07e9594c96def8 /usr.bin/make | |
| parent | introduce a JOB_KEEPERROR flag so that the logic for moving jobs (diff) | |
| download | wireguard-openbsd-80ccc038b13678f164e2469490eff5d64893c8c3.tar.xz wireguard-openbsd-80ccc038b13678f164e2469490eff5d64893c8c3.zip | |
less confusing function name
Diffstat (limited to 'usr.bin/make')
| -rw-r--r-- | usr.bin/make/engine.c | 4 | ||||
| -rw-r--r-- | usr.bin/make/make.c | 4 | ||||
| -rw-r--r-- | usr.bin/make/make.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/make/engine.c b/usr.bin/make/engine.c index bee614624d6..c73a3998b3d 100644 --- a/usr.bin/make/engine.c +++ b/usr.bin/make/engine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: engine.c,v 1.65 2020/01/13 15:12:58 espie Exp $ */ +/* $OpenBSD: engine.c,v 1.66 2020/01/13 15:15:17 espie Exp $ */ /* * Copyright (c) 2012 Marc Espie. * @@ -803,7 +803,7 @@ do_run_command(Job *job, const char *pre) * and there's nothing left to do. */ if (random_delay) - if (!(runningJobs == NULL && no_jobs_left())) + if (!(runningJobs == NULL && nothing_left_to_build())) usleep(arc4random_uniform(random_delay)); run_command(cmd, errCheck); /*NOTREACHED*/ diff --git a/usr.bin/make/make.c b/usr.bin/make/make.c index e408ec7fa64..b47520be739 100644 --- a/usr.bin/make/make.c +++ b/usr.bin/make/make.c @@ -1,4 +1,4 @@ -/* $OpenBSD: make.c,v 1.78 2020/01/13 14:05:21 espie Exp $ */ +/* $OpenBSD: make.c,v 1.79 2020/01/13 15:15:17 espie Exp $ */ /* $NetBSD: make.c,v 1.10 1996/11/06 17:59:15 christos Exp $ */ /* @@ -119,7 +119,7 @@ static bool randomize_queue; long random_delay = 0; bool -no_jobs_left() +nothing_left_to_build() { return Array_IsEmpty(&to_build); } diff --git a/usr.bin/make/make.h b/usr.bin/make/make.h index 91839fb5533..ab3a0370ac1 100644 --- a/usr.bin/make/make.h +++ b/usr.bin/make/make.h @@ -1,7 +1,7 @@ #ifndef _MAKE_H_ #define _MAKE_H_ -/* $OpenBSD: make.h,v 1.38 2010/07/19 19:46:44 espie Exp $ */ +/* $OpenBSD: make.h,v 1.39 2020/01/13 15:15:17 espie Exp $ */ /* $NetBSD: make.h,v 1.15 1997/03/10 21:20:00 christos Exp $ */ /* @@ -43,6 +43,6 @@ extern void Make_Update(GNode *); extern bool Make_Run(Lst); extern long random_delay; -extern bool no_jobs_left(void); +extern bool nothing_left_to_build(void); #endif /* _MAKE_H_ */ |