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

Make the linter happy again?

Browse source
This commit is contained in:
Till Faelligen 2023-11-08 19:57:50 +01:00
parent c8a3bb2782
commit 434441d94a
No known key found for this signature in database
GPG key ID: 3DF82D8AB9211D4E
7 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roomserver/storage/sqlite3/state_snapshot_table.go
View file

@ -133,10 +133,10 @@ func (s *stateSnapshotStatements) BulkSelectStateBlockNIDs(
var stateBlockNIDsJSON string var stateBlockNIDsJSON string
for ; rows.Next(); i++ { for ; rows.Next(); i++ {
result := &results[i] result := &results[i]
if err := rows.Scan(&result.StateSnapshotNID, &stateBlockNIDsJSON); err != nil { if err = rows.Scan(&result.StateSnapshotNID, &stateBlockNIDsJSON); err != nil {
return nil, err return nil, err
} }
if err := json.Unmarshal([]byte(stateBlockNIDsJSON), &result.StateBlockNIDs); err != nil { if err = json.Unmarshal([]byte(stateBlockNIDsJSON), &result.StateBlockNIDs); err != nil {
return nil, err return nil, err
} }
} }

2
userapi/storage/postgres/cross_signing_keys_table.go
View file

@ -77,7 +77,7 @@ func (s *crossSigningKeysStatements) SelectCrossSigningKeysForUser(
for rows.Next() { for rows.Next() {
var keyTypeInt int16 var keyTypeInt int16
var keyData spec.Base64Bytes var keyData spec.Base64Bytes
if err := rows.Scan(&keyTypeInt, &keyData); err != nil { if err = rows.Scan(&keyTypeInt, &keyData); err != nil {
return nil, err return nil, err
} }
keyType, ok := types.KeyTypeIntToPurpose[keyTypeInt] keyType, ok := types.KeyTypeIntToPurpose[keyTypeInt]

2
userapi/storage/postgres/cross_signing_sigs_table.go
View file

@ -98,7 +98,7 @@ func (s *crossSigningSigsStatements) SelectCrossSigningSigsForTarget(
var userID string var userID string
var keyID gomatrixserverlib.KeyID var keyID gomatrixserverlib.KeyID
var signature spec.Base64Bytes var signature spec.Base64Bytes
if err := rows.Scan(&userID, &keyID, &signature); err != nil { if err = rows.Scan(&userID, &keyID, &signature); err != nil {
return nil, err return nil, err
} }
if _, ok := r[userID]; !ok { if _, ok := r[userID]; !ok {

2
userapi/storage/postgres/key_changes_table.go
View file

@ -115,7 +115,7 @@ func (s *keyChangesStatements) SelectKeyChanges(
for rows.Next() { for rows.Next() {
var userID string var userID string
var offset int64 var offset int64
if err := rows.Scan(&userID, &offset); err != nil { if err = rows.Scan(&userID, &offset); err != nil {
return nil, 0, err return nil, 0, err
} }
if offset > latestOffset { if offset > latestOffset {

2
userapi/storage/sqlite3/cross_signing_keys_table.go
View file

@ -76,7 +76,7 @@ func (s *crossSigningKeysStatements) SelectCrossSigningKeysForUser(
for rows.Next() { for rows.Next() {
var keyTypeInt int16 var keyTypeInt int16
var keyData spec.Base64Bytes var keyData spec.Base64Bytes
if err := rows.Scan(&keyTypeInt, &keyData); err != nil { if err = rows.Scan(&keyTypeInt, &keyData); err != nil {
return nil, err return nil, err
} }
keyType, ok := types.KeyTypeIntToPurpose[keyTypeInt] keyType, ok := types.KeyTypeIntToPurpose[keyTypeInt]

2
userapi/storage/sqlite3/cross_signing_sigs_table.go
View file

@ -96,7 +96,7 @@ func (s *crossSigningSigsStatements) SelectCrossSigningSigsForTarget(
var userID string var userID string
var keyID gomatrixserverlib.KeyID var keyID gomatrixserverlib.KeyID
var signature spec.Base64Bytes var signature spec.Base64Bytes
if err := rows.Scan(&userID, &keyID, &signature); err != nil { if err = rows.Scan(&userID, &keyID, &signature); err != nil {
return nil, err return nil, err
} }
if _, ok := r[userID]; !ok { if _, ok := r[userID]; !ok {

2
userapi/storage/sqlite3/key_changes_table.go
View file

@ -113,7 +113,7 @@ func (s *keyChangesStatements) SelectKeyChanges(
for rows.Next() { for rows.Next() {
var userID string var userID string
var offset int64 var offset int64
if err := rows.Scan(&userID, &offset); err != nil { if err = rows.Scan(&userID, &offset); err != nil {
return nil, 0, err return nil, 0, err
} }
if offset > latestOffset { if offset > latestOffset {