43c43
< __FBSDID("$FreeBSD: head/usr.bin/make/job.c 138232 2004-11-30 17:46:29Z harti $");
---
> __FBSDID("$FreeBSD: head/usr.bin/make/job.c 138264 2004-12-01 10:29:20Z harti $");
331c331
< Job *job = (Job *)jobp;
---
> Job *job = jobp;
365c365
< Lst_ForEach(jobs, JobCondPassSig, (void *)&signo);
---
> Lst_ForEach(jobs, JobCondPassSig, &signo);
404c404
< Lst_ForEach(jobs, JobCondPassSig, (void *)&signo);
---
> Lst_ForEach(jobs, JobCondPassSig, &signo);
428a429
>
474,475c475,476
< char *cmd = (char *)cmdp;
< Job *job = (Job *)jobp;
---
> char *cmd = cmdp;
> Job *job = jobp;
482,483c483
< job->tailCmds = Lst_Succ(Lst_Member(job->node->commands,
< (void *)cmd));
---
> job->tailCmds = Lst_Succ(Lst_Member(job->node->commands, cmd));
500c500
< cmdNode = Lst_Member(job->node->commands, (void *)cmd);
---
> cmdNode = Lst_Member(job->node->commands, cmd);
502c502
< Lst_Replace(cmdNode, (void *)cmdStart);
---
> Lst_Replace(cmdNode, cmdStart);
607c607
< if (!shutUp && !(job->flags & JOB_SILENT) && commandShell->hasEchoCtl){
---
> if (!shutUp && !(job->flags & JOB_SILENT) && commandShell->hasEchoCtl) {
637c637
< cmd = (void *)Var_Subst(NULL, (char *)cmd, (GNode *)gn, FALSE);
---
> cmd = Var_Subst(NULL, cmd, gn, FALSE);
794c794
< Lst_AtEnd(stoppedJobs, (void *)job);
---
> Lst_AtEnd(stoppedJobs, job);
823c823
< Lst_AtEnd(jobs, (void *)job);
---
> Lst_AtEnd(jobs, job);
889,890c889
< JobSaveCommand,
< (void *)job->node);
---
> JobSaveCommand, job->node);
941c940
< if (gn->type & (OP_JOIN|OP_USE|OP_EXEC|OP_OPTIONAL)) {
---
> if (gn->type & (OP_JOIN | OP_USE | OP_EXEC | OP_OPTIONAL)) {
1200c1199
< Lst_AtEnd(jobs, (void *)job);
---
> Lst_AtEnd(jobs, job);
1391c1390
< job = (Job *)emalloc(sizeof(Job));
---
> job = emalloc(sizeof(Job));
1472,1473c1471
< JobPrintCommand((void *)Lst_Datum(ln),
< (void *)job))
---
> JobPrintCommand(Lst_Datum(ln), job))
1498c1496
< Lst_ForEach(gn->commands, JobPrintCommand, (void *)job);
---
> Lst_ForEach(gn->commands, JobPrintCommand, job);
1524c1522
< Lst_ForEach(gn->commands, JobPrintCommand, (void *)job);
---
> Lst_ForEach(gn->commands, JobPrintCommand, job);
1538c1536
< Job_Touch(gn, job->flags&JOB_SILENT);
---
> Job_Touch(gn, job->flags & JOB_SILENT);
1564,1565c1562
< JobSaveCommand,
< (void *)job->node);
---
> JobSaveCommand, job->node);
1622c1619
< Lst_AtEnd(stoppedJobs, (void *)job);
---
> Lst_AtEnd(stoppedJobs, job);
1720d1716
<
1857,1858c1853,1854
< fprintf(stdout, "Results of making %s:\n", job->node->name);
< fflush(stdout);
---
> fprintf(stdout, "Results of making %s:\n", job->node->name);
> fflush(stdout);
1881,1882c1877,1878
< fclose(oFILE);
< eunlink(job->outFile);
---
> fclose(oFILE);
> eunlink(job->outFile);
1927c1923
< jnode = Lst_Find(jobs, (void *)&pid, JobCmpPid);
---
> jnode = Lst_Find(jobs, &pid, JobCmpPid);
1931c1927
< jnode = Lst_Find(stoppedJobs, (void *)&pid, JobCmpPid);
---
> jnode = Lst_Find(stoppedJobs, &pid, JobCmpPid);
1936c1932
< job = (Job *)Lst_Datum(jnode);
---
> job = Lst_Datum(jnode);
1943c1939
< job = (Job *)Lst_Datum(jnode);
---
> job = Lst_Datum(jnode);
2029,2030c2025,2026
< nfds = select(FD_SETSIZE, &readfds, (fd_set *) 0,
< (fd_set *) 0, &timeout);
---
> nfds = select(FD_SETSIZE, &readfds, (fd_set *)NULL,
> (fd_set *)NULL, &timeout);
2044c2040
< job = (Job *)Lst_Datum(ln);
---
> job = Lst_Datum(ln);
2214c2210
< /*The master make does not get a magic token */
---
> /* The master make does not get a magic token */
2313c2309
< JobStart(begin, JOB_SPECIAL, (Job *)0);
---
> JobStart(begin, JOB_SPECIAL, (Job *)NULL);
2646c2642
< job = (Job *)Lst_Datum(ln);
---
> job = Lst_Datum(ln);
2672c2668
< JobStart(interrupt, JOB_IGNDOTS, (Job *)0);
---
> JobStart(interrupt, JOB_IGNDOTS, (Job *)NULL);
2766d2761
<
2769c2764
< job = (Job *)Lst_Datum(ln);
---
> job = Lst_Datum(ln);
2807c2802
< JobRestart((Job *)Lst_DeQueue(stoppedJobs));
---
> JobRestart(Lst_DeQueue(stoppedJobs));