Sat Aug 1 08:42:33 2020 UTC ()
make(1): fix documentation of Var_Value


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

--- src/usr.bin/make/var.c 2020/08/01 07:29:04 1.373
+++ src/usr.bin/make/var.c 2020/08/01 08:42:33 1.374
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: var.c,v 1.373 2020/08/01 07:29:04 rillig Exp $ */ 1/* $NetBSD: var.c,v 1.374 2020/08/01 08:42:33 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.373 2020/08/01 07:29:04 rillig Exp $"; 72static char rcsid[] = "$NetBSD: var.c,v 1.374 2020/08/01 08:42:33 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.373 2020/08/01 07:29:04 rillig Exp $"); 79__RCSID("$NetBSD: var.c,v 1.374 2020/08/01 08:42:33 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 *
@@ -997,27 +997,27 @@ Var_Exists(const char *name, GNode *ctxt @@ -997,27 +997,27 @@ Var_Exists(const char *name, GNode *ctxt
997 Var *v = VarFind(name, ctxt, FIND_CMD | FIND_GLOBAL | FIND_ENV); 997 Var *v = VarFind(name, ctxt, FIND_CMD | FIND_GLOBAL | FIND_ENV);
998 free(name_freeIt); 998 free(name_freeIt);
999 if (v == NULL) 999 if (v == NULL)
1000 return FALSE; 1000 return FALSE;
1001 1001
1002 (void)VarFreeEnv(v, TRUE); 1002 (void)VarFreeEnv(v, TRUE);
1003 return TRUE; 1003 return TRUE;
1004} 1004}
1005 1005
1006/*- 1006/*-
1007 *----------------------------------------------------------------------- 1007 *-----------------------------------------------------------------------
1008 * Var_Value -- 1008 * Var_Value --
1009 * Return the unexpanded value of the given variable in the given 1009 * Return the unexpanded value of the given variable in the given
1010 * context. 1010 * context, or the usual contexts.
1011 * 1011 *
1012 * Input: 1012 * Input:
1013 * name name to find 1013 * name name to find
1014 * ctxt context in which to search for it 1014 * ctxt context in which to search for it
1015 * 1015 *
1016 * Results: 1016 * Results:
1017 * The value if the variable exists, NULL if it doesn't. 1017 * The value if the variable exists, NULL if it doesn't.
1018 * If the returned value is not NULL, the caller must free *freeIt 1018 * If the returned value is not NULL, the caller must free *freeIt
1019 * as soon as the returned value is no longer needed. 1019 * as soon as the returned value is no longer needed.
1020 *----------------------------------------------------------------------- 1020 *-----------------------------------------------------------------------
1021 */ 1021 */
1022char * 1022char *
1023Var_Value(const char *name, GNode *ctxt, char **freeIt) 1023Var_Value(const char *name, GNode *ctxt, char **freeIt)