diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2012-03-22 13:47:13 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2012-03-22 13:47:13 +0000 |
| commit | 3977dfb25ab339398ce4e463f1516523799ad64a (patch) | |
| tree | 7e7c2f3abd07f0d76e0bcd79112d840c62d76ffd /usr.bin/make/job.c | |
| parent | aadb8c731774443f3c939e50c31e9dcfabaa7844 (diff) | |
minor cleanup: error messages include lineno and fileno together, so
recognize that and create a struct Location_ for it.
mostly from Jonathan Calmels, a few nits from me.
okay otto@
Diffstat (limited to 'usr.bin/make/job.c')
| -rw-r--r-- | usr.bin/make/job.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c index 54cb8d1d893..374bdb7bd88 100644 --- a/usr.bin/make/job.c +++ b/usr.bin/make/job.c @@ -1,4 +1,4 @@ -/* $OpenBSD: job.c,v 1.120 2010/07/19 19:46:44 espie Exp $ */ +/* $OpenBSD: job.c,v 1.121 2012/03/22 13:47:12 espie Exp $ */ /* $NetBSD: job.c,v 1.16 1996/11/06 17:59:08 christos Exp $ */ /* @@ -265,9 +265,9 @@ print_errors() type = "Should not happen"; break; } - if (p->n->lineno) + if (p->n->origin.lineno) Error(" %s %d (%s, line %lu of %s)", - type, p->code, p->n->name, p->n->lineno, p->n->fname); + type, p->code, p->n->name, p->n->origin.lineno, p->n->origin.fname); else Error(" %s %d (%s)", type, p->code, p->n->name); } |