summaryrefslogtreecommitdiffstats
path: root/usr.bin/make
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2009-11-17 16:26:45 +0000
committerobrien <obrien@FreeBSD.org>2009-11-17 16:26:45 +0000
commitee88dde1cb193dd055765cf54b3558e2853e11fa (patch)
tree4c4d2f3d84ad261facd80d1bf5c8907886bda81a /usr.bin/make
parent7b642517df2ee2c6cb82eb5cd127c7afe7309dc7 (diff)
downloadFreeBSD-src-ee88dde1cb193dd055765cf54b3558e2853e11fa.zip
FreeBSD-src-ee88dde1cb193dd055765cf54b3558e2853e11fa.tar.gz
Garbage collect some old #ifdef'ed code from 1994 that causes vi's '%'
to be unable to find a match in Path_FindFile().
Diffstat (limited to 'usr.bin/make')
-rw-r--r--usr.bin/make/dir.c16
-rw-r--r--usr.bin/make/job.c11
2 files changed, 0 insertions, 27 deletions
diff --git a/usr.bin/make/dir.c b/usr.bin/make/dir.c
index c66b2bf..c509df6 100644
--- a/usr.bin/make/dir.c
+++ b/usr.bin/make/dir.c
@@ -832,21 +832,6 @@ Path_FindFile(char *name, struct Path *path)
* When searching for $(FILE), we will find it in $(INSTALLDIR)
* b/c we added it here. This is not good...
*/
-#ifdef notdef
- cp[-1] = '\0';
- Path_AddDir(path, name);
- cp[-1] = '/';
-
- bigmisses += 1;
- pe = TAILQ_LAST(path, Path);
- if (pe == NULL)
- return (NULL);
-
- if (Hash_FindEntry(&pe->dir->files, cp) != NULL) {
- return (estrdup(name));
-
- return (NULL);
-#else /* !notdef */
DEBUGF(DIR, ("Looking for \"%s\"...", name));
bigmisses += 1;
@@ -864,7 +849,6 @@ Path_FindFile(char *name, struct Path *path)
DEBUGF(DIR, ("failed. Returning NULL\n"));
return (NULL);
}
-#endif /* notdef */
}
/*-
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c
index 9453bdc..3d9240a 100644
--- a/usr.bin/make/job.c
+++ b/usr.bin/make/job.c
@@ -1008,17 +1008,6 @@ JobFinish(Job *job, int *status)
if (!(job->flags & JOB_CONTINUING)) {
DEBUGF(JOB, ("Warning: process %jd was not "
"continuing.\n", (intmax_t) job->pid));
-#ifdef notdef
- /*
- * We don't really want to restart a
- * job from scratch just because it
- * continued, especially not without
- * killing the continuing process!
- * That's why this is ifdef'ed out.
- * FD - 9/17/90
- */
- JobRestart(job);
-#endif
}
job->flags &= ~JOB_CONTINUING;
TAILQ_INSERT_TAIL(&jobs, job, link);
OpenPOWER on IntegriCloud