opensource/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-09-21 14:20:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace ioutil.Discard with io.Discard (#20707)

Browse Source
This commit is contained in:
Tim Scheuermann
2022-07-27 11:40:33 +02:00
committed by GitHub
parent c00609ab8e
commit eba08cbb11
16 changed files with 18 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api4/apitestlib.go
+1 -1
View File
@@ -381,7 +381,7 @@ func (th *TestHelper) TearDown() {
func closeBody(r *http.Response) {
if r.Body != nil {
_, _ = io.Copy(ioutil.Discard, r.Body)
_, _ = io.Copy(io.Discard, r.Body)
_ = r.Body.Close()
}
}
api4/brand.go
+1 -2
View File
@@ -5,7 +5,6 @@ package api4
import (
"io"
"io/ioutil"
"net/http"
"github.com/mattermost/mattermost-server/v6/audit"
@@ -33,7 +32,7 @@ func getBrandImage(c *Context, w http.ResponseWriter, r *http.Request) {
}
func uploadBrandImage(c *Context, w http.ResponseWriter, r *http.Request) {
defer io.Copy(ioutil.Discard, r.Body)
defer io.Copy(io.Discard, r.Body)
if r.ContentLength > *c.App.Config().FileSettings.MaxFileSize {
c.Err = model.NewAppError("uploadBrandImage", "api.admin.upload_brand_image.too_large.app_error", nil, "", http.StatusRequestEntityTooLarge)
api4/emoji.go
+1 -2
View File
@@ -6,7 +6,6 @@ package api4
import (
"encoding/json"
"io"
"io/ioutil"
"net/http"
"github.com/mattermost/mattermost-server/v6/app"
@@ -32,7 +31,7 @@ func (api *API) InitEmoji() {
}
func createEmoji(c *Context, w http.ResponseWriter, r *http.Request) {
defer io.Copy(ioutil.Discard, r.Body)
defer io.Copy(io.Discard, r.Body)
if !*c.App.Config().ServiceSettings.EnableCustomEmoji {
c.Err = model.NewAppError("createEmoji", "api.emoji.disabled.app_error", nil, "", http.StatusNotImplemented)
api4/remote_cluster.go
+1 -2
View File
@@ -6,7 +6,6 @@ package api4
import (
"encoding/json"
"io"
"io/ioutil"
"net/http"
"time"
@@ -222,7 +221,7 @@ func uploadRemoteData(c *Context, w http.ResponseWriter, r *http.Request) {
}
func remoteSetProfileImage(c *Context, w http.ResponseWriter, r *http.Request) {
defer io.Copy(ioutil.Discard, r.Body)
defer io.Copy(io.Discard, r.Body)
c.RequireUserId()
if c.Err != nil {
api4/system.go
+1 -2
View File
@@ -8,7 +8,6 @@ import (
"encoding/json"
"fmt"
"io"
"io/ioutil"
"net/http"
"path"
"reflect"
@@ -527,7 +526,7 @@ func getRedirectLocation(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
defer func() {
io.Copy(ioutil.Discard, res.Body)
io.Copy(io.Discard, res.Body)
res.Body.Close()
}()
api4/team.go
+1 -2
View File
@@ -9,7 +9,6 @@ import (
"encoding/json"
"fmt"
"io"
"io/ioutil"
"net/http"
"regexp"
"strconv"
@@ -1610,7 +1609,7 @@ func getTeamIcon(c *Context, w http.ResponseWriter, r *http.Request) {
}
func setTeamIcon(c *Context, w http.ResponseWriter, r *http.Request) {
defer io.Copy(ioutil.Discard, r.Body)
defer io.Copy(io.Discard, r.Body)
c.RequireTeamId()
if c.Err != nil {
api4/user.go
+1 -2
View File
@@ -7,7 +7,6 @@ import (
"encoding/json"
"fmt"
"io"
"io/ioutil"
"net/http"
"strconv"
"strings"
@@ -419,7 +418,7 @@ func getProfileImage(c *Context, w http.ResponseWriter, r *http.Request) {
}
func setProfileImage(c *Context, w http.ResponseWriter, r *http.Request) {
defer io.Copy(ioutil.Discard, r.Body)
defer io.Copy(io.Discard, r.Body)
c.RequireUserId()
if c.Err != nil {