[PATCH] coccinelle: merge two rules from flex_alloc.cocci
From: Markus Elfring <hidden>
Date: 2019-11-12 15:34:39
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Markus Elfring <redacted> Date: Tue, 12 Nov 2019 16:30:14 +0100 This script contained two transformation rules for the semantic patch language which used duplicate code. Thus combine these rules by using a SmPL disjunction for the replacement of two identifiers. Signed-off-by: Markus Elfring <redacted> --- contrib/coccinelle/flex_alloc.cocci | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/contrib/coccinelle/flex_alloc.cocci b/contrib/coccinelle/flex_alloc.cocci
index e9f7f6d861..1b4fa8f801 100644
--- a/contrib/coccinelle/flex_alloc.cocci
+++ b/contrib/coccinelle/flex_alloc.cocci@@ -1,13 +1,14 @@ -@@ +@adjustment@ expression str; -identifier x, flexname; -@@ -- FLEX_ALLOC_MEM(x, flexname, str, strlen(str)); -+ FLEX_ALLOC_STR(x, flexname, str); - -@@ -expression str; -identifier x, ptrname; -@@ -- FLEXPTR_ALLOC_MEM(x, ptrname, str, strlen(str)); -+ FLEXPTR_ALLOC_STR(x, ptrname, str); +identifier x, name; +@@ +( +-FLEX_ALLOC_MEM ++FLEX_ALLOC_STR +| +-FLEXPTR_ALLOC_MEM ++FLEXPTR_ALLOC_STR +) + (x, name, str +- , strlen(str) + ); --
2.24.0