summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/copy.go6
1 files changed, 1 insertions, 5 deletions
diff --git a/common/copy.go b/common/copy.go
index a896fb4..6f47a62 100644
--- a/common/copy.go
+++ b/common/copy.go
@@ -18,10 +18,7 @@ func (rf readerFunc) Read(p []byte) (n int, err error) { return rf(p) }
// Copy slightly modified function signature:
// - context has been added in order to propagate cancellation
// - (undo by Keuin) I do not return the number of bytes written, has it is not useful in my use case
-// - (added by Keuin) add a isCancelled return value indicating the copy is stopped by cancelling the context
-func Copy(ctx context.Context, out io.Writer, in io.Reader) (written int64, err error, isCancelled bool) {
- isCancelled = false
-
+func Copy(ctx context.Context, out io.Writer, in io.Reader) (written int64, err error) {
// Copy will call the Reader and Writer interface multiple time, in order
// to copy by chunk (avoiding loading the whole file in memory).
// I insert the ability to cancel before read time as it is the earliest
@@ -34,7 +31,6 @@ func Copy(ctx context.Context, out io.Writer, in io.Reader) (written int64, err
// if context has been canceled
case <-ctx.Done():
// stop process and propagate "context canceled" error
- isCancelled = true
return 0, ctx.Err()
default:
// otherwise just run default io.Reader implementation