]> Cypherpunks.ru repositories - nncp.git/commitdiff
Seek-related constants usage
authorSergey Matveev <stargrave@stargrave.org>
Sat, 27 Apr 2019 08:46:04 +0000 (11:46 +0300)
committerSergey Matveev <stargrave@stargrave.org>
Sat, 27 Apr 2019 08:46:04 +0000 (11:46 +0300)
src/cypherpunks.ru/nncp/jobs.go
src/cypherpunks.ru/nncp/sp.go
src/cypherpunks.ru/nncp/tx.go

index bea093c91e5fc8266c0b3657f2b292fb718102f2..f3aa9e976b99df64fc7be204f83b6c3420be52ad 100644 (file)
@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package nncp
 
 import (
+       "io"
        "os"
        "path/filepath"
        "strconv"
@@ -68,7 +69,7 @@ func (ctx *Ctx) Jobs(nodeId *NodeId, xx TRxTx) chan Job {
                                fd.Close()
                                continue
                        }
-                       fd.Seek(0, 0)
+                       fd.Seek(0, io.SeekStart)
                        ctx.LogD("jobs", SDS{
                                "xx":   string(xx),
                                "node": pktEnc.Sender,
index c9474bd981deb2e2964a580516ec32fbae3d5798..cd8272c989326e93c9b0b5bc916a0718e700037b 100644 (file)
@@ -622,7 +622,7 @@ func (state *SPState) StartWorkers(
                                var buf []byte
                                if freq.Offset < fullSize {
                                        state.ctx.LogD("sp-file", sdsp, "seeking")
-                                       if _, err = fd.Seek(int64(freq.Offset), 0); err != nil {
+                                       if _, err = fd.Seek(int64(freq.Offset), io.SeekStart); err != nil {
                                                state.ctx.LogE("sp-file", SdsAdd(sdsp, SDS{"err": err}), "")
                                                break
                                        }
@@ -868,7 +868,7 @@ func (state *SPState) ProcessSP(payload []byte) ([][]byte, error) {
                                SdsAdd(sdsp, SDS{"offset": strconv.FormatInt(int64(file.Offset), 10)}),
                                "seeking",
                        )
-                       if _, err = fd.Seek(int64(file.Offset), 0); err != nil {
+                       if _, err = fd.Seek(int64(file.Offset), io.SeekStart); err != nil {
                                state.ctx.LogE("sp-file", SdsAdd(sdsp, SDS{"err": err}), "")
                                fd.Close()
                                return nil, err
@@ -901,7 +901,7 @@ func (state *SPState) ProcessSP(payload []byte) ([][]byte, error) {
                                }
                                state.wg.Add(1)
                                defer state.wg.Done()
-                               fd.Seek(0, 0)
+                               fd.Seek(0, io.SeekStart)
                                state.ctx.LogD("sp-file", sdsp, "checking")
                                gut, err := Check(fd, file.Hash[:])
                                fd.Close()
index 260f9bd811ebd6a79599af7204630ceab19f72ff..b3f8da5b00031021921633415fcc133f514f676c 100644 (file)
@@ -128,7 +128,7 @@ func prepareTxFile(srcPath string) (io.Reader, *os.File, int64, error) {
                if err = tmpW.Flush(); err != nil {
                        return nil, nil, 0, err
                }
-               src.Seek(0, 0)
+               src.Seek(0, io.SeekStart)
                r, w := io.Pipe()
                go ae(tmpKey, bufio.NewReader(src), w)
                reader = r