From 947ffb698646c79d60685d6461d2bf543e6778d0 Mon Sep 17 00:00:00 2001 From: Mike Farah Date: Wed, 13 Jan 2021 17:00:53 +1100 Subject: [PATCH] Dont use pointer for env prefs (avoid nil) --- pkg/yqlib/expression_tokeniser.go | 2 +- pkg/yqlib/operator_env.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/yqlib/expression_tokeniser.go b/pkg/yqlib/expression_tokeniser.go index 46ff1d42..475d0225 100644 --- a/pkg/yqlib/expression_tokeniser.go +++ b/pkg/yqlib/expression_tokeniser.go @@ -183,7 +183,7 @@ func stringValue(wrapped bool) lex.Action { func envOp(strenv bool) lex.Action { return func(s *lex.Scanner, m *machines.Match) (interface{}, error) { value := string(m.Bytes) - preferences := &envOpPreferences{} + preferences := envOpPreferences{} if strenv { // strenv( ) diff --git a/pkg/yqlib/operator_env.go b/pkg/yqlib/operator_env.go index 07a0aee6..5089f480 100644 --- a/pkg/yqlib/operator_env.go +++ b/pkg/yqlib/operator_env.go @@ -19,7 +19,7 @@ func envOperator(d *dataTreeNavigator, matchMap *list.List, expressionNode *Expr rawValue := os.Getenv(envName) - preferences := expressionNode.Operation.Preferences.(*envOpPreferences) + preferences := expressionNode.Operation.Preferences.(envOpPreferences) var node *yaml.Node if preferences.StringValue {