=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/parse.c,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- src/usr.bin/make/parse.c 2009/08/16 09:51:12 1.97 +++ src/usr.bin/make/parse.c 2010/07/15 10:41:11 1.98 @@ -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 @@ */ 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 @@ 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 @@ 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;