[src/trunk]: src/usr.bin/make Improve the error message that results when you...

[dholland <dholland%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c233323d0206
branches:  trunk
changeset: 751523:c233323d0206
user:      dholland <dholland%NetBSD.org@localhost>
date:      Sat Feb 06 20:37:13 2010 +0000

description:
Improve the error message that results when you have a multi-variable .for
and the substitution list doesn't divide evenly.

diffstat:

 usr.bin/make/for.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r a2cc15b16e31 -r c233323d0206 usr.bin/make/for.c
--- a/usr.bin/make/for.c        Sat Feb 06 20:15:54 2010 +0000
+++ b/usr.bin/make/for.c        Sat Feb 06 20:37:13 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: for.c,v 1.46 2009/01/17 13:29:37 dsl Exp $     */
+/*     $NetBSD: for.c,v 1.47 2010/02/06 20:37:13 dholland Exp $        */
 
 /*
  * Copyright (c) 1992, The Regents of the University of California.
@@ -30,14 +30,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: for.c,v 1.46 2009/01/17 13:29:37 dsl Exp $";
+static char rcsid[] = "$NetBSD: for.c,v 1.47 2010/02/06 20:37:13 dholland Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)for.c      8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: for.c,v 1.46 2009/01/17 13:29:37 dsl Exp $");
+__RCSID("$NetBSD: for.c,v 1.47 2010/02/06 20:37:13 dholland Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -237,7 +237,8 @@
 
     if (strlist_num(&new_for->items) % strlist_num(&new_for->vars)) {
        Parse_Error(PARSE_FATAL,
-               "Wrong number of words in .for substitution list %d %d",
+               "Wrong number of words (%d) in .for substitution list"
+               " with %d vars",
                strlist_num(&new_for->items), strlist_num(&new_for->vars));
        /*
         * Return 'success' so that the body of the .for loop is accumulated.