mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-07 06:53:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

We need to use a named return if we want to clobber in a defer

Browse source
This commit is contained in:
Mark Haines 2017-02-21 13:15:15 +00:00
parent c422a1fdc1
commit a935ef623d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/github.com/matrix-org/dendrite/roomserver/input/latest_events.go
View file

@ -9,7 +9,7 @@ import (
// updateLatestEvents updates the list of latest events for this room. // updateLatestEvents updates the list of latest events for this room.
func updateLatestEvents( func updateLatestEvents(
db RoomEventDatabase, roomNID types.RoomNID, stateAtEvent types.StateAtEvent, event gomatrixserverlib.Event, db RoomEventDatabase, roomNID types.RoomNID, stateAtEvent types.StateAtEvent, event gomatrixserverlib.Event,
) error { ) (err error) {
oldLatest, updater, err := db.GetLatestEventsForUpdate(roomNID) oldLatest, updater, err := db.GetLatestEventsForUpdate(roomNID)
if err != nil { if err != nil {
return err return err
@ -68,5 +68,5 @@ func updateLatestEvents(
// The err should be nil at this point. // The err should be nil at this point.
// But when we call Close in the defer above it might set an error here. // But when we call Close in the defer above it might set an error here.
return err return
} }