From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 23 Mar 2018 17:26:58 +0000 (+0100)
Subject: copy: reduce number of checks
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=68aea2470f0eaf69e32a74b0734074936b63c977;p=elogind.git

copy: reduce number of checks

We check max_bytes twice here, let's simplify that, and reduce one level
of indentation.
---

diff --git a/src/basic/copy.c b/src/basic/copy.c
index 7d46f5678..d008204a4 100644
--- a/src/basic/copy.c
+++ b/src/basic/copy.c
@@ -171,13 +171,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) {