d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make shellPath and shellName static - they're used in job.c only.

Browse Source 
Move definition of parsing error levels from make.h into parse.h.

Patches:	7.202,7.203
Submitted by:	Max Okumoto <okumoto@ucsd.edu>
This commit is contained in:
Hartmut Brandt 2005-05-10 14:06:19 +00:00
parent 43ad410a92
commit 9a910e11d1
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/make/job.c
View File

@ -386,8 +386,8 @@ static const struct CShell shells[] = {
* It is set by the Job_ParseShell function.
*/
static struct Shell *commandShell = NULL;
char *shellPath = NULL; /* full pathname of executable image */
char *shellName = NULL; /* last component of shell */
static char *shellPath = NULL; /* full pathname of executable image */
static char *shellName = NULL; /* last component of shell */
int maxJobs; /* The most children we can run at once */
static int nJobs; /* The number of children currently running */

2
usr.bin/make/job.h
View File

@ -56,8 +56,6 @@ struct Buffer;
struct GNode;
struct Lst;
extern char *shellPath;
extern char *shellName;
extern int maxJobs; /* Number of jobs that may run */
void Shell_Init(void);

8
usr.bin/make/make.h
View File

@ -108,14 +108,6 @@ struct Lst;
*/
#define OP_NOP(t) (((t) & OP_OPMASK) == 0x00000000)
/*
* Error levels for parsing. PARSE_FATAL means the process cannot continue
* once the makefile has been parsed. PARSE_WARNING means it can. Passed
* as the first argument to Parse_Error.
*/
#define PARSE_WARNING 2
#define PARSE_FATAL 1
/*
* Definitions for the "local" variables. Used only for clarity.
*/

8
usr.bin/make/parse.h
View File

@ -48,6 +48,14 @@
struct GNode;
struct Lst;
/*
* Error levels for parsing. PARSE_FATAL means the process cannot continue
* once the makefile has been parsed. PARSE_WARNING means it can. Passed
* as the first argument to Parse_Error.
*/
#define PARSE_WARNING 2
#define PARSE_FATAL 1
void Parse_Error(int, const char *, ...);
Boolean Parse_AnyExport(void);
Boolean Parse_IsVar(char *);