diff options
Diffstat (limited to '')
| -rw-r--r-- | forged/internal/common/scfg/.golangci.yaml (renamed from forged/internal/scfg/.golangci.yaml) | 0 | ||||
| -rw-r--r-- | forged/internal/common/scfg/reader.go (renamed from forged/internal/scfg/reader.go) | 8 | ||||
| -rw-r--r-- | forged/internal/common/scfg/scfg.go (renamed from forged/internal/scfg/scfg.go) | 0 | ||||
| -rw-r--r-- | forged/internal/common/scfg/struct.go (renamed from forged/internal/scfg/struct.go) | 0 | ||||
| -rw-r--r-- | forged/internal/common/scfg/unmarshal.go (renamed from forged/internal/scfg/unmarshal.go) | 0 | ||||
| -rw-r--r-- | forged/internal/common/scfg/writer.go (renamed from forged/internal/scfg/writer.go) | 0 |
6 files changed, 6 insertions, 2 deletions
diff --git a/forged/internal/scfg/.golangci.yaml b/forged/internal/common/scfg/.golangci.yaml index 59f1970..59f1970 100644 --- a/forged/internal/scfg/.golangci.yaml +++ b/forged/internal/common/scfg/.golangci.yaml diff --git a/forged/internal/scfg/reader.go b/forged/internal/common/scfg/reader.go index 6a2bedc..b0e2cc0 100644 --- a/forged/internal/scfg/reader.go +++ b/forged/internal/common/scfg/reader.go @@ -15,12 +15,16 @@ import ( const maxNestingDepth = 1000 // Load loads a configuration file. -func Load(path string) (Block, error) { +func Load(path string) (block Block, err error) { f, err := os.Open(path) if err != nil { return nil, err } - defer f.Close() + defer func() { + if cerr := f.Close(); err == nil && cerr != nil { + err = cerr + } + }() return Read(f) } diff --git a/forged/internal/scfg/scfg.go b/forged/internal/common/scfg/scfg.go index 4533e63..4533e63 100644 --- a/forged/internal/scfg/scfg.go +++ b/forged/internal/common/scfg/scfg.go diff --git a/forged/internal/scfg/struct.go b/forged/internal/common/scfg/struct.go index 98ec943..98ec943 100644 --- a/forged/internal/scfg/struct.go +++ b/forged/internal/common/scfg/struct.go diff --git a/forged/internal/scfg/unmarshal.go b/forged/internal/common/scfg/unmarshal.go index 8befc10..8befc10 100644 --- a/forged/internal/scfg/unmarshal.go +++ b/forged/internal/common/scfg/unmarshal.go diff --git a/forged/internal/scfg/writer.go b/forged/internal/common/scfg/writer.go index 02a07fe..02a07fe 100644 --- a/forged/internal/scfg/writer.go +++ b/forged/internal/common/scfg/writer.go |