Don't overwrite global err before return (#1293)

Signed-off-by: Olivier Charvin <git@olivier.pfad.fr>

2 files changed, 6 insertions, 17 deletions

diff --git a/syncapi/consumers/keychange.go b/syncapi/consumers/keychange.go
index e14d2223..ee95e09d 100644
--- a/syncapi/consumers/keychange.go
+++ b/syncapi/consumers/keychange.go
@@ -95,9 +95,8 @@ func (s *OutputKeyChangeEventConsumer) updateOffset(msg *sarama.ConsumerMessage)
 }
 
 func (s *OutputKeyChangeEventConsumer) onMessage(msg *sarama.ConsumerMessage) error {
-	defer func() {
-		s.updateOffset(msg)
-	}()
+	defer s.updateOffset(msg)
+
 	var output api.DeviceMessage
 	if err := json.Unmarshal(msg.Value, &output); err != nil {
 		// If the message was invalid, log it and move on to the next message in the stream
diff --git a/syncapi/storage/shared/syncserver.go b/syncapi/storage/shared/syncserver.go
index 699a6647..4031dc74 100644
--- a/syncapi/storage/shared/syncserver.go
+++ b/syncapi/storage/shared/syncserver.go
@@ -455,13 +455,8 @@ func (d *Database) addPDUDeltaToResponse(
 	if err != nil {
 		return nil, err
 	}
-	var succeeded bool
-	defer func() {
-		txerr := sqlutil.EndTransaction(txn, &succeeded)
-		if err == nil && txerr != nil {
-			err = txerr
-		}
-	}()
+	succeeded := false
+	defer sqlutil.EndTransactionWithCheck(txn, &succeeded, &err)
 
 	stateFilter := gomatrixserverlib.DefaultStateFilter() // TODO: use filter provided in request
 
@@ -641,13 +636,8 @@ func (d *Database) getResponseWithPDUsForCompleteSync(
 	if err != nil {
 		return
 	}
-	var succeeded bool
-	defer func() {
-		txerr := sqlutil.EndTransaction(txn, &succeeded)
-		if err == nil && txerr != nil {
-			err = txerr
-		}
-	}()
+	succeeded := false
+	defer sqlutil.EndTransactionWithCheck(txn, &succeeded, &err)
 
 	// Get the current sync position which we will base the sync response on.
 	toPos, err = d.syncPositionTx(ctx, txn)