Sun Jul 26 17:44:54 2020 UTC ()
make(1): remove wrong comment from VarOrder


(rillig)
diff -r1.321 -r1.322 src/usr.bin/make/var.c
cvs diff -r1.321 -r1.322 src/usr.bin/make/var.c (expand / switch to unified diff)

--- src/usr.bin/make/var.c 2020/07/26 17:23:00 1.321
+++ src/usr.bin/make/var.c 2020/07/26 17:44:54 1.322
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: var.c,v 1.321 2020/07/26 17:23:00 rillig Exp $ */ 1/* $NetBSD: var.c,v 1.322 2020/07/26 17:44:54 rillig Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1988, 1989, 1990, 1993 4 * Copyright (c) 1988, 1989, 1990, 1993
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to Berkeley by 7 * This code is derived from software contributed to Berkeley by
8 * Adam de Boor. 8 * Adam de Boor.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -59,34 +59,34 @@ @@ -59,34 +59,34 @@
59 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 59 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
60 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 60 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
61 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 61 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
62 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 62 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
63 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 63 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
64 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 64 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
65 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 65 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
66 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 66 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
67 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 67 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
68 * SUCH DAMAGE. 68 * SUCH DAMAGE.
69 */ 69 */
70 70
71#ifndef MAKE_NATIVE 71#ifndef MAKE_NATIVE
72static char rcsid[] = "$NetBSD: var.c,v 1.321 2020/07/26 17:23:00 rillig Exp $"; 72static char rcsid[] = "$NetBSD: var.c,v 1.322 2020/07/26 17:44:54 rillig Exp $";
73#else 73#else
74#include <sys/cdefs.h> 74#include <sys/cdefs.h>
75#ifndef lint 75#ifndef lint
76#if 0 76#if 0
77static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94"; 77static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94";
78#else 78#else
79__RCSID("$NetBSD: var.c,v 1.321 2020/07/26 17:23:00 rillig Exp $"); 79__RCSID("$NetBSD: var.c,v 1.322 2020/07/26 17:44:54 rillig Exp $");
80#endif 80#endif
81#endif /* not lint */ 81#endif /* not lint */
82#endif 82#endif
83 83
84/*- 84/*-
85 * var.c -- 85 * var.c --
86 * Variable-handling functions 86 * Variable-handling functions
87 * 87 *
88 * Interface: 88 * Interface:
89 * Var_Set Set the value of a variable in the given 89 * Var_Set Set the value of a variable in the given
90 * context. The variable is created if it doesn't 90 * context. The variable is created if it doesn't
91 * yet exist. 91 * yet exist.
92 * 92 *
@@ -1656,27 +1656,27 @@ VarWordCompareReverse(const void *a, con @@ -1656,27 +1656,27 @@ VarWordCompareReverse(const void *a, con
1656 * 1656 *
1657 * Results: 1657 * Results:
1658 * A string containing the words ordered. 1658 * A string containing the words ordered.
1659 * 1659 *
1660 * Side Effects: 1660 * Side Effects:
1661 * None. 1661 * None.
1662 * 1662 *
1663 *----------------------------------------------------------------------- 1663 *-----------------------------------------------------------------------
1664 */ 1664 */
1665static char * 1665static char *
1666VarOrder(const char *str, const char otype) 1666VarOrder(const char *str, const char otype)
1667{ 1667{
1668 Buffer buf; /* Buffer for the new string */ 1668 Buffer buf; /* Buffer for the new string */
1669 char **av; /* word list [first word does not count] */ 1669 char **av; /* word list */
1670 char *as; /* word list memory */ 1670 char *as; /* word list memory */
1671 int ac, i; 1671 int ac, i;
1672 1672
1673 Buf_Init(&buf, 0); 1673 Buf_Init(&buf, 0);
1674 1674
1675 av = brk_string(str, &ac, FALSE, &as); 1675 av = brk_string(str, &ac, FALSE, &as);
1676 1676
1677 if (ac > 0) { 1677 if (ac > 0) {
1678 switch (otype) { 1678 switch (otype) {
1679 case 'r': /* reverse sort alphabetically */ 1679 case 'r': /* reverse sort alphabetically */
1680 qsort(av, ac, sizeof(char *), VarWordCompareReverse); 1680 qsort(av, ac, sizeof(char *), VarWordCompareReverse);
1681 break; 1681 break;
1682 case 's': /* sort alphabetically */ 1682 case 's': /* sort alphabetically */