diff options
| author |   espie <espie@openbsd.org> | 2020-01-13 14:56:59 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2020-01-13 14:56:59 +0000 |
| commit | 3bb9adb9cad1ebf418c20de47a003a36540c3d69 (patch) | |
| tree | 21f00ce9a98b2575c004b416c9a333437faddb6c | |
| parent | simplify the way we account for different jobs: (diff) | |
| download | wireguard-openbsd-3bb9adb9cad1ebf418c20de47a003a36540c3d69.tar.xz wireguard-openbsd-3bb9adb9cad1ebf418c20de47a003a36540c3d69.zip | |
better name for function
| -rw-r--r-- | usr.bin/make/engine.c | 4 | ||||
| -rw-r--r-- | usr.bin/make/engine.h | 6 | ||||
| -rw-r--r-- | usr.bin/make/job.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/make/engine.c b/usr.bin/make/engine.c index 45cd390d33f..2e492c81272 100644 --- a/usr.bin/make/engine.c +++ b/usr.bin/make/engine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: engine.c,v 1.63 2020/01/13 14:51:50 espie Exp $ */ +/* $OpenBSD: engine.c,v 1.64 2020/01/13 14:56:59 espie Exp $ */ /* * Copyright (c) 2012 Marc Espie. * @@ -615,7 +615,7 @@ job_attach_node(Job *job, GNode *node) } void -job_handle_status(Job *job, int status) +handle_job_status(Job *job, int status) { bool silent; int dying; diff --git a/usr.bin/make/engine.h b/usr.bin/make/engine.h index 69572b09391..495b8fbe7eb 100644 --- a/usr.bin/make/engine.h +++ b/usr.bin/make/engine.h @@ -1,6 +1,6 @@ #ifndef ENGINE_H #define ENGINE_H -/* $OpenBSD: engine.h,v 1.14 2019/12/21 15:29:25 espie Exp $ */ +/* $OpenBSD: engine.h,v 1.15 2020/01/13 14:56:59 espie Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -131,10 +131,10 @@ extern void job_attach_node(Job *, GNode *); */ extern bool job_run_next(Job *); -/* job_handle_status(job, waitstatus): +/* handle_job_status(job, waitstatus): * process a wait return value corresponding to a job, display * messages and set job status accordingly. */ -extern void job_handle_status(Job *, int); +extern void handle_job_status(Job *, int); #endif diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c index ece5b323c5d..d7c2fb82cff 100644 --- a/usr.bin/make/job.c +++ b/usr.bin/make/job.c @@ -1,4 +1,4 @@ -/* $OpenBSD: job.c,v 1.148 2020/01/13 14:51:50 espie Exp $ */ +/* $OpenBSD: job.c,v 1.149 2020/01/13 14:57:00 espie Exp $ */ /* $NetBSD: job.c,v 1.16 1996/11/06 17:59:08 christos Exp $ */ /* @@ -808,7 +808,7 @@ reap_jobs(void) if (job == NULL) { Punt("Child (%ld) not in table?", (long)pid); } else { - job_handle_status(job, status); + handle_job_status(job, status); determine_job_next_step(job); } may_continue_heldback_jobs(); @@ -866,7 +866,7 @@ handle_one_job(Job *job) sigsuspend(&emptyset); } runningJobs = NULL; - job_handle_status(job, status); + handle_job_status(job, status); sigprocmask(SIG_SETMASK, &old, NULL); } |