[PATCH] coccinelle: merge three rules from qsort.cocci

From: Markus Elfring <markus.elfring@web.de>
Date: Nov 12, 2019, 18:36 UTC
Message-ID: <41723f0e-1c8b-5e5d-9d8c-b0df1482166d@web.de>

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 12 Nov 2019 19:30:28 +0100

This script contained three transformation rules for the semantic patch language where a condition check should be removed before QSORT() calls. Combine these rules by using a SmPL disjunction.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 contrib/coccinelle/qsort.cocci | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/contrib/coccinelle/qsort.cocci b/contrib/coccinelle/qsort.cocci
index 22b93a9966..b2130a5e51 100644
--- a/contrib/coccinelle/qsort.cocci
+++ b/contrib/coccinelle/qsort.cocci
@@ -21,17 +21,5 @@ expression nmemb, compar;
 @@
 expression base, nmemb, compar;
 @@
-- if (nmemb)
-    QSORT(base, nmemb, compar);
-
-@@
-expression base, nmemb, compar;
-@@
-- if (nmemb > 0)
-    QSORT(base, nmemb, compar);
-
-@@
-expression base, nmemb, compar;
-@@
-- if (nmemb > 1)
+- if ( \( nmemb \| nmemb > \( 0 \| 1 \) \) )
     QSORT(base, nmemb, compar);
--
2.24.0