From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 18 Jan 2019 16:31:32 +0000 (+0100)
Subject: test-tables: make the assert more readable
X-Git-Tag: v248-rc1~166^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c3cd61e75edf4e324c1d342842cab88dd7330cc;p=thirdparty%2Fsystemd.git

test-tables: make the assert more readable

Doing it all in one line and with negation in front seemed like a good
idea at some point, but I think it is vastly easier to understand when
it is split out a bit.
---

diff --git a/src/shared/test-tables.h b/src/shared/test-tables.h
index 120dc7f2e9f..e68ec604974 100644
--- a/src/shared/test-tables.h
+++ b/src/shared/test-tables.h
@@ -31,9 +31,13 @@ static inline void _test_table(const char *name,
                 else if (boring == 1)
                         printf("%*s  ...\n", (int) strlen(name), "");
 
-                assert_se(!(i >= 0 && i < size ?
-                            sparse ? rev != i && rev != -1 : val == NULL || rev != i :
-                            val != NULL || rev != -1));
+                if (i >= 0 && i < size) {
+                        if (sparse)
+                                assert_se(rev == i || rev == -1);
+                        else
+                                assert_se(val != NULL && rev == i);
+                } else
+                        assert_se(val == NULL && rev == -1);
         }
 }