aboutsummaryrefslogtreecommitdiffstats
path: root/storage/filesystem/config.go
diff options
context:
space:
mode:
authorJavi Fontan <jfontan@gmail.com>2018-03-26 23:18:54 +0200
committerJavi Fontan <jfontan@gmail.com>2018-03-27 17:32:59 +0200
commit05c414a169a75ca933402e5be19a5c4304aa4f00 (patch)
tree19dcd85c5d221cf41fa06c200423d5cc236f9f31 /storage/filesystem/config.go
parent160e6d5b654fbbaf0d9264f226c56a03f0e27d30 (diff)
downloadgo-git-05c414a169a75ca933402e5be19a5c4304aa4f00.tar.gz
*: Use CheckClose with named returns
Previously some close errors were losts. This is specially problematic in go-git as lots of work is done here like generating indexes and moving packfiles. Signed-off-by: Javi Fontan <jfontan@gmail.com>
Diffstat (limited to 'storage/filesystem/config.go')
-rw-r--r--storage/filesystem/config.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/filesystem/config.go b/storage/filesystem/config.go
index a2cc173..85feaf0 100644
--- a/storage/filesystem/config.go
+++ b/storage/filesystem/config.go
@@ -13,7 +13,7 @@ type ConfigStorage struct {
dir *dotgit.DotGit
}
-func (c *ConfigStorage) Config() (*config.Config, error) {
+func (c *ConfigStorage) Config() (conf *config.Config, err error) {
cfg := config.NewConfig()
f, err := c.dir.Config()
@@ -32,15 +32,15 @@ func (c *ConfigStorage) Config() (*config.Config, error) {
return nil, err
}
- if err := cfg.Unmarshal(b); err != nil {
+ if err = cfg.Unmarshal(b); err != nil {
return nil, err
}
return cfg, err
}
-func (c *ConfigStorage) SetConfig(cfg *config.Config) error {
- if err := cfg.Validate(); err != nil {
+func (c *ConfigStorage) SetConfig(cfg *config.Config) (err error) {
+ if err = cfg.Validate(); err != nil {
return err
}