summaryrefslogtreecommitdiff
path: root/usr.bin/make/make.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin/make/make.c')
-rw-r--r--usr.bin/make/make.c22
1 files changed, 9 insertions, 13 deletions
diff --git a/usr.bin/make/make.c b/usr.bin/make/make.c
index 6d6bffad38b..c0fe1372015 100644
--- a/usr.bin/make/make.c
+++ b/usr.bin/make/make.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: make.c,v 1.6 1997/04/28 01:52:38 millert Exp $ */
+/* $OpenBSD: make.c,v 1.7 1998/12/05 00:06:28 espie Exp $ */
/* $NetBSD: make.c,v 1.10 1996/11/06 17:59:15 christos Exp $ */
/*
@@ -43,7 +43,7 @@
#if 0
static char sccsid[] = "@(#)make.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: make.c,v 1.6 1997/04/28 01:52:38 millert Exp $";
+static char rcsid[] = "$OpenBSD: make.c,v 1.7 1998/12/05 00:06:28 espie Exp $";
#endif
#endif /* not lint */
@@ -129,7 +129,7 @@ MakeTimeStamp (pgn, cgn)
ClientData pgn; /* the current parent */
ClientData cgn; /* the child we've just examined */
{
- return (Make_TimeStamp((GNode *) pgn, (GNode *) cgn));
+ return Make_TimeStamp((GNode *) pgn, (GNode *) cgn);
}
/*-
@@ -376,7 +376,7 @@ MakeHandleUse (pgn, cgn)
ClientData pgn; /* the current parent */
ClientData cgn; /* the child we've just examined */
{
- return (Make_HandleUse((GNode *) pgn, (GNode *) cgn));
+ return Make_HandleUse((GNode *) pgn, (GNode *) cgn);
}
/*-
@@ -414,8 +414,7 @@ Make_Update (cgn)
char *p1;
cname = Var_Value (TARGET, cgn, &p1);
- if (p1)
- free(p1);
+ efree(p1);
/*
* If the child was actually made, see what its modification time is
@@ -544,8 +543,7 @@ Make_Update (cgn)
Var_Set (PREFIX, cpref, pgn);
}
}
- if (p1)
- free(p1);
+ efree(p1);
Lst_Close (cgn->iParents);
}
}
@@ -616,8 +614,7 @@ MakeAddAllSrc (cgnp, pgnp)
*/
Var_Append(OODATE, child, pgn);
}
- if (p1)
- free(p1);
+ efree(p1);
}
return (0);
}
@@ -660,8 +657,7 @@ Make_DoAllVar (gn)
if (gn->type & OP_JOIN) {
char *p1;
Var_Set (TARGET, Var_Value (ALLSRC, gn, &p1), gn);
- if (p1)
- free(p1);
+ efree(p1);
}
}
@@ -906,7 +902,7 @@ Make_Run (targs)
(void)MakeStartJobs();
}
- errors = Job_End();
+ errors = Job_Finish();
/*
* Print the final status of each target. E.g. if it wasn't made