mirror
/
websocket
mirror of https://github.com/gorilla/websocket.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

mod: remove judge dict nil

This commit is contained in:
misu 2018-01-29 18:12:43 +09:00
parent e2dd00db3d
commit a9475f2ccf
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compression.go
View File

@ -46,12 +46,7 @@ func decompressContextTakeover(r io.Reader, dict *[]byte) io.ReadCloser {
"\x01\x00\x00\xff\xff" "\x01\x00\x00\xff\xff"
fr, _ := flateReaderPool.Get().(io.ReadCloser) fr, _ := flateReaderPool.Get().(io.ReadCloser)
if dict != nil {
fr.(flate.Resetter).Reset(io.MultiReader(r, strings.NewReader(tail)), *dict) fr.(flate.Resetter).Reset(io.MultiReader(r, strings.NewReader(tail)), *dict)
} else {
fr.(flate.Resetter).Reset(io.MultiReader(r, strings.NewReader(tail)), nil)
}
return &flateReadWrapper{fr: fr, hasDict: true, dict: dict} return &flateReadWrapper{fr: fr, hasDict: true, dict: dict}
} }
@ -75,13 +70,7 @@ func compressNoContextTakeover(w io.WriteCloser, level int, dict *[]byte) io.Wri
func compressContextTakeover(w io.WriteCloser, level int, dict *[]byte) io.WriteCloser { func compressContextTakeover(w io.WriteCloser, level int, dict *[]byte) io.WriteCloser {
tw := &truncWriter{w: w} tw := &truncWriter{w: w}
var fw *flate.Writer fw, _ := flate.NewWriterDict(tw, level, *dict)
if dict != nil {
fw, _ = flate.NewWriterDict(tw, level, *dict)
} else {
fw, _ = flate.NewWriterDict(tw, level, nil)
}
return &flateWriteWrapper{fw: fw, tw: tw, hasDict: true, dict: dict} return &flateWriteWrapper{fw: fw, tw: tw, hasDict: true, dict: dict}
} }