Am 30.09.2016 um 00:36 schrieb Junio C Hamano:
> René Scharfe <l.s.r@xxxxxx> writes:
>
>> Add the macro QSORT, a convenient wrapper for qsort(3) that infers the
>> size of the array elements and supports the convention of initializing
>> empty arrays with a NULL pointer, which we use in some places.
>>
>> Calling qsort(3) directly with a NULL pointer is undefined -- even with
>> an element count of zero -- and allows the compiler to optimize away any
>> following NULL checks. Using the macro avoids such surprises.
>>
>> Add a semantic patch as well to demonstrate the macro's usage and to
>> automate the transformation of trivial cases.
>>
>> Signed-off-by: Rene Scharfe <l.s.r@xxxxxx>
>> ---
>> contrib/coccinelle/qsort.cocci | 19 +++++++++++++++++++
>> git-compat-util.h | 8 ++++++++
>> 2 files changed, 27 insertions(+)
>> create mode 100644 contrib/coccinelle/qsort.cocci
>
> The direct calls to qsort(3) that this series leaves behind are
> interesting.
>
> 1. builtin/index-pack.c has this:
>
> if (1 < opts->anomaly_nr)
> qsort(opts->anomaly, opts->anomaly_nr, sizeof(uint32_t), cmp_uint32);
>
> where opts->anomaly is coming from pack.h:
>
> struct pack_idx_option {
> unsigned flags;
> ...
> int anomaly_alloc, anomaly_nr;
> uint32_t *anomaly;
> };
>
> I cannot quite see how the automated conversion misses it? It's not
> like base and nmemb are type-restricted in the rule (they are both
> just "expression"s).
>
> 2. builtin/shortlog.c has this:
>
> qsort(log->list.items, log->list.nr, sizeof(struct string_list_item),
> log->summary ? compare_by_counter : compare_by_list);
>
> where log->list is coming from shortlog.h:
>
> struct shortlog {
> struct string_list list;
> };
>
> and string-list.h says:
>
> struct string_list {
> struct string_list_item *items;
> unsigned int nr, alloc;
> ...
> };
>
> which seems to be a good candidate for this rule:
>
> type T;
> T *base;
> expression nmemb, compar;
> @@
> - qsort(base, nmemb, sizeof(T), compar);
> + QSORT(base, nmemb, compar);
>
> if we take "T == struct string_list_item".
Transformations for these two are generated if we pass --all-includes
to spatch. So let's do that.
-- >8 --
Subject: [PATCH] coccicheck: use --all-includes by default
Add a make variable, SPATCH_FLAGS, for specifying flags for spatch, and
set it to --all-includes by default. This option lets it consider
header files which would otherwise be ignored. That's important for
some rules that rely on type information. It doubles the duration of
coccicheck, however.
Signed-off-by: Rene Scharfe <l.s.r@xxxxxx>
---
Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 1aad150..d15bf8d 100644
--- a/Makefile
+++ b/Makefile
@@ -467,6 +467,7 @@ SPATCH = spatch
export TCL_PATH TCLTK_PATH
SPARSE_FLAGS =
+SPATCH_FLAGS = --all-includes
@@ -2314,7 +2315,7 @@ C_SOURCES = $(patsubst %.o,%.c,$(C_OBJ))
%.cocci.patch: %.cocci $(C_SOURCES)
@echo ' ' SPATCH $<; \
for f in $(C_SOURCES); do \
- $(SPATCH) --sp-file $< $$f; \
+ $(SPATCH) --sp-file $< $$f $(SPATCH_FLAGS); \
done >$@ 2>$@.log; \
if test -s $@; \
then \
--
2.10.0