Skip to content

Commit

Permalink
Light refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
iph0 committed Apr 12, 2024
1 parent f0f8797 commit e9ab262
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions conf.go
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ func (p *Processor) applyDirectives(node reflect.Value) (reflect.Value, error) {
} else {
if names := node.MapIndex(underlayKey); names.IsValid() {
var err error
node, err = p.mergeInnerLayers(underlayKey, node, names)
node, err = p.mergeLayers(underlayKey, node, names)

if err != nil {
return reflect.Value{}, err
Expand All @@ -377,7 +377,7 @@ func (p *Processor) applyDirectives(node reflect.Value) (reflect.Value, error) {

if names := node.MapIndex(overlayKey); names.IsValid() {
var err error
node, err = p.mergeInnerLayers(overlayKey, node, names)
node, err = p.mergeLayers(overlayKey, node, names)

if err != nil {
return reflect.Value{}, err
Expand Down Expand Up @@ -526,7 +526,7 @@ func (p *Processor) resolveRef(ref reflect.Value) (reflect.Value, error) {
return reflect.Value{}, nil
}

func (p *Processor) mergeInnerLayers(directiveKey reflect.Value, node reflect.Value,
func (p *Processor) mergeLayers(directiveKey reflect.Value, node reflect.Value,
names reflect.Value) (reflect.Value, error) {

names = strip(names)
Expand Down

0 comments on commit e9ab262

Please sign in to comment.