From 577314caae2635986aa30a83ed956c8741d27ffb Mon Sep 17 00:00:00 2001 From: Denton Liu Date: Wed, 3 Apr 2019 15:00:05 -0700 Subject: [PATCH 1/2] midx.c: convert FLEX_ALLOC_MEM to FLEX_ALLOC_STR Signed-off-by: Denton Liu Signed-off-by: Junio C Hamano --- midx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/midx.c b/midx.c index 8a505fd423..cb8190329a 100644 --- a/midx.c +++ b/midx.c @@ -70,7 +70,7 @@ struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local midx_map = xmmap(NULL, midx_size, PROT_READ, MAP_PRIVATE, fd, 0); - FLEX_ALLOC_MEM(m, object_dir, object_dir, strlen(object_dir)); + FLEX_ALLOC_STR(m, object_dir, object_dir); m->fd = fd; m->data = midx_map; m->data_len = midx_size; From 0cf2b0a04bb9b48fb0d91f47ce5fd2ea436112c8 Mon Sep 17 00:00:00 2001 From: Denton Liu Date: Wed, 3 Apr 2019 15:00:06 -0700 Subject: [PATCH 2/2] cocci: FLEX_ALLOC_MEM to FLEX_ALLOC_STR Ensure that a FLEX_MALLOC_MEM that uses 'strlen' for its 'len' uses FLEX_ALLOC_STR instead, since these are equivalent forms. Signed-off-by: Denton Liu Signed-off-by: Junio C Hamano --- contrib/coccinelle/flex_alloc.cocci | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 contrib/coccinelle/flex_alloc.cocci diff --git a/contrib/coccinelle/flex_alloc.cocci b/contrib/coccinelle/flex_alloc.cocci new file mode 100644 index 0000000000..e9f7f6d861 --- /dev/null +++ b/contrib/coccinelle/flex_alloc.cocci @@ -0,0 +1,13 @@ +@@ +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);