octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-03 07:12:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

all: Clean up fmt.Errorf usage (#8309)

Browse Source
This commit is contained in:
greatroar 2022-04-27 20:30:13 +02:00 committed by GitHub
parent 4031568cdf
commit 49488c0e71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/syncthing/cli/operations.go
View File

@ -8,6 +8,7 @@ package cli
import ( import (
"bufio" "bufio"
"errors"
"fmt" "fmt"
"path/filepath" "path/filepath"
@ -77,12 +78,12 @@ func foldersOverride(c *cli.Context) error {
if body != "" { if body != "" {
errStr += "\nBody: " + body errStr += "\nBody: " + body
} }
return fmt.Errorf(errStr) return errors.New(errStr)
} }
return nil return nil
} }
} }
return fmt.Errorf("Folder " + rid + " not found") return fmt.Errorf("Folder %q not found", rid)
} }
func setDefaultIgnores(c *cli.Context) error { func setDefaultIgnores(c *cli.Context) error {

7
cmd/syncthing/decrypt/decrypt.go
View File

@ -10,6 +10,7 @@ package decrypt
import ( import (
"encoding/binary" "encoding/binary"
"encoding/json" "encoding/json"
"errors"
"fmt" "fmt"
"io" "io"
"log" "log"
@ -45,7 +46,7 @@ func (c *CLI) Run() error {
log.SetFlags(0) log.SetFlags(0)
if c.To == "" && !c.VerifyOnly { if c.To == "" && !c.VerifyOnly {
return fmt.Errorf("must set --to or --verify-only") return errors.New("must set --to or --verify-only")
} }
if c.TokenPath == "" { if c.TokenPath == "" {
@ -138,7 +139,7 @@ func (c *CLI) process(srcFs fs.Filesystem, dstFs fs.Filesystem, path string) err
} }
defer encFd.Close() defer encFd.Close()
encFi, err := c.loadEncryptedFileInfo(encFd) encFi, err := loadEncryptedFileInfo(encFd)
if err != nil { if err != nil {
return fmt.Errorf("%s: loading metadata trailer: %w", path, err) return fmt.Errorf("%s: loading metadata trailer: %w", path, err)
} }
@ -246,7 +247,7 @@ func (c *CLI) decryptFile(encFi *protocol.FileInfo, plainFi *protocol.FileInfo,
// loadEncryptedFileInfo loads the encrypted FileInfo trailer from a file on // loadEncryptedFileInfo loads the encrypted FileInfo trailer from a file on
// disk. // disk.
func (c *CLI) loadEncryptedFileInfo(fd fs.File) (*protocol.FileInfo, error) { func loadEncryptedFileInfo(fd fs.File) (*protocol.FileInfo, error) {
// Seek to the size of the trailer block // Seek to the size of the trailer block
if _, err := fd.Seek(-4, io.SeekEnd); err != nil { if _, err := fd.Seek(-4, io.SeekEnd); err != nil {
return nil, err return nil, err

3
cmd/syncthing/generate/generate.go
View File

@ -11,6 +11,7 @@ import (
"bufio" "bufio"
"context" "context"
"crypto/tls" "crypto/tls"
"errors"
"fmt" "fmt"
"log" "log"
"os" "os"
@ -40,7 +41,7 @@ func (c *CLI) Run() error {
if c.HomeDir != "" { if c.HomeDir != "" {
if c.ConfDir != "" { if c.ConfDir != "" {
return fmt.Errorf("--home must not be used together with --config") return errors.New("--home must not be used together with --config")
} }
c.ConfDir = c.HomeDir c.ConfDir = c.HomeDir
} }

4
lib/protocol/deviceid.go
View File

@ -45,7 +45,7 @@ func DeviceIDFromString(s string) (DeviceID, error) {
func DeviceIDFromBytes(bs []byte) (DeviceID, error) { func DeviceIDFromBytes(bs []byte) (DeviceID, error) {
var n DeviceID var n DeviceID
if len(bs) != len(n) { if len(bs) != len(n) {
return n, fmt.Errorf("incorrect length of byte slice representing device ID") return n, errors.New("incorrect length of byte slice representing device ID")
} }
copy(n[:], bs) copy(n[:], bs)
return n, nil return n, nil
@ -129,7 +129,7 @@ func (n *DeviceID) UnmarshalText(bs []byte) error {
} }
} }
func (n *DeviceID) ProtoSize() int { func (*DeviceID) ProtoSize() int {
// Used by protobuf marshaller. // Used by protobuf marshaller.
return DeviceIDLength return DeviceIDLength
} }