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

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

Patches:	7.202,7.203
Submitted by:	Max Okumoto <okumoto@ucsd.edu>

4 files changed, 10 insertions, 12 deletions

diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c
index b1c1134..55def8e 100644
--- a/usr.bin/make/job.c
+++ b/usr.bin/make/job.c
@@ -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 */
diff --git a/usr.bin/make/job.h b/usr.bin/make/job.h
index f2628c3..987b5fd 100644
--- a/usr.bin/make/job.h
+++ b/usr.bin/make/job.h
@@ -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);
diff --git a/usr.bin/make/make.h b/usr.bin/make/make.h
index 513b63d..4ad10bb 100644
--- a/usr.bin/make/make.h
+++ b/usr.bin/make/make.h
@@ -109,14 +109,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.
  */
 #define	TARGET	  	  "@" 	/* Target of dependency */
diff --git a/usr.bin/make/parse.h b/usr.bin/make/parse.h
index 7917440..dd5cd81 100644
--- a/usr.bin/make/parse.h
+++ b/usr.bin/make/parse.h
@@ -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 *);