From dd641ad1b8c196208aaf74ccfd1f0a0598745484 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 23 Mar 2018 18:26:58 +0100 Subject: [PATCH] copy: reduce number of checks We check max_bytes twice here, let's simplify that, and reduce one level of indentation. --- src/basic/copy.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/basic/copy.c b/src/basic/copy.c index 96d059d..5539487 100644 --- a/src/basic/copy.c +++ b/src/basic/copy.c @@ -169,13 +169,11 @@ int copy_bytes_full( for (;;) { ssize_t n; - if (max_bytes != (uint64_t) -1) { - if (max_bytes <= 0) - return 1; /* return > 0 if we hit the max_bytes limit */ + if (max_bytes <= 0) + return 1; /* return > 0 if we hit the max_bytes limit */ - if (m > max_bytes) - m = max_bytes; - } + if (max_bytes != UINT64_MAX && m > max_bytes) + m = max_bytes; /* First try copy_file_range(), unless we already tried */ if (try_cfr) { -- 2.7.4