From e86dde0ffb4c97c7c65c323377978883788234d1 Mon Sep 17 00:00:00 2001 From: Pushpam Choudhary Date: Mon, 27 Jan 2020 00:24:36 +0530 Subject: [PATCH] Code formatting changes --- common/test/client.go | 4 ++-- common/test/config.go | 4 +++- mediaapi/fileutils/fileutils.go | 5 +++-- roomserver/storage/postgres/invite_table.go | 6 ++++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/common/test/client.go b/common/test/client.go index 3fd890522..a6598da94 100644 --- a/common/test/client.go +++ b/common/test/client.go @@ -82,8 +82,8 @@ func (r *Request) Do() (err error) { if err != nil { return err } - defer (func() { - if err == nil { err = res.Body.Close() } + defer (func() { + err = res.Body.Close() })() if res.StatusCode != r.WantedStatusCode { diff --git a/common/test/config.go b/common/test/config.go index 03586bb06..aa7950bbe 100644 --- a/common/test/config.go +++ b/common/test/config.go @@ -143,7 +143,9 @@ func NewMatrixKey(matrixKeyPath string) (err error) { } defer (func() { - if err == nil {err = keyOut.Close()} + if err == nil { + err = keyOut.Close() + } })() err = pem.Encode(keyOut, &pem.Block{ diff --git a/mediaapi/fileutils/fileutils.go b/mediaapi/fileutils/fileutils.go index 89246d1ad..190830db6 100644 --- a/mediaapi/fileutils/fileutils.go +++ b/mediaapi/fileutils/fileutils.go @@ -113,8 +113,9 @@ func WriteTempFile(reqReader io.Reader, maxFileSizeBytes config.FileSizeBytes, a return } defer (func() { - if err == nil {err = tmpFile.Close() - } + if err == nil { + err = tmpFile.Close() + } })() // The amount of data read is limited to maxFileSizeBytes. At this point, if there is more data it will be truncated. diff --git a/roomserver/storage/postgres/invite_table.go b/roomserver/storage/postgres/invite_table.go index f7fd6088f..c393997a3 100644 --- a/roomserver/storage/postgres/invite_table.go +++ b/roomserver/storage/postgres/invite_table.go @@ -120,8 +120,10 @@ func (s *inviteStatements) updateInviteRetired( if err != nil { return nil, err } - defer (func() { - if err == nil {err = rows.Close()} + defer (func() { + if err == nil { + err = rows.Close() + } })() for rows.Next() { var inviteEventID string