 @@ -1,14 +1,14 @@
-/*	$NetBSD: parse.c,v 1.346 2020/10/03 21:23:42 rillig Exp $	*/
+/*	$NetBSD: parse.c,v 1.347 2020/10/03 21:43:41 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -122,27 +122,27 @@
 #ifndef MAP_FILE
 #define MAP_FILE 0
 #endif
 #ifndef MAP_COPY
 #define MAP_COPY MAP_PRIVATE
 #endif
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 #include "pathnames.h"
 /*	"@(#)parse.c	8.3 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: parse.c,v 1.346 2020/10/03 21:23:42 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.347 2020/10/03 21:43:41 rillig Exp $");
 /* types and constants */
 /*
  * Structure for a file being read ("included file")
  */
 typedef struct IFile {
     char *fname;		/* name of file */
     Boolean fromForLoop;	/* simulated .include by the .for loop */
     int lineno;			/* current line number in file */
     int first_lineno;		/* line number of start of text */
     int cond_depth;		/* 'if' nesting when file opened */
     Boolean depending;		/* state of doing_depend on EOF */
 @@ -2510,27 +2510,27 @@ ParseEOF(void)
     curFile = Stack_Pop(&includes);
     DEBUG2(PARSE, "ParseEOF: returning to file %s, line %d\n",
 	   curFile->fname, curFile->lineno);
     ParseSetParseFile(curFile->fname);
     return CONTINUE;
+}
 #define PARSE_RAW 1
 #define PARSE_SKIP 2
 static char *
-ParseGetLine(int flags, int *length)
+ParseGetLine(int flags)
+{
     IFile *cf = curFile;
     char *ptr;
     char ch;
     char *line;
     char *line_end;
     char *escaped;
     char *comment;
     char *tp;
     /* Loop through blank lines and comment lines */
     for (;;) {
 	cf->lineno++;
 @@ -2602,50 +2602,47 @@ ParseGetLine(int flags, int *length)
 	if (line_end == line || comment == line) {
 	    if (ch == 0)
 		/* At end of file */
 		return NULL;
 	    /* Parse another line */
 	    continue;
+	}
 	/* We now have a line of data */
 	*line_end = 0;
 	if (flags & PARSE_RAW) {
 	    /* Leave '\' (etc) in line buffer (eg 'for' lines) */
 	    *length = line_end - line;
 	    return line;
+	}
 	if (flags & PARSE_SKIP) {
 	    /* Completely ignore non-directives */
 	    if (line[0] != '.')
 		continue;
 	    /* We could do more of the .else/.elif/.endif checks here */
+	}
 	break;
+    }
     /* Brutally ignore anything after a non-escaped '#' in non-commands */
     if (comment != NULL && line[0] != '\t') {
 	line_end = comment;
 	*line_end = 0;
+    }
     /* If we didn't see a '\\' then the in-situ data is fine */
-    if (escaped == NULL) {
+    if (escaped == NULL)
 	*length = line_end - line;
 	return line;
     /* Remove escapes from '\n' and '#' */
     tp = ptr = escaped;
     escaped = line;
     for (; ; *tp++ = ch) {
 	ch = *ptr++;
 	if (ch != '\\') {
 	    if (ch == 0)
 		break;
 	    continue;
+	}
 	ch = *ptr++;
 @@ -2668,83 +2665,81 @@ ParseGetLine(int flags, int *length)
+	}
 	/* Escaped '\n' replace following whitespace with a single ' ' */
 	while (ptr[0] == ' ' || ptr[0] == '\t')
 	    ptr++;
 	ch = ' ';
+    }
     /* Delete any trailing spaces - eg from empty continuations */
     while (tp > escaped && ch_isspace(tp[-1]))
 	tp--;
     *tp = 0;
     *length = tp - line;
     return line;
+}
 /* Read an entire line from the input file. Called only by Parse_File.
+ *
  * Results:
  *	A line without its newline.
+ *
  * Side Effects:
  *	Only those associated with reading a character
  */
 static char *
 ParseReadLine(void)
+{
     char *line;			/* Result */
     int lineLength;		/* Length of result */
     int lineno;			/* Saved line # */
     int rval;
     for (;;) {
-	line = ParseGetLine(0, &lineLength);
+	line = ParseGetLine(0);
 	if (line == NULL)
 	    return NULL;
 	if (line[0] != '.')
 	    return line;
 	/*
 	 * The line might be a conditional. Ask the conditional module
 	 * about it and act accordingly
 	 */
 	switch (Cond_EvalLine(line)) {
 	case COND_SKIP:
 	    /* Skip to next conditional that evaluates to COND_PARSE.  */
 	    do {
-		line = ParseGetLine(PARSE_SKIP, &lineLength);
+		line = ParseGetLine(PARSE_SKIP);
 	    } while (line && Cond_EvalLine(line) != COND_PARSE);
 	    if (line == NULL)
 		break;
 	    continue;
 	case COND_PARSE:
 	    continue;
 	case COND_INVALID:    /* Not a conditional line */
 	    /* Check for .for loops */
 	    rval = For_Eval(line);
 	    if (rval == 0)
 		/* Not a .for line */
 		break;
 	    if (rval < 0)
 		/* Syntax error - error printed, ignore line */
 		continue;
 	    /* Start of a .for loop */
 	    lineno = curFile->lineno;
 	    /* Accumulate loop lines until matching .endfor */
 	    do {
-		line = ParseGetLine(PARSE_RAW, &lineLength);
+		line = ParseGetLine(PARSE_RAW);
 		if (line == NULL) {
 		    Parse_Error(PARSE_FATAL,
 			     "Unexpected end of file in for loop.");
 		    break;
+		}
 	    } while (For_Accum(line));
 	    /* Stash each iteration as a new 'input file' */
 	    For_Run(lineno);
 	    /* Read next line from for-loop buffer */
 	    continue;
+	}
 	return line;
+    }