upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2025-04-07 21:30:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

var name should not be error (#5332)

Browse Source 
Rename the variable names from "error" to "err"
This commit is contained in:
silenceshell 2018-07-24 11:33:21 +08:00 committed by Daniel Jiang
parent e9d5913d63
commit 7745b79b2e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/adminserver/systemcfg/store/database/driver_db.go
View File

@ -74,9 +74,9 @@ func NewCfgStore() (store.Driver, error) {
// Read configuration from database // Read configuration from database
func (c *cfgStore) Read() (map[string]interface{}, error) { func (c *cfgStore) Read() (map[string]interface{}, error) {
configEntries, error := dao.GetConfigEntries() configEntries, err := dao.GetConfigEntries()
if error != nil { if err != nil {
return nil, error return nil, err
} }
return WrapperConfig(configEntries) return WrapperConfig(configEntries)
} }

6
src/common/dao/config.go
View File

@ -54,9 +54,9 @@ func SaveConfigEntries(entries []models.ConfigEntry) error {
tempEntry := models.ConfigEntry{} tempEntry := models.ConfigEntry{}
tempEntry.Key = entry.Key tempEntry.Key = entry.Key
tempEntry.Value = entry.Value tempEntry.Value = entry.Value
created, _, error := o.ReadOrCreate(&tempEntry, "k") created, _, err := o.ReadOrCreate(&tempEntry, "k")
if error != nil { if err != nil {
return error return err
} }
if !created { if !created {
entry.ID = tempEntry.ID entry.ID = tempEntry.ID