Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make: clean up ParseDependency 

No functional change.
This commit is contained in:
rillig 2021-12-28 19:01:36 +00:00
parent 0e9020d18e
commit 8eade2c2c0
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
usr.bin/make/parse.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: parse.c,v 1.599 2021/12/28 17:58:41 rillig Exp $ */
/* $NetBSD: parse.c,v 1.600 2021/12/28 19:01:36 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@ -109,7 +109,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
MAKE_RCSID("$NetBSD: parse.c,v 1.599 2021/12/28 17:58:41 rillig Exp $");
MAKE_RCSID("$NetBSD: parse.c,v 1.600 2021/12/28 19:01:36 rillig Exp $");
/* types and constants */
@ -1608,37 +1608,31 @@ ParseDependencySources(char *p, GNodeType targetAttr,
static void
ParseDependency(char *line)
{
char *cp; /* our current position */
GNodeType op; /* the dependency operator on the line */
char *p;
SearchPathList *paths; /* search paths to alter when parsing a list
* of .PATH targets */
GNodeType targetAttr; /* from special sources */
/*
* In special targets, the children are linked as children of the
* parent but not vice versa.
*/
ParseSpecial special = SP_NOT;
ParseSpecial special; /* in special targets, the children are
* linked as children of the parent but not
* vice versa */
DEBUG1(PARSE, "ParseDependency(%s)\n", line);
targetAttr = OP_NONE;
p = line;
paths = NULL;
targetAttr = OP_NONE;
special = SP_NOT;
cp = line;
if (!ParseDependencyTargets(&cp, line, &special,
&targetAttr, &paths))
if (!ParseDependencyTargets(&p, line, &special, &targetAttr, &paths))
goto out;
if (!Lst_IsEmpty(targets))
ParseDependencyCheckSpecial(special);
op = ParseDependencyOp(&cp);
ApplyDependencyOperator(op);
ApplyDependencyOperator(ParseDependencyOp(&p));
pp_skip_whitespace(&cp);
pp_skip_whitespace(&p);
ParseDependencySources(cp, targetAttr, special, &paths);
ParseDependencySources(p, targetAttr, special, &paths);
out:
if (paths != NULL)