all: Dead code cleanup

This commit is contained in:
Audrius Butkevicius 2016-04-09 01:10:31 +00:00 committed by Jakob Borg
parent 393798098c
commit 2eb8a9ef56
5 changed files with 1 additions and 44 deletions

View File

@ -117,7 +117,6 @@ func init() {
var ( var (
myID protocol.DeviceID myID protocol.DeviceID
stop = make(chan int) stop = make(chan int)
cert tls.Certificate
lans []*net.IPNet lans []*net.IPNet
) )

View File

@ -304,10 +304,6 @@ func (info ConnectionInfo) MarshalJSON() ([]byte, error) {
// ConnectionStats returns a map with connection statistics for each device. // ConnectionStats returns a map with connection statistics for each device.
func (m *Model) ConnectionStats() map[string]interface{} { func (m *Model) ConnectionStats() map[string]interface{} {
type remoteAddrer interface {
RemoteAddr() net.Addr
}
m.pmut.RLock() m.pmut.RLock()
m.fmut.RLock() m.fmut.RLock()

View File

@ -2,10 +2,7 @@
package protocol package protocol
import ( import "time"
"io"
"time"
)
type TestModel struct { type TestModel struct {
data []byte data []byte
@ -60,24 +57,3 @@ func (t *TestModel) closedError() error {
return nil // Timeout return nil // Timeout
} }
} }
type ErrPipe struct {
io.PipeWriter
written int
max int
err error
closed bool
}
func (e *ErrPipe) Write(data []byte) (int, error) {
if e.closed {
return 0, e.err
}
if e.written+len(data) > e.max {
n, _ := e.PipeWriter.Write(data[:e.max-e.written])
e.PipeWriter.CloseWithError(e.err)
e.closed = true
return n, e.err
}
return e.PipeWriter.Write(data)
}

View File

@ -566,16 +566,6 @@ func (c *rawConnection) handleResponse(msgID int, resp ResponseMessage) {
c.awaitingMut.Unlock() c.awaitingMut.Unlock()
} }
func (c *rawConnection) handlePong(msgID int) {
c.awaitingMut.Lock()
if rc := c.awaiting[msgID]; rc != nil {
c.awaiting[msgID] = nil
rc <- asyncResult{}
close(rc)
}
c.awaitingMut.Unlock()
}
func (c *rawConnection) send(msgID int, msgType int, msg encodable, done chan struct{}) bool { func (c *rawConnection) send(msgID int, msgType int, msg encodable, done chan struct{}) bool {
if msgID < 0 { if msgID < 0 {
select { select {

View File

@ -45,10 +45,6 @@ var testdata = testfileList{
{"further-excludes", 5, "7eb0a548094fa6295f7fd9200d69973e5f5ec5c04f2a86d998080ac43ecf89f1"}, {"further-excludes", 5, "7eb0a548094fa6295f7fd9200d69973e5f5ec5c04f2a86d998080ac43ecf89f1"},
} }
var correctIgnores = map[string][]string{
".": {".*", "quux"},
}
func init() { func init() {
// This test runs the risk of entering infinite recursion if it fails. // This test runs the risk of entering infinite recursion if it fails.
// Limit the stack size to 10 megs to crash early in that case instead of // Limit the stack size to 10 megs to crash early in that case instead of