Browse Source

remove useless close()

pull/169/head
aler9 5 years ago
parent
commit
0495c1ed4b
  1. 10
      client/client.go
  2. 2
      sourcertmp/source.go
  3. 3
      sourcertsp/source.go

10
client/client.go

@ -832,8 +832,6 @@ func (c *Client) handleRequest(req *base.Request) error {
func (c *Client) runInitial() bool { func (c *Client) runInitial() bool {
readDone := make(chan error) readDone := make(chan error)
go func() { go func() {
defer close(readDone)
for { for {
req, err := c.conn.ReadRequest() req, err := c.conn.ReadRequest()
if err != nil { if err != nil {
@ -958,8 +956,6 @@ func (c *Client) runPlay() bool {
func (c *Client) runPlayUDP() { func (c *Client) runPlayUDP() {
readDone := make(chan error) readDone := make(chan error)
go func() { go func() {
defer close(readDone)
for { for {
req, err := c.conn.ReadRequest() req, err := c.conn.ReadRequest()
if err != nil { if err != nil {
@ -999,8 +995,6 @@ func (c *Client) runPlayTCP() {
readDone := make(chan error) readDone := make(chan error)
go func() { go func() {
defer close(readDone)
for { for {
recv, err := c.conn.ReadFrameTCPOrRequest(false) recv, err := c.conn.ReadFrameTCPOrRequest(false)
if err != nil { if err != nil {
@ -1144,8 +1138,6 @@ func (c *Client) runRecord() bool {
func (c *Client) runRecordUDP() { func (c *Client) runRecordUDP() {
readDone := make(chan error) readDone := make(chan error)
go func() { go func() {
defer close(readDone)
for { for {
req, err := c.conn.ReadRequest() req, err := c.conn.ReadRequest()
if err != nil { if err != nil {
@ -1220,8 +1212,6 @@ func (c *Client) runRecordTCP() {
readDone := make(chan error) readDone := make(chan error)
go func() { go func() {
defer close(readDone)
for { for {
recv, err := c.conn.ReadFrameTCPOrRequest(true) recv, err := c.conn.ReadFrameTCPOrRequest(true)
if err != nil { if err != nil {

2
sourcertmp/source.go

@ -270,8 +270,6 @@ func (s *Source) runInnerInner() bool {
readDone := make(chan error) readDone := make(chan error)
go func() { go func() {
defer close(readDone)
for { for {
pkt, err := conn.ReadPacket() pkt, err := conn.ReadPacket()
if err != nil { if err != nil {

3
sourcertsp/source.go

@ -253,7 +253,6 @@ func (s *Source) runUDP(u *url.URL, conn *gortsplib.ConnClient, tracks gortsplib
tcpConnDone := make(chan error) tcpConnDone := make(chan error)
go func() { go func() {
defer close(tcpConnDone)
tcpConnDone <- conn.LoopUDP() tcpConnDone <- conn.LoopUDP()
}() }()
@ -305,8 +304,6 @@ func (s *Source) runTCP(u *url.URL, conn *gortsplib.ConnClient, tracks gortsplib
tcpConnDone := make(chan error) tcpConnDone := make(chan error)
go func() { go func() {
defer close(tcpConnDone)
for { for {
trackId, streamType, content, err := conn.ReadFrameTCP() trackId, streamType, content, err := conn.ReadFrameTCP()
if err != nil { if err != nil {

Loading…
Cancel
Save