From 6f61b62f59186515e5ad232c56307ee9e84019e5 Mon Sep 17 00:00:00 2001 From: rillig Date: Wed, 7 Dec 2022 10:28:48 +0000 Subject: [PATCH] make: clean up comments --- usr.bin/make/arch.c | 13 ++++++------- usr.bin/make/compat.c | 8 ++++---- usr.bin/make/str.c | 8 ++++---- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/usr.bin/make/arch.c b/usr.bin/make/arch.c index 23280f25ae7c..6ccd92abff50 100644 --- a/usr.bin/make/arch.c +++ b/usr.bin/make/arch.c @@ -1,4 +1,4 @@ -/* $NetBSD: arch.c,v 1.211 2022/09/27 17:46:58 rillig Exp $ */ +/* $NetBSD: arch.c,v 1.212 2022/12/07 10:28:48 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -126,7 +126,7 @@ #include "config.h" /* "@(#)arch.c 8.2 (Berkeley) 1/2/94" */ -MAKE_RCSID("$NetBSD: arch.c,v 1.211 2022/09/27 17:46:58 rillig Exp $"); +MAKE_RCSID("$NetBSD: arch.c,v 1.212 2022/12/07 10:28:48 rillig Exp $"); typedef struct List ArchList; typedef struct ListNode ArchListNode; @@ -305,11 +305,10 @@ Arch_ParseArchive(char **pp, GNodeList *gns, GNode *scope) */ /* * If member contains variables, try and substitute for them. - * This will slow down archive specs with dynamic sources, of - * course, since we'll be (non-)substituting them three - * times, but them's the breaks -- we need to do this since - * SuffExpandChildren calls us, otherwise we could assume the - * thing would be taken care of later. + * This slows down archive specs with dynamic sources, since + * they are (non-)substituted three times, but we need to do + * this since SuffExpandChildren calls us, otherwise we could + * assume the substitutions would be taken care of later. */ if (doSubst) { char *fullName; diff --git a/usr.bin/make/compat.c b/usr.bin/make/compat.c index 903af00c2f4f..dc7f0e365205 100644 --- a/usr.bin/make/compat.c +++ b/usr.bin/make/compat.c @@ -1,4 +1,4 @@ -/* $NetBSD: compat.c,v 1.242 2022/10/10 21:17:25 rillig Exp $ */ +/* $NetBSD: compat.c,v 1.243 2022/12/07 10:28:48 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -91,15 +91,15 @@ #include "pathnames.h" /* "@(#)compat.c 8.2 (Berkeley) 3/19/94" */ -MAKE_RCSID("$NetBSD: compat.c,v 1.242 2022/10/10 21:17:25 rillig Exp $"); +MAKE_RCSID("$NetBSD: compat.c,v 1.243 2022/12/07 10:28:48 rillig Exp $"); static GNode *curTarg = NULL; static pid_t compatChild; static int compatSigno; /* - * CompatDeleteTarget -- delete the file of a failed, interrupted, or - * otherwise duffed target if not inhibited by .PRECIOUS. + * Delete the file of a failed, interrupted, or otherwise duffed target, + * unless inhibited by .PRECIOUS. */ static void CompatDeleteTarget(GNode *gn) diff --git a/usr.bin/make/str.c b/usr.bin/make/str.c index d88f895630e5..5bb9938296f5 100644 --- a/usr.bin/make/str.c +++ b/usr.bin/make/str.c @@ -1,4 +1,4 @@ -/* $NetBSD: str.c,v 1.93 2022/06/11 09:24:07 rillig Exp $ */ +/* $NetBSD: str.c,v 1.94 2022/12/07 10:28:48 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -71,7 +71,7 @@ #include "make.h" /* "@(#)str.c 5.8 (Berkeley) 6/1/90" */ -MAKE_RCSID("$NetBSD: str.c,v 1.93 2022/06/11 09:24:07 rillig Exp $"); +MAKE_RCSID("$NetBSD: str.c,v 1.94 2022/12/07 10:28:48 rillig Exp $"); static HashTable interned_strings; @@ -313,8 +313,8 @@ in_range(char e1, char c, char e2) } /* - * Str_Match -- Test if a string matches a pattern like "*.[ch]". - * The following special characters are known *?\[] (as in fnmatch(3)). + * Test if a string matches a pattern like "*.[ch]". The pattern matching + * characters are '*', '?' and '[]', as in fnmatch(3). * * XXX: this function does not detect or report malformed patterns. *