Make go vet -strictshadow mostly happy

This commit is contained in:
nemunaire 2019-01-17 16:55:54 +01:00
commit 8749a7c164
7 changed files with 38 additions and 35 deletions

View file

@ -18,20 +18,20 @@ func treatWantChoices(pathname string, team fic.Team) {
if cnt_raw, err := ioutil.ReadFile(pathname); err != nil {
log.Println("[ERR]", err)
} else if err := json.Unmarshal(cnt_raw, &ask); err != nil {
} else if err = json.Unmarshal(cnt_raw, &ask); err != nil {
log.Println("[ERR]", err)
} else if ask.FlagId == 0 {
log.Println("[WRN] Invalid content in wantChoices file: ", pathname)
os.Remove(pathname)
} else if flag, err := fic.GetFlagKey(ask.FlagId); err != nil {
log.Println("[ERR]", err)
} else if err := team.DisplayChoices(flag); err != nil {
} else if err = team.DisplayChoices(flag); err != nil {
log.Println("[ERR]", err)
} else {
if err := genTeamMyFile(team); err != nil {
if err = genTeamMyFile(team); err != nil {
log.Println("my-", team.Id, ".json generation error: ", err)
}
if err := os.Remove(pathname); err != nil {
if err = os.Remove(pathname); err != nil {
log.Println("[ERR]", err)
}
}