diff options
| -rw-r--r-- | usr.bin/make/lowparse.c | 6 | ||||
| -rw-r--r-- | usr.bin/make/main.c | 4 | ||||
| -rw-r--r-- | usr.bin/make/parse.c | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/usr.bin/make/lowparse.c b/usr.bin/make/lowparse.c index b0bee9a4daf..0237cf1b4e2 100644 --- a/usr.bin/make/lowparse.c +++ b/usr.bin/make/lowparse.c @@ -1,5 +1,5 @@ /* $OpenPackages$ */ -/* $OpenBSD: lowparse.c,v 1.22 2007/09/22 10:43:38 espie Exp $ */ +/* $OpenBSD: lowparse.c,v 1.23 2010/07/15 10:41:11 espie Exp $ */ /* low-level parsing functions. */ @@ -238,7 +238,7 @@ Parse_ReadNextConditionalLine(Buffer linebuf) current->lineno++; } if (c == EOF) { - Parse_Error(PARSE_FATAL, + Parse_Error(PARSE_FATAL, "Unclosed conditional"); return NULL; } @@ -454,7 +454,7 @@ Parse_ReportErrors(void) while (Parse_NextFile()) ; #endif - fprintf(stderr, + fprintf(stderr, "Fatal errors encountered -- cannot continue\n"); exit(1); } else diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c index f1c8cf8200e..d78accb51e7 100644 --- a/usr.bin/make/main.c +++ b/usr.bin/make/main.c @@ -1,5 +1,5 @@ /* $OpenPackages$ */ -/* $OpenBSD: main.c,v 1.93 2010/02/03 20:45:44 miod Exp $ */ +/* $OpenBSD: main.c,v 1.94 2010/07/15 10:41:11 espie Exp $ */ /* $NetBSD: main.c,v 1.34 1997/03/24 20:56:36 gwr Exp $ */ /* @@ -640,7 +640,7 @@ read_all_make_rules(bool noBuiltins, bool read_depend, (void)ReadMakefile("Makefile", d); /* read a .depend file, if it exists, and we're not building depend */ - + if (read_depend) (void)ReadMakefile(".depend", d); } diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c index 46f98cd3fd5..d9c09d0a4c2 100644 --- a/usr.bin/make/parse.c +++ b/usr.bin/make/parse.c @@ -1,5 +1,5 @@ /* $OpenPackages$ */ -/* $OpenBSD: parse.c,v 1.97 2009/08/16 09:51:12 espie Exp $ */ +/* $OpenBSD: parse.c,v 1.98 2010/07/15 10:41:11 espie Exp $ */ /* $NetBSD: parse.c,v 1.29 1997/03/10 21:20:04 christos Exp $ */ /* @@ -300,7 +300,7 @@ ParseDoOp(GNode **gnp, unsigned int op) */ if (((op & OP_OPMASK) != (gn->type & OP_OPMASK)) && !OP_NOP(gn->type) && !OP_NOP(op)) { - Parse_Error(PARSE_FATAL, "Inconsistent operator for %s", + Parse_Error(PARSE_FATAL, "Inconsistent operator for %s", gn->name); return 0; } @@ -644,7 +644,7 @@ parse_do_targets(Lst paths, unsigned int *op, const char *line) if (gtargets.n > 0 && (strcmp(gtargets.a[0]->name, "<<<<<<<") == 0 || strcmp(gtargets.a[0]->name, ">>>>>>>") == 0)) { - Parse_Error(PARSE_FATAL, + Parse_Error(PARSE_FATAL, "Need an operator (likely from a cvs update conflict)"); } else { Parse_Error(PARSE_FATAL, "Need an operator"); @@ -711,7 +711,7 @@ handle_special_targets(Lst paths) specType = SPECIAL_NONE; return 0; } else if (seen_special != 1) { - Parse_Error(PARSE_FATAL, + Parse_Error(PARSE_FATAL, "Mixing special targets is not allowed"); dump_targets(); return 0; |