Thu Aug 27 06:18:23 2020 UTC ()
make(1): remove unused declarations from job.h


(rillig)
diff -r1.45 -r1.46 src/usr.bin/make/job.h
cvs diff -r1.45 -r1.46 src/usr.bin/make/job.h (expand / switch to unified diff)

--- src/usr.bin/make/job.h 2020/08/22 08:01:34 1.45
+++ src/usr.bin/make/job.h 2020/08/27 06:18:22 1.46
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: job.h,v 1.45 2020/08/22 08:01:34 rillig Exp $ */ 1/* $NetBSD: job.h,v 1.46 2020/08/27 06:18:22 rillig Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. 4 * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to Berkeley by 7 * This code is derived from software contributed to Berkeley by
8 * Adam de Boor. 8 * Adam de Boor.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -153,27 +153,27 @@ typedef struct Job { @@ -153,27 +153,27 @@ typedef struct Job {
153#define JOB_ST_SETUP 1 /* Job is allocated but otherwise invalid */ 153#define JOB_ST_SETUP 1 /* Job is allocated but otherwise invalid */
154#define JOB_ST_RUNNING 3 /* Job is running, pid valid */ 154#define JOB_ST_RUNNING 3 /* Job is running, pid valid */
155#define JOB_ST_FINISHED 4 /* Job is done (ie after SIGCHILD) */ 155#define JOB_ST_FINISHED 4 /* Job is done (ie after SIGCHILD) */
156 char job_suspended; 156 char job_suspended;
157 short flags; /* Flags to control treatment of job */ 157 short flags; /* Flags to control treatment of job */
158#define JOB_IGNERR 0x001 /* Ignore non-zero exits */ 158#define JOB_IGNERR 0x001 /* Ignore non-zero exits */
159#define JOB_SILENT 0x002 /* no output */ 159#define JOB_SILENT 0x002 /* no output */
160#define JOB_SPECIAL 0x004 /* Target is a special one. i.e. run it locally 160#define JOB_SPECIAL 0x004 /* Target is a special one. i.e. run it locally
161 * if we can't export it and maxLocal is 0 */ 161 * if we can't export it and maxLocal is 0 */
162#define JOB_IGNDOTS 0x008 /* Ignore "..." lines when processing 162#define JOB_IGNDOTS 0x008 /* Ignore "..." lines when processing
163 * commands */ 163 * commands */
164#define JOB_TRACED 0x400 /* we've sent 'set -x' */ 164#define JOB_TRACED 0x400 /* we've sent 'set -x' */
165 165
166 int jobPipe[2]; /* Pipe for readind output from job */ 166 int jobPipe[2]; /* Pipe for reading output from job */
167 struct pollfd *inPollfd; /* pollfd associated with inPipe */ 167 struct pollfd *inPollfd; /* pollfd associated with inPipe */
168 char outBuf[JOB_BUFSIZE + 1]; 168 char outBuf[JOB_BUFSIZE + 1];
169 /* Buffer for storing the output of the 169 /* Buffer for storing the output of the
170 * job, line by line */ 170 * job, line by line */
171 int curPos; /* Current position in op_outBuf */ 171 int curPos; /* Current position in op_outBuf */
172 172
173#ifdef USE_META 173#ifdef USE_META
174 struct BuildMon bm; 174 struct BuildMon bm;
175#endif 175#endif
176} Job; 176} Job;
177 177
178#define inPipe jobPipe[0] 178#define inPipe jobPipe[0]
179#define outPipe jobPipe[1] 179#define outPipe jobPipe[1]
@@ -240,33 +240,30 @@ typedef struct Shell { @@ -240,33 +240,30 @@ typedef struct Shell {
240} Shell; 240} Shell;
241 241
242extern const char *shellPath; 242extern const char *shellPath;
243extern const char *shellName; 243extern const char *shellName;
244extern char *shellErrFlag; 244extern char *shellErrFlag;
245 245
246extern int jobTokensRunning; /* tokens currently "out" */ 246extern int jobTokensRunning; /* tokens currently "out" */
247extern int maxJobs; /* Max jobs we can run */ 247extern int maxJobs; /* Max jobs we can run */
248 248
249void Shell_Init(void); 249void Shell_Init(void);
250const char *Shell_GetNewline(void); 250const char *Shell_GetNewline(void);
251void Job_Touch(GNode *, Boolean); 251void Job_Touch(GNode *, Boolean);
252Boolean Job_CheckCommands(GNode *, void (*abortProc )(const char *, ...)); 252Boolean Job_CheckCommands(GNode *, void (*abortProc )(const char *, ...));
253#define CATCH_BLOCK 1 
254void Job_CatchChildren(void); 253void Job_CatchChildren(void);
255void Job_CatchOutput(void); 254void Job_CatchOutput(void);
256void Job_Make(GNode *); 255void Job_Make(GNode *);
257void Job_Init(void); 256void Job_Init(void);
258Boolean Job_Full(void); 
259Boolean Job_Empty(void); 257Boolean Job_Empty(void);
260ReturnStatus Job_ParseShell(char *); 258ReturnStatus Job_ParseShell(char *);
261int Job_Finish(void); 259int Job_Finish(void);
262void Job_End(void); 260void Job_End(void);
263void Job_Wait(void); 261void Job_Wait(void);
264void Job_AbortAll(void); 262void Job_AbortAll(void);
265void JobFlagForMigration(int); 
266void Job_TokenReturn(void); 263void Job_TokenReturn(void);
267Boolean Job_TokenWithdraw(void); 264Boolean Job_TokenWithdraw(void);
268void Job_ServerStart(int, int, int); 265void Job_ServerStart(int, int, int);
269void Job_SetPrefix(void); 266void Job_SetPrefix(void);
270Boolean Job_RunTarget(const char *, const char *); 267Boolean Job_RunTarget(const char *, const char *);
271 268
272#endif /* MAKE_JOB_H */ 269#endif /* MAKE_JOB_H */