diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-03-28 13:52:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-28 13:52:19 -0700 |
| commit | cd27bc7a0bdb7e62090c503b9e8ab4b4a6bb3d06 (patch) | |
| tree | d056097ed72d93eedc487640b463bde3650cd9a3 /contrib | |
| parent | c772d1bcdc058d655e6cd3518440a721433cb511 (diff) | |
| parent | 33ad9ddd0b5398063f0aabea639b5fe569f458ea (diff) | |
| download | git-cd27bc7a0bdb7e62090c503b9e8ab4b4a6bb3d06.tar.gz | |
Merge branch 'rs/strbuf-add-real-path' into maint
An helper function to make it easier to append the result from
real_path() to a strbuf has been added.
* rs/strbuf-add-real-path:
strbuf: add strbuf_add_real_path()
cocci: use ALLOC_ARRAY
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/coccinelle/array.cocci | 16 | ||||
| -rw-r--r-- | contrib/coccinelle/strbuf.cocci | 6 |
2 files changed, 22 insertions, 0 deletions
diff --git a/contrib/coccinelle/array.cocci b/contrib/coccinelle/array.cocci index 2d7f25d99f..4ba98b7eaf 100644 --- a/contrib/coccinelle/array.cocci +++ b/contrib/coccinelle/array.cocci @@ -24,3 +24,19 @@ expression n; @@ - memcpy(dst, src, n * sizeof(T)); + COPY_ARRAY(dst, src, n); + +@@ +type T; +T *ptr; +expression n; +@@ +- ptr = xmalloc(n * sizeof(*ptr)); ++ ALLOC_ARRAY(ptr, n); + +@@ +type T; +T *ptr; +expression n; +@@ +- ptr = xmalloc(n * sizeof(T)); ++ ALLOC_ARRAY(ptr, n); diff --git a/contrib/coccinelle/strbuf.cocci b/contrib/coccinelle/strbuf.cocci index 63995f22ff..1d580e49b0 100644 --- a/contrib/coccinelle/strbuf.cocci +++ b/contrib/coccinelle/strbuf.cocci @@ -38,3 +38,9 @@ expression E1, E2, E3; @@ - strbuf_addstr(E1, find_unique_abbrev(E2, E3)); + strbuf_add_unique_abbrev(E1, E2, E3); + +@@ +expression E1, E2; +@@ +- strbuf_addstr(E1, real_path(E2)); ++ strbuf_add_real_path(E1, E2); |