test-read-cache: drop namelen variable

Early in the function we set "namelen = strlen(name)" if "name" is
non-NULL. Later, we use "namelen" only if "name" is non-NULL. However,
it's hard to immediately see this, and it seems to confuse gcc 9.2.1
(with "-flto" interestingly, though all of the involved logic is in
inline functions; it also triggers when building with ASan).

Let's simplify the code and remove the variable entirely. There's only
one use of namelen anyway, so we can just call strlen() then. It's true
this is in a loop, so we might execute strlen() more often. But:

- this is test code that only ever loops twice in our test suite (we
do loop 1000 times in a t/perf test, but without using this option).

- a decent compiler ought to be able to hoist that out of the loop
anyway (though I wouldn't count on gcc 9.2.1 doing so!)

Reported-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/helper/test-read-cache.c b/t/helper/test-read-cache.c
index 7e79b555de8059fae8f47ae1d2382d14b830a4d1..244977a29bdfda7839c62b97e7f1ba591b02abff 100644 (file)
--- a/t/helper/test-read-cache.c
+++ b/t/helper/test-read-cache.c
@@ -4,11 +4,10 @@
 
 int cmd__read_cache(int argc, const char **argv)
 {
-       int i, cnt = 1, namelen;
+       int i, cnt = 1;
        const char *name = NULL;
 
        if (argc > 1 && skip_prefix(argv[1], "--print-and-refresh=", &name)) {
-               namelen = strlen(name);
                argc--;
                argv++;
        }
@@ -24,7 +23,7 @@ int cmd__read_cache(int argc, const char **argv)
 
                        refresh_index(&the_index, REFRESH_QUIET,
                                      NULL, NULL, NULL);
-                       pos = index_name_pos(&the_index, name, namelen);
+                       pos = index_name_pos(&the_index, name, strlen(name));
                        if (pos < 0)
                                die("%s not in index", name);
                        printf("%s is%s up to date\n", name,