mirror of
https://github.com/git/git
synced 2024-10-02 14:45:21 +00:00
add QSORT
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@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
21f862b498
commit
dbc540c7a5
19
contrib/coccinelle/qsort.cocci
Normal file
19
contrib/coccinelle/qsort.cocci
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
@@
|
||||||
|
expression base, nmemb, compar;
|
||||||
|
@@
|
||||||
|
- qsort(base, nmemb, sizeof(*base), compar);
|
||||||
|
+ QSORT(base, nmemb, compar);
|
||||||
|
|
||||||
|
@@
|
||||||
|
expression base, nmemb, compar;
|
||||||
|
@@
|
||||||
|
- qsort(base, nmemb, sizeof(base[0]), compar);
|
||||||
|
+ QSORT(base, nmemb, compar);
|
||||||
|
|
||||||
|
@@
|
||||||
|
type T;
|
||||||
|
T *base;
|
||||||
|
expression nmemb, compar;
|
||||||
|
@@
|
||||||
|
- qsort(base, nmemb, sizeof(T), compar);
|
||||||
|
+ QSORT(base, nmemb, compar);
|
|
@ -977,6 +977,14 @@ void git_qsort(void *base, size_t nmemb, size_t size,
|
||||||
#define qsort git_qsort
|
#define qsort git_qsort
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#define QSORT(base, n, compar) sane_qsort((base), (n), sizeof(*(base)), compar)
|
||||||
|
static inline void sane_qsort(void *base, size_t nmemb, size_t size,
|
||||||
|
int(*compar)(const void *, const void *))
|
||||||
|
{
|
||||||
|
if (nmemb > 1)
|
||||||
|
qsort(base, nmemb, size, compar);
|
||||||
|
}
|
||||||
|
|
||||||
#ifndef REG_STARTEND
|
#ifndef REG_STARTEND
|
||||||
#error "Git requires REG_STARTEND support. Compile with NO_REGEX=NeedsStartEnd"
|
#error "Git requires REG_STARTEND support. Compile with NO_REGEX=NeedsStartEnd"
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue