Date: Tue, 17 Nov 2009 16:26:46 +0000 (UTC) From: "David E. O'Brien" <obrien@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r199404 - head/usr.bin/make Message-ID: <200911171626.nAHGQkxO021550@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: obrien Date: Tue Nov 17 16:26:45 2009 New Revision: 199404 URL: http://svn.freebsd.org/changeset/base/199404 Log: Garbage collect some old #ifdef'ed code from 1994 that causes vi's '%' to be unable to find a match in Path_FindFile(). Modified: head/usr.bin/make/dir.c head/usr.bin/make/job.c Modified: head/usr.bin/make/dir.c ============================================================================== --- head/usr.bin/make/dir.c Tue Nov 17 16:18:03 2009 (r199403) +++ head/usr.bin/make/dir.c Tue Nov 17 16:26:45 2009 (r199404) @@ -832,21 +832,6 @@ Path_FindFile(char *name, struct Path *p * 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 *p DEBUGF(DIR, ("failed. Returning NULL\n")); return (NULL); } -#endif /* notdef */ } /*- Modified: head/usr.bin/make/job.c ============================================================================== --- head/usr.bin/make/job.c Tue Nov 17 16:18:03 2009 (r199403) +++ head/usr.bin/make/job.c Tue Nov 17 16:26:45 2009 (r199404) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911171626.nAHGQkxO021550>