Refactor the calloc semantic patch.

This does not change its effects.

diff --git a/scripts/coccinelle/calloc.cocci b/scripts/coccinelle/calloc.cocci
index 8a295eb4fdb6c9e11478382a3499f0e23f87819e..f7d7ec0dc3834ede45be2cc47edac8c2e8553fb2 100644 (file)
--- a/scripts/coccinelle/calloc.cocci
+++ b/scripts/coccinelle/calloc.cocci
@@ -1,15 +1,10 @@
 // Use calloc or realloc as appropriate instead of multiply-and-alloc
 
 @malloc_to_calloc@
-expression a,b;
-@@
-- tor_malloc(a * b)
-+ tor_calloc(a, b)
-
-@malloc_zero_to_calloc@
+identifier f =~ "(tor_malloc|tor_malloc_zero)";
 expression a, b;
 @@
-- tor_malloc_zero(a * b)
+- f(a * b)
 + tor_calloc(a, b)
 
 @realloc_to_reallocarray@