clar: avoid using the comma operator unnecessarily

The comma operator is a somewhat obscure C feature that is often used by
mistake and can even cause unintentional code flow. In this instance, it
makes the code harder to read than necessary, too. Better use a
semicolon instead.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Acked-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/unit-tests/clar/clar/fs.h b/t/unit-tests/clar/clar/fs.h
index 8b206179fc4ea17abc57345c1f863e04aab98d4e..2203743fb480467c73b037f3205e364e9a0f0d77 100644 (file)
--- a/t/unit-tests/clar/clar/fs.h
+++ b/t/unit-tests/clar/clar/fs.h
@@ -376,9 +376,12 @@ fs_copydir_helper(const char *source, const char *dest, int dest_mode)
        mkdir(dest, dest_mode);
 
        cl_assert_(source_dir = opendir(source), "Could not open source dir");
-       while ((d = (errno = 0, readdir(source_dir))) != NULL) {
+       for (;;) {
                char *child;
 
+               errno = 0;
+               if ((d = readdir(source_dir)) == NULL)
+                       break;
                if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
                        continue;
 
@@ -479,9 +482,12 @@ fs_rmdir_helper(const char *path)
        struct dirent *d;
 
        cl_assert_(dir = opendir(path), "Could not open dir");
-       while ((d = (errno = 0, readdir(dir))) != NULL) {
+       for (;;) {
                char *child;
 
+               errno = 0;
+               if ((d = readdir(dir)) == NULL)
+                       break;
                if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
                        continue;