Skip to contentSkip to conversation

coccinelle: merge three rules from qsort.cocci

PATCH New Markus Elfring 1 participant 1 message Nov 12, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 coccinelle: merge three rules from qsort.cocci

From: Markus Elfring <[email protected]>
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.

---
 contrib/coccinelle/qsort.cocci | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)
contrib/coccinelle/qsort.cocci +1 -13
index 22b93a9966..b2130a5e51 100644
@@ -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