fic/server
Archived
1
0
Fork 0
Code Issues Pull requests 10 Releases Wiki Activity

Make go vet -strictshadow mostly happy

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

12
backend/hint.go
View file

@ -19,14 +19,14 @@ func treatOpeningHint(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.HintId == 0 {
log.Println("[WRN] Invalid content in hint file: ", pathname)
os.Remove(pathname)
} else if hint, err := fic.GetHint(ask.HintId); err != nil {
log.Println("[ERR]", err)
} else if err := team.OpenHint(hint); err != nil {
} else if err = team.OpenHint(hint); err != nil {
log.Println("[ERR]", err)
} else {
// Write event
@ -36,18 +36,18 @@ func treatOpeningHint(pathname string, team fic.Team) {
log.Println("[WRN]", err)
} else if theme, err := fic.GetTheme(exercice.IdTheme); err != nil {
log.Println("[WRN]", err)
} else if _, err := fic.NewEvent(fmt.Sprintf("L'équipe %s a dévoilé un indice pour le <strong>%d<sup>e</sup></strong> défi %s&nbsp;!", team.Name, lvl, theme.Name), "info"); err != nil {
} else if _, err = fic.NewEvent(fmt.Sprintf("L'équipe %s a dévoilé un indice pour le <strong>%d<sup>e</sup></strong> défi %s&nbsp;!", team.Name, lvl, theme.Name), "info"); err != nil {
log.Println("[WRN] Unable to create event:", err)
}
if err := genTeamMyFile(team); err != nil {
if err = genTeamMyFile(team); err != nil {
log.Println("my-", team.Id, ".json generation error: ", err)
}
if err := genEventsFile(); err != nil {
if err = genEventsFile(); err != nil {
log.Println("events.json generation error: ", err)
}
if err := os.Remove(pathname); err != nil {
if err = os.Remove(pathname); err != nil {
log.Println("[ERR]", err)
}
}