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

Make sure machine is initialize before use. Also make two pointers const

Browse Source 
to get rid of the last two const warnings.
This commit is contained in:
Hartmut Brandt 2005-05-12 15:54:52 +00:00
parent fac1e7a589
commit 2c050ec33f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usr.bin/make/main.c
View File

@ -662,8 +662,9 @@ main(int argc, char **argv)
const char *machine_arch;
const char *machine_cpu;
Boolean outOfDate = TRUE; /* FALSE if all targets up to date */
char *p, *p1, *pathp;
char *path;
char *p, *p1;
const char *pathp;
const char *path;
char mdpath[MAXPATHLEN];
char obpath[MAXPATHLEN];
char cdpath[MAXPATHLEN];
@ -721,7 +722,7 @@ main(int argc, char **argv)
* __FreeBSD_version was defined as 300003. So, this check can
* safely be done with any kernel with version > 300003.
*/
if (!machine) {
if ((machine = getenv("MACHINE")) == NULL) {
int ispc98;
size_t len;
@ -740,7 +741,7 @@ main(int argc, char **argv)
* Note that while MACHINE is decided at run-time,
* MACHINE_ARCH is always known at compile time.
*/
if ((machine = getenv("MACHINE")) == NULL) {
if (machine == NULL) {
#ifdef MACHINE
machine = MACHINE;
#else