Module Name: src Committed By: christos Date: Wed Jul 16 16:52:59 UTC 2014
Modified Files: src/usr.bin/make: parse.c Log Message: remove debugging To generate a diff of this commit: cvs rdiff -u -r1.195 -r1.196 src/usr.bin/make/parse.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.bin/make/parse.c diff -u src/usr.bin/make/parse.c:1.195 src/usr.bin/make/parse.c:1.196 --- src/usr.bin/make/parse.c:1.195 Wed Jul 16 11:33:41 2014 +++ src/usr.bin/make/parse.c Wed Jul 16 12:52:59 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: parse.c,v 1.195 2014/07/16 15:33:41 christos Exp $ */ +/* $NetBSD: parse.c,v 1.196 2014/07/16 16:52:59 christos Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: parse.c,v 1.195 2014/07/16 15:33:41 christos Exp $"; +static char rcsid[] = "$NetBSD: parse.c,v 1.196 2014/07/16 16:52:59 christos Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: parse.c,v 1.195 2014/07/16 15:33:41 christos Exp $"); +__RCSID("$NetBSD: parse.c,v 1.196 2014/07/16 16:52:59 christos Exp $"); #endif #endif /* not lint */ #endif @@ -1979,11 +1979,8 @@ ParseMaybeSubMake(const char *cmd) if ((ptr = strstr(cmd, vals[i].name)) == NULL) continue; if ((ptr == cmd || !isalnum((unsigned char)ptr[-1])) - && !isalnum((unsigned char)ptr[vals[i].len])) { - printf("good [%c] [%c] [%s]\n", ptr[-1], ptr[vals[i].len], cmd); + && !isalnum((unsigned char)ptr[vals[i].len])) return TRUE; - } - printf("bad [%c] [%c] [%s]\n", ptr[-1], ptr[vals[i].len], cmd); } return FALSE; } @@ -2016,7 +2013,7 @@ ParseAddCmd(void *gnp, void *cmd) /* if target already supplied, ignore commands */ if (!(gn->type & OP_HAS_COMMANDS)) { (void)Lst_AtEnd(gn->commands, cmd); - if (ParseIsSubMake(cmd)) + if (ParseMaybeSubMake(cmd)) gn->type |= OP_SUBMAKE; ParseMark(gn); } else {