Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2026-03-31 04:52:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: check all Close() return values for errcheck lint

Browse Source 
Add explicit error discards (_ =) for Close() calls on network
connections, SQL rows, and file handles across 28 files. Also add
.golangci.yml with standard linter defaults to match CI configuration.
This commit is contained in:
Houmgaor
2026-02-17 23:57:14 +01:00
parent abb40f163c
commit c64dabc3ba
29 changed files with 61 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/channelserver/handlers.go
View File

@@ -132,7 +132,7 @@ func handleMsgSysLogin(s *Session, p mhfpacket.MHFPacket) {
var token string
err := s.server.db.QueryRow("SELECT token FROM sign_sessions ss INNER JOIN public.users u on ss.user_id = u.id WHERE token=$1 AND ss.id=$2 AND u.id=(SELECT c.user_id FROM characters c WHERE c.id=$3)", pkt.LoginTokenString, pkt.LoginTokenNumber, pkt.CharID0).Scan(&token)
if err != nil {
s.rawConn.Close()
_ = s.rawConn.Close()
s.logger.Warn(fmt.Sprintf("Invalid login token, offending CID: (%d)", pkt.CharID0))
return
}
@@ -342,7 +342,7 @@ func logoutPlayer(s *Session) {
// NOW do cleanup (after save is complete)
s.server.Lock()
delete(s.server.sessions, s.rawConn)
s.rawConn.Close()
_ = s.rawConn.Close()
s.server.Unlock()
// Stage cleanup
@@ -1126,7 +1126,7 @@ func handleMsgMhfInfoScenarioCounter(s *Session, p mhfpacket.MHFPacket) {
var scenario Scenario
scenarioData, err := s.server.db.Queryx("SELECT scenario_id, category_id FROM scenario_counter")
if err != nil {
scenarioData.Close()
_ = scenarioData.Close()
s.logger.Error("Failed to get scenario counter info from db", zap.Error(err))
doAckBufSucceed(s, pkt.AckHandle, make([]byte, 1))
return

2
server/channelserver/handlers_character.go
View File

@@ -129,7 +129,7 @@ func GetCharacterSaveData(s *Session, charID uint32) (*CharacterSaveData, error)
s.logger.Error("Failed to get savedata", zap.Error(err), zap.Uint32("charID", charID))
return nil, err
}
defer result.Close()
defer func() { _ = result.Close() }()
if !result.Next() {
err = errors.New("no savedata found")
s.logger.Error("No savedata found", zap.Uint32("charID", charID))

4
server/channelserver/handlers_data.go
View File

@@ -75,7 +75,7 @@ func handleMsgMhfSavedata(s *Session, p mhfpacket.MHFPacket) {
characterSaveData.Save(s)
s.logger.Info("Wrote recompressed savedata back to DB.")
} else {
s.rawConn.Close()
_ = s.rawConn.Close()
s.logger.Warn("Save cancelled due to corruption.")
if s.server.erupeConfig.DeleteOnSaveCorruption {
if _, err := s.server.db.Exec("UPDATE characters SET deleted=true WHERE id=$1", s.charID); err != nil {
@@ -164,7 +164,7 @@ func handleMsgMhfLoaddata(s *Session, p mhfpacket.MHFPacket) {
err := s.server.db.QueryRow("SELECT savedata FROM characters WHERE id = $1", s.charID).Scan(&data)
if err != nil || len(data) == 0 {
s.logger.Warn(fmt.Sprintf("Failed to load savedata (CID: %d)", s.charID), zap.Error(err))
s.rawConn.Close() // Terminate the connection
_ = s.rawConn.Close() // Terminate the connection
return
}
doAckBufSucceed(s, pkt.AckHandle, data)

2
server/channelserver/handlers_diva.go
View File

@@ -73,7 +73,7 @@ func handleMsgMhfGetUdSchedule(s *Session, p mhfpacket.MHFPacket) {
if err != nil {
s.logger.Error("Failed to query diva schedule", zap.Error(err))
} else {
defer rows.Close()
defer func() { _ = rows.Close() }()
for rows.Next() {
_ = rows.Scan(&id, &start)
}

2
server/channelserver/handlers_event.go
View File

@@ -139,7 +139,7 @@ func handleMsgMhfGetKeepLoginBoostStatus(s *Session, p mhfpacket.MHFPacket) {
var loginBoosts []loginBoost
rows, err := s.server.db.Queryx("SELECT week_req, expiration, reset FROM login_boost WHERE char_id=$1 ORDER BY week_req", s.charID)
if err != nil || s.server.erupeConfig.GameplayOptions.DisableLoginBoost {
rows.Close()
_ = rows.Close()
doAckBufSucceed(s, pkt.AckHandle, make([]byte, 35))
return
}

8
server/channelserver/handlers_festa.go
View File

@@ -193,7 +193,7 @@ func handleMsgMhfInfoFesta(s *Session, p mhfpacket.MHFPacket) {
if err != nil {
s.logger.Error("Failed to query festa schedule", zap.Error(err))
} else {
defer rows.Close()
defer func() { _ = rows.Close() }()
for rows.Next() {
_ = rows.Scan(&id, &start)
}
@@ -252,7 +252,7 @@ func handleMsgMhfInfoFesta(s *Session, p mhfpacket.MHFPacket) {
if err != nil {
s.logger.Error("Failed to query festa trials", zap.Error(err))
} else {
defer rows.Close()
defer func() { _ = rows.Close() }()
for rows.Next() {
if err := rows.StructScan(&trial); err != nil {
continue
@@ -575,7 +575,7 @@ func handleMsgMhfEnumerateFestaPersonalPrize(s *Session, p mhfpacket.MHFPacket)
if err != nil {
s.logger.Error("Failed to query festa personal prizes", zap.Error(err))
} else {
defer rows.Close()
defer func() { _ = rows.Close() }()
for rows.Next() {
prize := &Prize{}
if err := rows.StructScan(&prize); err != nil {
@@ -605,7 +605,7 @@ func handleMsgMhfEnumerateFestaIntermediatePrize(s *Session, p mhfpacket.MHFPack
if err != nil {
s.logger.Error("Failed to query festa intermediate prizes", zap.Error(err))
} else {
defer rows.Close()
defer func() { _ = rows.Close() }()
for rows.Next() {
prize := &Prize{}
if err := rows.StructScan(&prize); err != nil {

6
server/channelserver/handlers_guild.go
View File

@@ -556,7 +556,7 @@ func GetGuildInfoByID(s *Session, guildID uint32) (*Guild, error) {
return nil, err
}
defer rows.Close()
defer func() { _ = rows.Close() }()
hasRow := rows.Next()
@@ -591,7 +591,7 @@ func GetGuildInfoByCharacterId(s *Session, charID uint32) (*Guild, error) {
return nil, err
}
defer rows.Close()
defer func() { _ = rows.Close() }()
hasRow := rows.Next()
@@ -1884,7 +1884,7 @@ func handleMsgMhfGuildHuntdata(s *Session, p mhfpacket.MHFPacket) {
continue
}
if count == 255 {
rows.Close()
_ = rows.Close()
break
}
count++

2
server/channelserver/handlers_guild_alliance.go
View File

@@ -52,7 +52,7 @@ func GetAllianceData(s *Session, AllianceID uint32) (*GuildAlliance, error) {
s.logger.Error("Failed to retrieve alliance data from database", zap.Error(err))
return nil, err
}
defer rows.Close()
defer func() { _ = rows.Close() }()
hasRow := rows.Next()
if !hasRow {
return nil, nil

4
server/channelserver/handlers_guild_member.go
View File

@@ -103,7 +103,7 @@ func GetGuildMembers(s *Session, guildID uint32, applicants bool) ([]*GuildMembe
return nil, err
}
defer rows.Close()
defer func() { _ = rows.Close() }()
members := make([]*GuildMember, 0)
@@ -128,7 +128,7 @@ func GetCharacterGuildData(s *Session, charID uint32) (*GuildMember, error) {
return nil, err
}
defer rows.Close()
defer func() { _ = rows.Close() }()
hasRow := rows.Next()

2
server/channelserver/handlers_guild_scout.go
View File

@@ -216,7 +216,7 @@ func handleMsgMhfGetGuildScoutList(s *Session, p mhfpacket.MHFPacket) {
return
}
defer rows.Close()
defer func() { _ = rows.Close() }()
bf := byteframe.NewByteFrame()

2
server/channelserver/handlers_guild_tresure.go
View File

@@ -50,7 +50,7 @@ func handleMsgMhfEnumerateGuildTresure(s *Session, p mhfpacket.MHFPacket) {
WHERE gh.guild_id=$2 AND gh.level=2 AND gh.acquired=TRUE
`, s.charID, guild.ID)
if err != nil {
rows.Close()
_ = rows.Close()
doAckBufSucceed(s, pkt.AckHandle, make([]byte, 4))
return
} else {

2
server/channelserver/handlers_house.go
View File

@@ -101,7 +101,7 @@ func handleMsgMhfEnumerateHouse(s *Session, p mhfpacket.MHFPacket) {
if err != nil {
s.logger.Error("Failed to query houses by name", zap.Error(err))
} else {
defer rows.Close()
defer func() { _ = rows.Close() }()
for rows.Next() {
if err := rows.StructScan(&house); err == nil {
houses = append(houses, house)

2
server/channelserver/handlers_mail.go
View File

@@ -108,7 +108,7 @@ func GetMailListForCharacter(s *Session, charID uint32) ([]Mail, error) {
return nil, err
}
defer rows.Close()
defer func() { _ = rows.Close() }()
allMail := make([]Mail, 0)

2
server/channelserver/handlers_mercenary.go
View File

@@ -227,7 +227,7 @@ func handleMsgMhfReadMercenaryW(s *Session, p mhfpacket.MHFPacket) {
if err != nil {
s.logger.Error("Failed to query mercenary loans", zap.Error(err))
} else {
defer rows.Close()
defer func() { _ = rows.Close() }()
for rows.Next() {
if err := rows.Scan(&name, &cid, &pactID); err != nil {
continue

2
server/channelserver/handlers_quest.go
View File

@@ -422,7 +422,7 @@ func handleMsgMhfEnumerateQuest(s *Session, p mhfpacket.MHFPacket) {
}
}
rows.Close()
_ = rows.Close()
_ = tx.Commit()
}

2
server/channelserver/handlers_rengoku.go
View File

@@ -159,7 +159,7 @@ func handleMsgMhfEnumerateRengokuRanking(s *Session, p mhfpacket.MHFPacket) {
doAckBufSucceed(s, pkt.AckHandle, make([]byte, 11))
return
}
defer rows.Close()
defer func() { _ = rows.Close() }()
for rows.Next() {
_ = rows.StructScan(&score)

2
server/channelserver/handlers_tower.go
View File

@@ -327,7 +327,7 @@ func handleMsgMhfGetTenrouirai(s *Session, p mhfpacket.MHFPacket) {
if err != nil {
s.logger.Error("Failed to query tower mission scores", zap.Error(err))
} else {
defer rows.Close()
defer func() { _ = rows.Close() }()
for rows.Next() {
temp := TenrouiraiCharScore{}
_ = rows.Scan(&temp.Name, &temp.Score)

6
server/channelserver/sys_channel_server.go
View File

@@ -223,7 +223,7 @@ func (s *Server) Shutdown() {
s.isShuttingDown = true
s.Unlock()
s.listener.Close()
_ = s.listener.Close()
close(s.acceptConns)
}
@@ -420,7 +420,7 @@ func (s *Server) DisconnectUser(uid uint32) {
if err != nil {
s.logger.Error("Failed to query characters for disconnect", zap.Error(err))
} else {
defer rows.Close()
defer func() { _ = rows.Close() }()
for rows.Next() {
_ = rows.Scan(&cid)
cids = append(cids, cid)
@@ -430,7 +430,7 @@ func (s *Server) DisconnectUser(uid uint32) {
for _, session := range c.sessions {
for _, cid := range cids {
if session.charID == cid {
session.rawConn.Close()
_ = session.rawConn.Close()
break
}
}

4
server/channelserver/testhelpers_db.go
View File

@@ -60,7 +60,7 @@ func SetupTestDB(t *testing.T) *sqlx.DB {
// Test connection
if err := db.Ping(); err != nil {
db.Close()
_ = db.Close()
t.Skipf("Test database not available: %v. Run: docker compose -f docker/docker-compose.test.yml up -d", err)
return nil
}
@@ -207,7 +207,7 @@ func findProjectRoot(t *testing.T) string {
func TeardownTestDB(t *testing.T, db *sqlx.DB) {
t.Helper()
if db != nil {
db.Close()
_ = db.Close()
}
}