diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-04-22 11:14:47 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-22 11:14:48 +0900 |
| commit | 5f65d7d9bcd4bd863127df1dc10546f2b82a6b68 (patch) | |
| tree | c9b643a3ba515225f6d73a3b98444d942a409fc7 | |
| parent | Merge branch 'js/spell-out-options-in-tests' (diff) | |
| parent | cocci: FLEX_ALLOC_MEM to FLEX_ALLOC_STR (diff) | |
| download | tgif-5f65d7d9bcd4bd863127df1dc10546f2b82a6b68.tar.xz | |
Merge branch 'dl/flex-str-cocci'
Code clean-up.
* dl/flex-str-cocci:
cocci: FLEX_ALLOC_MEM to FLEX_ALLOC_STR
midx.c: convert FLEX_ALLOC_MEM to FLEX_ALLOC_STR
| -rw-r--r-- | contrib/coccinelle/flex_alloc.cocci | 13 | ||||
| -rw-r--r-- | midx.c | 2 |
2 files changed, 14 insertions, 1 deletions
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); @@ -71,7 +71,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; |