summaryrefslogtreecommitdiffstats
path: root/usr.bin/make/var.c
diff options
context:
space:
mode:
authorharti <harti@FreeBSD.org>2005-05-24 16:05:51 +0000
committerharti <harti@FreeBSD.org>2005-05-24 16:05:51 +0000
commitdd5f450e83a2cf110049be4a3dec342b25032631 (patch)
tree7377d4a139d673efd4f875e108415e496df43d39 /usr.bin/make/var.c
parent79613308dce9cef12aa10cea972360bae9c444f3 (diff)
downloadFreeBSD-src-dd5f450e83a2cf110049be4a3dec342b25032631.zip
FreeBSD-src-dd5f450e83a2cf110049be4a3dec342b25032631.tar.gz
The caller of Var_Value() should not change the variable value. Make
this clear by constifying the return value. Obtained from: DragonFlyBSD
Diffstat (limited to 'usr.bin/make/var.c')
-rw-r--r--usr.bin/make/var.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c
index 9300770..9844e16 100644
--- a/usr.bin/make/var.c
+++ b/usr.bin/make/var.c
@@ -1144,7 +1144,7 @@ Var_Exists(const char *name, GNode *ctxt)
* Results:
* The value if the variable exists, NULL if it doesn't.
*/
-char *
+const char *
Var_Value(const char name[], GNode *ctxt)
{
Var *v;
@@ -2545,12 +2545,13 @@ Var_Print(Lst *vlist, Boolean expandVars)
{
LstNode *n;
const char *name;
- char *v;
- char *value;
LST_FOREACH(n, vlist) {
name = Lst_Datum(n);
if (expandVars) {
+ char *value;
+ char *v;
+
v = emalloc(strlen(name) + 1 + 3);
sprintf(v, "${%s}", name);
@@ -2560,7 +2561,7 @@ Var_Print(Lst *vlist, Boolean expandVars)
free(v);
free(value);
} else {
- value = Var_Value(name, VAR_GLOBAL);
+ const char *value = Var_Value(name, VAR_GLOBAL);
printf("%s\n", value != NULL ? value : "");
}
}
OpenPOWER on IntegriCloud