More linter fixes

This commit is contained in:
Kovid Goyal
2023-09-18 21:07:39 +05:30
parent 7faf216f9e
commit 1a32e62ebf
7 changed files with 14 additions and 15 deletions

View File

@@ -297,7 +297,9 @@ func (self *Collection) collect_files(left, right string) error {
if err != nil {
return err
}
err = walk(right, conf.Ignore_name, right_names, right_path_map, path_name_map)
if err = walk(right, conf.Ignore_name, right_names, right_path_map, path_name_map); err != nil {
return err
}
common_names := left_names.Intersect(right_names)
changed_names := utils.NewSet[string](common_names.Len())
for n := range common_names.Iterable() {

View File

@@ -627,11 +627,9 @@ func (self *Handler) dispatch_action(name, args string) error {
}
done = self.scroll_lines(amt) != 0
default:
npos := self.scroll_pos
npos := ScrollPos{}
if strings.Contains(args, `end`) {
npos = self.max_scroll_pos
} else {
npos = ScrollPos{}
}
done = npos != self.scroll_pos
self.scroll_pos = npos

View File

@@ -286,6 +286,9 @@ func (self *stdout_filter) Write(p []byte) (n int, err error) {
func main(_ *cli.Command, _ *Options, args []string) (rc int, err error) {
delegate_to_rg, sanitized_args, kitten_opts, err := parse_args(args...)
if err != nil {
return 1, err
}
if delegate_to_rg {
sanitized_args = append([]string{"rg"}, sanitized_args...)
err = unix.Exec(RgExe(), sanitized_args, os.Environ())

View File

@@ -65,7 +65,6 @@ func get_destination(hostname string) (username, hostname_for_match string) {
}
if !parsed && strings.Contains(hostname, "@") && hostname[0] != '@' {
_, hostname_for_match, _ = strings.Cut(hostname, "@")
parsed = true
}
return
}

View File

@@ -239,7 +239,7 @@ func NewFileTransmissionCommand(serialized string) (ans *FileTransmissionCommand
return
}
field_map := ftc_field_map()
key_length, key_start, val_start, val_length := 0, 0, 0, 0
key_length, key_start, val_start := 0, 0, 0
handle_value := func(key, serialized_val string) error {
key = strings.TrimLeft(key, `;;`)
@@ -305,7 +305,7 @@ func NewFileTransmissionCommand(serialized string) (ans *FileTransmissionCommand
}
} else {
if ch == ';' {
val_length = i - val_start
val_length := i - val_start
if key_length > 0 && val_start > 0 {
err = handle_value(serialized[key_start:key_start+key_length], serialized[val_start:val_start+val_length])
if err != nil {
@@ -315,7 +315,6 @@ func NewFileTransmissionCommand(serialized string) (ans *FileTransmissionCommand
key_length = 0
key_start = i + 1
val_start = 0
val_length = 0
}
}
}

View File

@@ -51,7 +51,9 @@ globin
if err != nil {
t.Fatal(err)
}
err = p.ParseOverrides("over one", "over two")
if err = p.ParseOverrides("over one", "over two"); err != nil {
t.Fatal(err)
}
diff := cmp.Diff([]string{"a one", "incb cool", "b ", "inc1 cool", "inc2 cool", "env cool", "inc notcool", "over one", "over two"}, parsed_lines)
if diff != "" {
t.Fatalf("Unexpected parsed config values:\n%s", diff)

View File

@@ -293,12 +293,8 @@ func (r *rsync) ApplyDelta(output io.Writer, target io.ReadSeeker, op Operation)
if _, err = target.Seek(int64(r.BlockSize*int(op.BlockIndex)), io.SeekStart); err != nil {
return err
}
n, err = io.ReadAtLeast(target, buffer, r.BlockSize)
if err != nil {
if err != io.ErrUnexpectedEOF {
return err
}
err = nil
if n, err = io.ReadAtLeast(target, buffer, r.BlockSize); err != nil && err != io.ErrUnexpectedEOF {
return err
}
block = buffer[:n]
return write(block)