8000 Generic Codec by ghatdev · Pull Request #165 · golang/net · GitHub
[go: up one dir, main page]
Skip to content

Generic Codec #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Generic Codec #165

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53c8336
generic codec
ghatdev Feb 6, 2023
2227acd
changed deprecated ioutil functions to io
ghatdev Feb 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
changed deprecated ioutil functions to io
  • Loading branch information
@ghatdev
ghatdev committed Feb 6, 2023
commit 2227acd407dd3f192c260f14f20f2ff93f384693
7 changes: 3 additions & 4 deletions websocket/websocket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
"encoding/json"
"errors"
"io"
"io/ioutil"
"net"
"net/http"
"net/url"
Expand Down Expand Up @@ -208,7 +207,7 @@ again:
n, err = ws.frameReader.Read(msg)
if err == io.EOF {
if trailer := ws.frameReader.TrailerReader(); trailer != nil {
io.Copy(ioutil.Discard, trailer)
io.Copy(io.Discard, trailer)
}
ws.frameReader = nil
goto again
Expand Down Expand Up @@ -330,7 +329,7 @@ func (cd Codec[T]) Receive(ws *Conn, v interface{}) (err error) {
ws.rio.Lock()
defer ws.rio.Unlock()
if ws.frameReader != nil {
_, err = io.Copy(ioutil.Discard, ws.frameReader)
_, err = io.Copy(io.Discard, ws.frameReader)
if err != nil {
return err
}
Expand Down Expand Up @@ -362,7 +361,7 @@ again:
return ErrFrameTooLarge
}
payloadType := frame.PayloadType()
data, err := ioutil.ReadAll(frame)
data, err := io.ReadAll(frame)
if err != nil {
return err
}
Expand Down
0