A check into the history of this code revealed no particular reason for
the code to be written in this way. All popular compilers are capable of
unrolling loops if it benefits performance, and once this code is
replaced with a loop, the magic number 6 used in multiple places in this
function can be replaced with a named constant.

Reviewed-by: Derrick Stolee <[email protected]>
Reviewed-by: Johannes Schindelin <[email protected]>
Reviewed-by: Jeff King <[email protected]>
Signed-off-by: Alex Henrie <[email protected]>
---
 wrapper.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/wrapper.c b/wrapper.c
index c55d7722d7..c23ac6adcd 100644
--- a/wrapper.c
+++ b/wrapper.c
@@ -469,13 +469,12 @@ int git_mkstemps_mode(char *pattern, int suffix_len, int 
mode)
        filename_template = &pattern[len - 6 - suffix_len];
        for (count = 0; count < TMP_MAX; ++count) {
                uint64_t v = value;
+               int i;
                /* Fill in the random bits. */
-               filename_template[0] = letters[v % num_letters]; v /= 
num_letters;
-               filename_template[1] = letters[v % num_letters]; v /= 
num_letters;
-               filename_template[2] = letters[v % num_letters]; v /= 
num_letters;
-               filename_template[3] = letters[v % num_letters]; v /= 
num_letters;
-               filename_template[4] = letters[v % num_letters]; v /= 
num_letters;
-               filename_template[5] = letters[v % num_letters]; v /= 
num_letters;
+               for (i = 0; i < 6; i++) {
+                       filename_template[i] = letters[v % num_letters];
+                       v /= num_letters;
+               }
 
                fd = open(pattern, O_CREAT | O_EXCL | O_RDWR, mode);
                if (fd >= 0)
-- 
2.23.0

Reply via email to