Skip to content

Commit a6907b0

Browse files
authored
use function call to replace goto (#4414)
1 parent 05cb243 commit a6907b0

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

pkg/object/ufile.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -176,15 +176,13 @@ func (u *ufile) Copy(dst, src string) error {
176176
uri := fmt.Sprintf("uploadhit?Hash=%s&FileName=%s&FileSize=%s", hash, dst, lens[0])
177177
resp, err = u.request("POST", uri, nil, nil)
178178
if err != nil {
179-
goto fallback
179+
return copyObj(u, dst, src)
180180
}
181181
defer cleanup(resp)
182182
if resp.StatusCode != 200 {
183-
goto fallback
183+
return copyObj(u, dst, src)
184184
}
185185
return nil
186-
fallback:
187-
return copyObj(u, dst, src)
188186
}
189187

190188
type DataItem struct {

pkg/sync/sync.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ func doCopySingle(src, dst object.ObjectStorage, key string, size int64) error {
371371
// download the object into disk
372372
if f, err = os.CreateTemp("", "rep"); err != nil {
373373
logger.Warnf("create temp file: %s", err)
374-
goto SINGLE
374+
return doCopySingle0(src, dst, key, size)
375375
}
376376
_ = os.Remove(f.Name()) // will be deleted after Close()
377377
defer f.Close()
@@ -394,7 +394,10 @@ func doCopySingle(src, dst object.ObjectStorage, key string, size int64) error {
394394
}
395395
return err
396396
}
397-
SINGLE:
397+
return doCopySingle0(src, dst, key, size)
398+
}
399+
400+
func doCopySingle0(src, dst object.ObjectStorage, key string, size int64) error {
398401
if limiter != nil {
399402
limiter.Wait(size)
400403
}

0 commit comments

Comments
 (0)